add point support

Author: tanner0101

Sources/PostgreSQL/Base/PostgreSQLData.swift

@@ -18,6 +18,8 @@ public enum PostgreSQLData {
 
     case float(Float)
     case double(Double)
+
+    case point(x: Int, y: Int)
 
     case null
 }
@@ -90,6 +92,7 @@ extension PostgreSQLData: Equatable {
         case (.uint(let a), .uint(let b)): return a == b
         case (.float(let a), .float(let b)): return a == b
         case (.double(let a), .double(let b)): return a == b
+        case (.point(let a), .point(let b)): return a == b
         case (.null, .null): return true
         default: return false
         }
@@ -117,6 +120,7 @@ extension PostgreSQLData: CustomStringConvertible {
         case .uint(let val): return "\(val) (uint)"
         case .float(let val): return "\(val) (float)"
         case .double(let val): return "\(val) (double)"
+        case .point(let x, let y): return "(\(x), \(y))"
         case .null: return "null"
         }
     }

Sources/PostgreSQL/Base/PostgreSQLDataType+Parse.swift

@@ -22,6 +22,7 @@ extension PostgreSQLDataType {
         case .float4: return .float(data.makeFloatingPoint())
         case .float8: return .double(data.makeFloatingPoint())
         case .bpchar: return try .string(data.makeString())
+        case .point: return .point(x: data[0..<8].makeFixedWidthInteger(), y: data[8..<16].makeFixedWidthInteger())
         case .timestamp, .date, .time, .numeric, .pg_node_tree, ._aclitem:
             fatalError("Unexpected binary for \(self) (preferred format): \(data.hexDebug)")
         }
@@ -43,6 +44,14 @@ extension PostgreSQLDataType {
         case .date: return try .date(data.makeString().parseDate(format:  "yyyy-MM-dd"))
         case .time: return try .date(data.makeString().parseDate(format:  "HH:mm:ss"))
         case .void: return .null
+        case .point:
+            let string = try data.makeString()
+            let parts = string.split(separator: ",")
+            var x = parts[0]
+            var y = parts[1]
+            assert(x.popFirst()! == "(")
+            assert(y.popLast()! == ")")
+            return .point(x: Int(x)!, y: Int(y)!)
         case .pg_node_tree, ._aclitem: return try .string(data.makeString())
         }
     }

Sources/PostgreSQL/Base/PostgreSQLDataType+Serialize.swift

@@ -14,7 +14,7 @@ extension PostgreSQLData {
         let serialized: Data?
         switch self {
         case .date(let date): serialized = Data(date.description.utf8)
-        case .string, .null, .int8, .int16, .int32, .int, .uint8, .uint16, .uint32, .uint, .double, .float, .data:
+        case .string, .null, .int8, .int16, .int32, .int, .uint8, .uint16, .uint32, .uint, .double, .float, .data, .point:
             fatalError("Unsupported serialize text: \(self)")
         }
         return serialized
@@ -37,6 +37,7 @@ extension PostgreSQLData {
         case .double(let double): serialized = Data(double.bytes)
         case .float(let float): serialized = Data(float.bytes)
         case .data(let data): serialized = data
+        case .point(let x, let y): serialized = Data(x.bytes) + Data(y.bytes)
         case .date:
             fatalError("Unsupported serialize binary: \(self)")
         }

Sources/PostgreSQL/Base/PostgreSQLDataType.swift

@@ -14,6 +14,7 @@ enum PostgreSQLDataType: Int32, Codable {
     case text = 25
     case oid = 26
     case pg_node_tree = 194
+    case point = 600
     case float4 = 700
     case float8 = 701
     case _aclitem = 1034
@@ -44,6 +45,7 @@ extension PostgreSQLDataType {
         case .float: return .float4
         case .data: return .bytea
         case .date: return .timestamp
+        case .point: return .point
         }
     }
 }
