improve postgres data descriptions + add string array tests (#49)

Author: tanner0101

Sources/PostgresNIO/Data/PostgresData.swift

@@ -1,4 +1,5 @@
 import NIO
+import Foundation
 
 public struct PostgresData: CustomStringConvertible, CustomDebugStringConvertible {
     public static var null: PostgresData {
@@ -27,32 +28,54 @@ public struct PostgresData: CustomStringConvertible, CustomDebugStringConvertibl
     }
 
     public var description: String {
-        if let string = self.string {
-            return string
+        guard var value = self.value else {
+            return "<null>"
+        }
+        let description: String?
+
+        switch self.type {
+        case .bool:
+            description = self.bool?.description
+        case .float4:
+            description = self.float?.description
+        case .float8, .numeric:
+            description = self.double?.description
+        case .int2:
+            description = self.int16?.description
+        case .int4, .regproc, .oid:
+            description = self.int32?.description
+        case .int8:
+            description = self.int64?.description
+        case .timestamp, .timestamptz, .date, .time, .timetz:
+            description = self.date?.description
+        case .text:
+            description = self.string?.debugDescription
+        case .textArray:
+            description = self.array(of: String.self)?.description
+        case .uuid:
+            description = self.uuid?.description
+        case .uuidArray:
+            description = self.array(of: UUID.self)?.description
+        default:
+            description = nil
+        }
+
+        if let description = description {
+            return description
         } else {
-            let string: String
-            if var value = self.value {
-                switch self.formatCode {
-                case .text:
-                    let raw = value.readString(length: value.readableBytes) ?? ""
-                    string = "\"\(raw)\""
-                case .binary:
-                    string = "0x" + value.readableBytesView.hexdigest()
-                }
-            } else {
-                string = "<null>"
+            let raw: String
+            switch self.formatCode {
+            case .text:
+                raw = (value.readString(length: value.readableBytes) ?? "")
+                    .debugDescription
+            case .binary:
+                raw = "0x" + value.readableBytesView.hexdigest()
             }
-            return string + " (\(self.type))"
+            return "\(raw) (\(self.type))"
         }
     }
 
     public var debugDescription: String {
-        let valueDescription: String
-        if let value = self.value {
-            valueDescription = "\(value.readableBytes.description) bytes"
-        } else {
-            valueDescription = "nil"
-        }
-        return "PostgresData(type: \(self.type), value: \(valueDescription))"
+        return self.description
     }
 }

Tests/PostgresNIOTests/NIOPostgresTests.swift

@@ -526,6 +526,36 @@ final class NIOPostgresTests: XCTestCase {
         XCTAssertEqual("stringInTable2", row.column("t2_stringValue")?.string, "stringInTable2")
         XCTAssertEqual(dateInTable2, row.column("t2_dateValue")?.date)
     }
+
+    func testStringArrays() throws {
+        let query = """
+        SELECT
+            $1::uuid as "id",
+            $2::bigint as "revision",
+            $3::timestamp as "updated_at",
+            $4::timestamp as "created_at",
+            $5::text as "name",
+            $6::text[] as "countries",
+            $7::text[] as "languages",
+            $8::text[] as "currencies"
+        """
+
+        let conn = try PostgresConnection.test(on: eventLoop).wait()
+        defer { try! conn.close().wait() }
+        let rows = try conn.query(query, [
+            PostgresData(uuid: UUID(uuidString: "D2710E16-EB07-4FD6-A87E-B1BE41C9BD3D")!),
+            PostgresData(int: Int(0)),
+            PostgresData(date: Date(timeIntervalSince1970: 0)),
+            PostgresData(date: Date(timeIntervalSince1970: 0)),
+            PostgresData(string: "Foo"),
+            PostgresData(array: ["US"]),
+            PostgresData(array: ["en"]),
+            PostgresData(array: ["USD", "DKK"]),
+        ]).wait()
+        XCTAssertEqual(rows[0].column("countries")?.array(of: String.self), ["US"])
+        XCTAssertEqual(rows[0].column("languages")?.array(of: String.self), ["en"])
+        XCTAssertEqual(rows[0].column("currencies")?.array(of: String.self), ["USD", "DKK"])
+    }
 
     // MARK: Performance
 

Tests/PostgresNIOTests/XCTestManifests.swift

@@ -39,6 +39,7 @@ extension NIOPostgresTests {
         ("testSelectTypes", testSelectTypes),
         ("testSimpleQueryVersion", testSimpleQueryVersion),
         ("testSQLError", testSQLError),
+        ("testStringArrays", testStringArrays),
         ("testUUID", testUUID),
     ]
 }