add untyped array methods to PostgresData (#66)

* add untyped array methods to PostgresData

* test fluent integration

Author: tanner0101

.github/workflows/test.yml

@@ -34,3 +34,25 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - run: swift test --enable-test-discovery --sanitize=thread
+  fluent:
+    container: 
+      image: vapor/swift:5.1
+    services:
+      psql:
+        image: postgres
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_USER: vapor_username
+          POSTGRES_DB: vapor_database
+          POSTGRES_PASSWORD: vapor_password
+    runs-on: ubuntu-latest
+    steps:
+    - run: git clone -b master https://github.com/vapor/fluent-postgres-driver.git
+      working-directory: ./
+    - run: swift package edit postgres-nio --revision ${{ github.sha }}
+      working-directory: ./fluent-postgres-driver
+    - run: swift test --enable-test-discovery --sanitize=thread
+      working-directory: ./fluent-postgres-driver
+      env:
+        POSTGRES_HOSTNAME: psql

Sources/PostgresNIO/Data/PostgresData+Array.swift

@@ -2,10 +2,12 @@ extension PostgresData {
     public init<T>(array: [T])
         where T: PostgresDataConvertible
     {
-        let elementType = T.postgresDataType
-        guard let arrayType = elementType.arrayType else {
-            fatalError("No array type for \(elementType)")
-        }
+        self.init(
+            array: array.map { $0.postgresData },
+            elementType: T.postgresDataType
+        )
+    }
+    public init(array: [PostgresData?], elementType: PostgresDataType) {
         var buffer = ByteBufferAllocator().buffer(capacity: 0)
         // 0 if empty, 1 if not
         buffer.writeInteger(array.isEmpty ? 0 : 1, as: UInt32.self)
@@ -22,7 +24,7 @@ extension PostgresData {
             buffer.writeInteger(1, as: UInt32.self)
 
             for item in array {
-                if var value = item.postgresData?.value {
+                if let item = item, var value = item.value {
                     buffer.writeInteger(numericCast(value.readableBytes), as: UInt32.self)
                     buffer.writeBuffer(&value)
                 } else {
@@ -31,12 +33,35 @@ extension PostgresData {
             }
         }
 
-        self.init(type: arrayType, typeModifier: nil, formatCode: .binary, value: buffer)
+        guard let arrayType = elementType.arrayType else {
+            fatalError("No array type for \(elementType)")
+        }
+        self.init(
+            type: arrayType,
+            typeModifier: nil,
+            formatCode: .binary,
+            value: buffer
+        )
     }
 
     public func array<T>(of type: T.Type = T.self) -> [T]?
         where T: PostgresDataConvertible
     {
+        guard let array = self.array else {
+            return nil
+        }
+        var items: [T] = []
+        for data in array {
+            guard let item = T(postgresData: data) else {
+                // if we fail to convert any data, fail the entire array
+                return nil
+            }
+            items.append(item)
+        }
+        return items
+    }
+
+    public var array: [PostgresData]? {
         guard var value = self.value else {
             return nil
         }
@@ -67,17 +92,18 @@ extension PostgresData {
         }
         assert(dimensions == 1, "Multi-dimensional arrays not yet supported")
 
-        var array: [T] = []
+        var array: [PostgresData] = []
         while
             let itemLength = value.readInteger(as: UInt32.self),
             let itemValue = value.readSlice(length: numericCast(itemLength))
         {
-            let data = PostgresData(type: type, typeModifier: nil, formatCode: self.formatCode, value: itemValue)
-            guard let t = T(postgresData: data) else {
-                // if we fail to convert any data, fail the entire array
-                return nil
-            }
-            array.append(t)
+            let data = PostgresData(
+                type: type,
+                typeModifier: nil,
+                formatCode: self.formatCode,
+                value: itemValue
+            )
+            array.append(data)
         }
         return array
     }

Sources/PostgresNIO/Data/PostgresData+JSONB.swift

@@ -6,7 +6,8 @@ extension PostgresData {
     public init(jsonb jsonData: Data) {
         let jsonBDataBytes = [UInt8](jsonData)
 
-        var buffer = ByteBufferAllocator().buffer(capacity: jsonBVersionBytes.count + jsonBDataBytes.count)
+        var buffer = ByteBufferAllocator()
+            .buffer(capacity: jsonBVersionBytes.count + jsonBDataBytes.count)
         buffer.writeBytes(jsonBVersionBytes)
         buffer.writeBytes(jsonBDataBytes)
 

Sources/PostgresNIO/Data/PostgresData.swift

@@ -50,10 +50,14 @@ public struct PostgresData: CustomStringConvertible, CustomDebugStringConvertibl
             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 .json:
+            description = String(decoding: value.readableBytesView, as: UTF8.self)
+        case .jsonb:
+            var value = value
+            value.moveReaderIndex(forwardBy: 1)
+            description = String(decoding: value.readableBytesView, as: UTF8.self)
         case .uuidArray:
             description = self.array(of: UUID.self)?.description
         case .int8Array:
@@ -62,8 +66,10 @@ public struct PostgresData: CustomStringConvertible, CustomDebugStringConvertibl
             description = self.array(of: Double.self)?.description
         case .float4Array:
             description = self.array(of: Float.self)?.description
-        case .jsonb:
-            description = String(decoding: value.readableBytesView, as: UTF8.self)
+        case .textArray:
+            description = self.array(of: String.self)?.description
+        case .jsonbArray:
+            description = self.array?.description
         default:
             description = nil
         }