@@ -70,6 +72,7 @@ extension PostgreSQLDataType {
         case .bpchar: return .binary
         case .varchar: return .binary
         case .void: return .binary
+        case .point: return .binary
 
         // Text
         // Converting these to binary supporting may improve performance

Sources/PostgreSQL/Client/PostgreSQLClient.swift

@@ -35,6 +35,7 @@ public final class PostgreSQLClient {
         }
     }
 
+    /// Authenticates the `PostgreSQLClient` using a username with no password.
     public func authenticate(username: String) -> Future<Void> {
         let startup = PostgreSQLStartupMessage.versionThree(parameters: ["user": username])
         return send(.startupMessage(startup)).transform(to: ())

Tests/PostgreSQLTests/PostgreSQLClientTests.swift

@@ -50,8 +50,8 @@ class PostgreSQLClientTests: XCTestCase {
             "timestamp" timestamp,
             "date" date,
             "time" time,
-            "boolean" boolean-- ,
-            -- "point" point,
+            "boolean" boolean,
+            "point" point
             -- "line" line,
             -- "lseg" lseg,
             -- "box" box,
@@ -85,8 +85,8 @@ class PostgreSQLClientTests: XCTestCase {
             now(), -- "timestamp" timestamp
             current_date, -- "date" date
             localtime, -- "time" time
-            true -- "boolean" boolean
-            -- "point" point,
+            true, -- "boolean" boolean
+            point(13,14) -- "point" point,
             -- "line" line,
             -- "lseg" lseg,
             -- "box" box,
@@ -100,7 +100,7 @@ class PostgreSQLClientTests: XCTestCase {
             -- "uuid" uuid
         );
         """
-        let insertResult = try client.query(insertQuery).await(on: eventLoop)
+        let insertResult = try! client.query(insertQuery).await(on: eventLoop)
         XCTAssertEqual(insertResult.count, 0)
         let queryResult = try client.query("select * from kitchen_sink").await(on: eventLoop)
         if queryResult.count == 1 {
@@ -116,6 +116,7 @@ class PostgreSQLClientTests: XCTestCase {
             XCTAssertEqual(row["text"], .string("11"))
             XCTAssertEqual(row["bytea"], .data(Data([0x31, 0x32])))
             XCTAssertEqual(row["boolean"], .uint8(0x01))
+            XCTAssertEqual(row["point"], .point(x: 13, y: 14))
         } else {
             XCTFail("query result count is: \(queryResult.count)")
         }
@@ -139,8 +140,8 @@ class PostgreSQLClientTests: XCTestCase {
             "timestamp" timestamp,
             "date" date,
             "time" time,
-            "boolean" boolean-- ,
-            -- "point" point,
+            "boolean" boolean,
+            "point" point
             -- "line" line,
             -- "lseg" lseg,
             -- "box" box,
@@ -174,8 +175,8 @@ class PostgreSQLClientTests: XCTestCase {
             $12, -- "timestamp" timestamp
             $13, -- "date" date
             $14, -- "time" time
-            $15 -- "boolean" boolean
-            -- "point" point,
+            $15, -- "boolean" boolean
+            $16 -- "point" point
             -- "line" line,
             -- "lseg" lseg,
             -- "box" box,
@@ -205,6 +206,7 @@ class PostgreSQLClientTests: XCTestCase {
             PostgreSQLData.date(Date()), // date
             PostgreSQLData.date(Date()), // time
             PostgreSQLData.uint8(1), // boolean
+            PostgreSQLData.point(x: 11, y: 12) // point
         ]).await(on: eventLoop)
         XCTAssertEqual(insertResult.count, 0)
 
@@ -222,6 +224,7 @@ class PostgreSQLClientTests: XCTestCase {
             XCTAssertEqual(row["text"], .string("10"))
             XCTAssertEqual(row["bytea"], .data(Data([0x31, 0x32])))
             XCTAssertEqual(row["boolean"], .uint8(0x01))
+            XCTAssertEqual(row["point"], .point(x: 11, y: 12))
         } else {
             XCTFail("parameterized result count is: \(parameterizedResult.count)")
         }