Merge pull request #79 from vapor/sql

update to SQL protocols

Author: tanner0101

Package.swift

@@ -14,16 +14,19 @@ let package = Package(
         .package(url: "https://github.com/vapor/crypto.git", from: "3.0.0"),
 
         // 🗄 Core services for creating database integrations.
-        .package(url: "https://github.com/vapor/database-kit.git", from: "1.0.0"),
+        .package(url: "https://github.com/vapor/database-kit.git", from: "1.2.0"),
 
         // 📦 Dependency injection / inversion of control framework.
         .package(url: "https://github.com/vapor/service.git", from: "1.0.0"),
 
         // Event-driven network application framework for high performance protocol servers & clients, non-blocking.
         .package(url: "https://github.com/apple/swift-nio.git", from: "1.0.0"),
+        
+        // *️⃣ Build SQL queries in Swift. Extensible, protocol-based design that supports DQL, DML, and DDL.
+        .package(url: "https://github.com/vapor/sql.git", from: "2.0.0-beta"),
     ],
     targets: [
-        .target(name: "PostgreSQL", dependencies: ["Async", "Bits", "Core", "Crypto", "DatabaseKit", "NIO", "Service"]),
-        .testTarget(name: "PostgreSQLTests", dependencies: ["Core", "PostgreSQL"]),
+        .target(name: "PostgreSQL", dependencies: ["Async", "Bits", "Core", "Crypto", "DatabaseKit", "NIO", "Service", "SQL"]),
+        .testTarget(name: "PostgreSQLTests", dependencies: ["Core", "PostgreSQL", "SQLBenchmark"]),
     ]
 )

Sources/PostgreSQL/Codable/PostgreSQLDataDecoder.swift

@@ -56,7 +56,7 @@ public struct PostgreSQLDataDecoder {
                     /// Unknown
                     let _ = value.extract(Int32.self).bigEndian
                     /// The big-endian array element type
-                    let type: PostgreSQLDataType = .init(value.extract(Int32.self).bigEndian)
+                    let type: PostgreSQLDataFormat = .init(value.extract(Int32.self).bigEndian)
                     /// The big-endian length of the array
                     let count = value.extract(Int32.self).bigEndian
                     /// The big-endian number of dimensions

Sources/PostgreSQL/Codable/PostgreSQLQueryEncoder.swift

@@ -1,14 +1,9 @@
-public protocol PostgreSQLValueRepresentable {
-    var postgreSQLValue: PostgreSQLQuery.Value { get }
-}
-
-
 /// Converts `Encodable` objects to `PostgreSQLData`.
 ///
 ///     let data = try PostgreSQLDataEncoder().encode("hello")
 ///     print(data) // PostgreSQLData
 ///
-public struct PostgreSQLValueEncoder {
+public struct PostgreSQLDataEncoder {
     /// Creates a new `PostgreSQLDataEncoder`.
     public init() { }
 
@@ -20,12 +15,9 @@ public struct PostgreSQLValueEncoder {
     /// - parameters:
     ///     - encodable: `Encodable` object to encode.
     /// - returns: Encoded `PostgreSQLData`.
-    public func encode(_ encodable: Encodable) throws -> PostgreSQLQuery.Value {
-        if let psql = encodable as? PostgreSQLValueRepresentable {
-            return psql.postgreSQLValue
-        }
+    public func encode(_ encodable: Encodable) throws -> PostgreSQLData {
         if let convertible = encodable as? PostgreSQLDataConvertible {
-            return try .data(convertible.convertToPostgreSQLData())
+            return try convertible.convertToPostgreSQLData()
         }
 
         do {
@@ -34,7 +26,23 @@ public struct PostgreSQLValueEncoder {
             if let data = encoder.data {
                 return data
             } else {
-                let type = encoder.array.first?.type ?? .null
+                let type: PostgreSQLDataFormat
+                if let present = encoder.array.first?.type {
+                    type = present
+                } else if
+                    let array = Swift.type(of: encodable) as? AnyArray.Type,
+                    let psql = array.anyElementType as? PostgreSQLDataTypeStaticRepresentable.Type
+                {
+                    if let format = psql.postgreSQLDataType.dataFormat {
+                        type = format
+                    } else {
+                        WARNING("Could not determine PostgreSQL array data type: \(psql.postgreSQLDataType)")
+                        type = .null
+                    }
+                } else {
+                    WARNING("Could not determine PostgreSQL array data type: \(Swift.type(of: encodable))")
+                    type = .null
+                }
                 // encode array
                 var data = Data()
                 data += Data.of(Int32(1).bigEndian) // non-null
@@ -51,7 +59,7 @@ public struct PostgreSQLValueEncoder {
                     default: data += Data.of(Int32(0).bigEndian)
                     }
                 }
-                return .data(PostgreSQLData(type.arrayType ?? .null, binary: data))
+                return PostgreSQLData(type.arrayType ?? .null, binary: data)
             }
         } catch is _KeyedError {
             struct AnyEncodable: Encodable {
@@ -64,7 +72,7 @@ public struct PostgreSQLValueEncoder {
                     try encodable.encode(to: encoder)
                 }
             }
-            return try .data(PostgreSQLData(.jsonb, binary: [0x01] + JSONEncoder().encode(AnyEncodable(encodable))))
+            return try PostgreSQLData(.jsonb, binary: [0x01] + JSONEncoder().encode(AnyEncodable(encodable)))
         }
     }
 
@@ -74,7 +82,7 @@ public struct PostgreSQLValueEncoder {
     private final class _Encoder: Encoder {
         let codingPath: [CodingKey] = []
         let userInfo: [CodingUserInfoKey: Any] = [:]
-        var data: PostgreSQLQuery.Value?
+        var data: PostgreSQLData?
         var array: [PostgreSQLData]
 
         init() {
@@ -111,15 +119,10 @@ public struct PostgreSQLValueEncoder {
         }
 
         mutating func encode<T>(_ value: T) throws where T : Encodable {
-            if let psql = value as? PostgreSQLValueRepresentable {
-                encoder.data = psql.postgreSQLValue
-                return
-            }
             if let convertible = value as? PostgreSQLDataConvertible {
-                encoder.data = try .data(convertible.convertToPostgreSQLData())
+                encoder.data = try convertible.convertToPostgreSQLData()
                 return
             }
-            
             try value.encode(to: encoder)
         }
     }
@@ -192,3 +195,13 @@ public struct PostgreSQLValueEncoder {
         }
     }
 }
+
+protocol AnyArray {
+    static var anyElementType: Any.Type { get }
+}
+
+extension Array: AnyArray {
+    static var anyElementType: Any.Type {
+        return Element.self
+    }
+}