Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions Sources/PostgresNIO/New/PostgresColumn.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/// Information of a column.
//
// This type has the same definition as `RowDescription.column`, we need to keep
// that type private so we defines this type.
public struct PostgresColumn: Hashable, Sendable {
/// The column name.
public let name: String

/// If the field can be identified as a column of a specific table, the object ID of the table; otherwise zero.
public let tableOID: Int32

/// If the field can be identified as a column of a specific table, the attribute number of the column; otherwise zero.
public let columnAttributeNumber: Int16

/// The object ID of the field's data type.
public let dataType: PostgresDataType

/// The data type size (see pg_type.typlen). Note that negative values denote variable-width types.
public let dataTypeSize: Int16

/// The type modifier (see pg_attribute.atttypmod). The meaning of the modifier is type-specific.
public let dataTypeModifier: Int32

/// The format being used for the field. Currently will be text or binary. In a RowDescription returned
/// from the statement variant of Describe, the format code is not yet known and will always be text.
public let format: PostgresFormat
Comment on lines +6 to +26
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we back this with a RowDescription.Column please. Instead of let properties please lets use computed properties.

Example:

public var name: String {
    self.underlying.name
}



internal init(
name: String,
tableOID: Int32,
columnAttributeNumber: Int16,
dataType: PostgresDataType,
dataTypeSize: Int16,
dataTypeModifier: Int32,
format: PostgresFormat
) {
self.name = name
self.tableOID = tableOID
self.columnAttributeNumber = columnAttributeNumber
self.dataType = dataType
self.dataTypeSize = dataTypeSize
self.dataTypeModifier = dataTypeModifier
self.format = format
}
}
15 changes: 15 additions & 0 deletions Sources/PostgresNIO/New/PostgresRowSequence.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,21 @@ public struct PostgresRowSequence: AsyncSequence, Sendable {
columns: self.columns
)
}

/// Get the column information of the query results.
public func getColumns() -> [PostgresColumn] {
self.columns.map { column in
PostgresColumn(
name: column.name,
tableOID: column.tableOID,
columnAttributeNumber: column.columnAttributeNumber,
dataType: column.dataType,
dataTypeSize: column.dataTypeSize,
dataTypeModifier: column.dataTypeModifier,
format: column.format
)
}
}
Comment on lines +30 to +43
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an O(n) call. Where n equals the number of columns. Do we need a returned Array? Can we return a custom PostgresColumns struct that wraps the existing [RowDescription.Column] structure?

Example:

struct PostgresColumns: Sequence {
    typealias Element == PostgresColumn
   
    var underlying: [RowDescription.Column]

    func makeIterator() -> Iterator {
        Iterator(underlying: self.underlying.makeIterator)
    }

    struct Iterator: IteratorProtocol {
        var underlying: [RowDescription.Column].Iterator

        func next() -> PostgresColumn {
           self.underlying.next()
        }
    }
}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we do the above we can just add a get only property:

var columns: PostgresColumns {
    PostgresColumns(underlying: self.columns)
}

}

extension PostgresRowSequence {
Expand Down
65 changes: 65 additions & 0 deletions Tests/PostgresNIOTests/New/PostgresRowSequenceTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,71 @@ final class PostgresRowSequenceTests: XCTestCase {
let emptyRow = try await rowIterator.next()
XCTAssertNil(emptyRow)
}

func testGetColumnsReturnsCorrectColumnInformation() async throws {
let dataSource = MockRowDataSource()
let embeddedEventLoop = EmbeddedEventLoop()

let sourceColumns = [
RowDescription.Column(
name: "id",
tableOID: 12345,
columnAttributeNumber: 1,
dataType: .int8,
dataTypeSize: 8,
dataTypeModifier: -1,
format: .binary
),
RowDescription.Column(
name: "name",
tableOID: 12345,
columnAttributeNumber: 2,
dataType: .text,
dataTypeSize: -1,
dataTypeModifier: -1,
format: .text
)
]

let expectedColumns = sourceColumns.map { column in
PostgresColumn(
name: column.name,
tableOID: column.tableOID,
columnAttributeNumber: column.columnAttributeNumber,
dataType: column.dataType,
dataTypeSize: column.dataTypeSize,
dataTypeModifier: column.dataTypeModifier,
format: column.format
)
}

let stream = PSQLRowStream(
source: .stream(sourceColumns, dataSource),
eventLoop: embeddedEventLoop,
logger: self.logger
)

let rowSequence = stream.asyncSequence()
let actualColumns = rowSequence.getColumns()

XCTAssertEqual(actualColumns, expectedColumns)
}

func testGetColumnsWithEmptyColumns() async throws {
let dataSource = MockRowDataSource()
let embeddedEventLoop = EmbeddedEventLoop()

let stream = PSQLRowStream(
source: .stream([], dataSource),
eventLoop: embeddedEventLoop,
logger: self.logger
)

let rowSequence = stream.asyncSequence()
let columns = rowSequence.getColumns()

XCTAssertTrue(columns.isEmpty)
}
}

final class MockRowDataSource: PSQLRowsDataSource {
Expand Down