Skip to content

char(n) (BPCHAR) length fix #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 12, 2020
Merged

char(n) (BPCHAR) length fix #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7926d2d
char(n) / bpchar fix
tanner0101 Dec 20, 2019
93d4800
Merge branch 'master' into tn-charn-fix
tanner0101 Feb 12, 2020
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
6 changes: 4 additions & 2 deletions Sources/PostgresNIO/Data/PostgresData+Int.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,10 @@ private extension PostgresData {
switch self.formatCode {
case .binary:
switch self.type {
case .char:
assert(value.readableBytes == 1)
case .char, .bpchar:
guard value.readableBytes == 1 else {
return nil
}
guard let uint8 = value.getInteger(at: value.readerIndex, as: UInt8.self) else {
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/PostgresNIO/Data/PostgresData+String.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ extension PostgresData {
case .int2, .int4, .int8:
return self.int?.description
case .bpchar:
return self.character?.description
return value.readString(length: value.readableBytes)
default:
if self.type.isUserDefined {
// custom type
Expand Down
17 changes: 17 additions & 0 deletions Tests/PostgresNIOTests/PostgresNIOTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,23 @@ final class PostgresNIOTests: XCTestCase {
}
}

// https://github.com/vapor/postgres-nio/issues/71
func testChar1Serialization() throws {
let conn = try PostgresConnection.test(on: eventLoop).wait()
defer { try! conn.close().wait() }
let rows = try conn.query("""
select
'5'::char(1) as one,
'5'::char(2) as two
""").wait()
XCTAssertEqual(rows[0].column("one")?.uint8, 53)
XCTAssertEqual(rows[0].column("one")?.uint16, 53)
XCTAssertEqual(rows[0].column("one")?.string, "5")
XCTAssertEqual(rows[0].column("two")?.uint8, nil)
XCTAssertEqual(rows[0].column("two")?.uint16, nil)
XCTAssertEqual(rows[0].column("two")?.string, "5 ")
}

func testUserDefinedType() throws {
let conn = try PostgresConnection.test(on: eventLoop).wait()
defer { try! conn.close().wait() }
Expand Down