update to new codable syntax

Author: tanner0101

Sources/FluentPostgreSQL/PostgreSQLDataDecoder.swift

@@ -1,10 +1,8 @@
 internal struct PostgreSQLDataDecoder: SingleValueDecodingContainer {
     var codingPath: [CodingKey]
-    var userInfo: [CodingUserInfoKey: Any]
     let data: PostgreSQLData
     init(data: PostgreSQLData) {
         self.data = data
-        self.userInfo = [:]
         self.codingPath = []
     }
 

Sources/FluentPostgreSQL/PostgreSQLDataEncoder.swift

@@ -0,0 +1,34 @@
+internal struct PostgreSQLDataEncoder: SingleValueEncodingContainer {
+    var codingPath: [CodingKey]
+    var data: PostgreSQLData?
+    init() {
+        self.codingPath = []
+    }
+    mutating func encodeNil() throws { data = PostgreSQLData(type: .void) }
+    mutating func encode(_ value: Bool) throws { data = try value.convertToPostgreSQLData() }
+    mutating func encode(_ value: Int) throws { data = try value.convertToPostgreSQLData() }
+    mutating func encode(_ value: Int16) throws { data = try value.convertToPostgreSQLData() }
+    mutating func encode(_ value: Int32) throws { data = try value.convertToPostgreSQLData() }
+    mutating func encode(_ value: Int64) throws { data = try value.convertToPostgreSQLData() }
+    mutating func encode(_ value: UInt) throws { data = try value.convertToPostgreSQLData() }
+    mutating func encode(_ value: UInt8) throws { data = try value.convertToPostgreSQLData() }
+    mutating func encode(_ value: UInt16) throws { data = try value.convertToPostgreSQLData() }
+    mutating func encode(_ value: UInt32) throws { data = try value.convertToPostgreSQLData() }
+    mutating func encode(_ value: UInt64) throws { data = try value.convertToPostgreSQLData() }
+    mutating func encode(_ value: Double) throws { data = try value.convertToPostgreSQLData() }
+    mutating func encode(_ value: Float) throws { data = try value.convertToPostgreSQLData() }
+    mutating func encode(_ value: String) throws { data = try value.convertToPostgreSQLData() }
+    mutating func encode<T>(_ value: T) throws where T : Encodable {
+        guard let convertible = value as? PostgreSQLDataCustomConvertible else {
+            let type = Swift.type(of: value)
+            throw PostgreSQLError(
+                identifier: "convertible",
+                reason: "Unsupported encodable type: \(type)",
+                suggestedFixes: [
+                    "Conform \(type) to PostgreSQLDataCustomConvertible"
+                ]
+            )
+        }
+        data = try convertible.convertToPostgreSQLData()
+    }
+}

Sources/FluentPostgreSQL/PostgreSQLDatabase+QuerySupporting.swift

@@ -26,21 +26,18 @@ extension PostgreSQLDatabase: QuerySupporting {
                     }
                     modelData = try dict.values.map { codableData -> PostgreSQLData in
                         switch codableData {
-                        case .null: return PostgreSQLData(type: .void)
-                        case .encodable(let encodable):
-                            guard let convertible = encodable as? PostgreSQLDataCustomConvertible else {
-                                let type = Swift.type(of: encodable)
-                                throw PostgreSQLError(
-                                    identifier: "convertible",
-                                    reason: "Unsupported encodable type: \(type)",
-                                    suggestedFixes: [
-                                        "Conform \(type) to PostgreSQLDataCustomConvertible"
-                                    ]
-                                )
-                            }
-                            return try convertible.convertToPostgreSQLData()
-                        case .array, .dictionary:
-                            throw PostgreSQLError(identifier: "codable", reason: "Unsupported encodable type: \(codableData)")
+                        case .single(let closure):
+                            var encoder: SingleValueEncodingContainer = PostgreSQLDataEncoder()
+                            try closure(&encoder)
+                            return (encoder as! PostgreSQLDataEncoder).data!
+                        case .array, .dictionary, .null:
+                            throw PostgreSQLError(
+                                identifier: "nestedData",
+                                reason: "Unsupported nested data in query.",
+                                suggestedFixes: [
+                                    "Use a nested struct instead"
+                                ]
+                            )
                         }
                     }
                 default:
@@ -82,7 +79,7 @@ extension PostgreSQLDatabase: QuerySupporting {
             // Run the query
             return try connection.query(sqlString, parameters) { row in
                 let codableDict = row.mapValues { psqlData -> DecodableData in
-                    return .decoder(PostgreSQLDataDecoder(data: psqlData))
+                    return .single({ PostgreSQLDataDecoder(data: psqlData) })
                 }
                 do {
                     let decoded = try CodableDataDecoder().decode(D.self, from: .dictionary(codableDict))