Custom JSON Coders for Postgres Data Coders

Sources/PostgresKit/ConnectionPool+Postgres.swift

@@ -10,9 +10,7 @@ private struct _ConnectionPoolPostgresDatabase {
 }
 
 extension _ConnectionPoolPostgresDatabase: PostgresDatabase {
-    var eventLoop: EventLoop {
-        self.pool.eventLoop
-    }
+    var eventLoop: EventLoop { self.pool.eventLoop }
 
     func send(_ request: PostgresRequest, logger: Logger) -> EventLoopFuture<Void> {
         self.pool.withConnection(logger: logger) {

Sources/PostgresKit/PostgresClient+SQL.swift

@@ -1,13 +1,20 @@
+import PostgresNIO
+import Foundation
 import SQLKit
 
 extension PostgresDatabase {
-    public func sql() -> SQLDatabase {
-        _PostgresSQLDatabase(database: self)
+    public func sql(
+        encoder: PostgresDataEncoder = PostgresDataEncoder(),
+        decoder: PostgresDataDecoder = PostgresDataDecoder()
+    ) -> SQLDatabase {
+        _PostgresSQLDatabase(database: self, encoder: encoder, decoder: decoder)
     }
 }
 
 private struct _PostgresSQLDatabase {
     let database: PostgresDatabase
+    let encoder: PostgresDataEncoder
+    let decoder: PostgresDataDecoder
 }
 
 extension _PostgresSQLDatabase: SQLDatabase {
@@ -27,9 +34,9 @@ extension _PostgresSQLDatabase: SQLDatabase {
         let (sql, binds) = self.serialize(query)
         do {
             return try self.database.query(sql, binds.map { encodable in
-                return try PostgresDataEncoder().encode(encodable)
+                return try self.encoder.encode(encodable)
             }) { row in
-                onRow(row)
+                onRow(row.sql(using: self.decoder))
             }
         } catch {
             return self.eventLoop.makeFailedFuture(error)

Sources/PostgresKit/PostgresConfiguration.swift

@@ -1,12 +1,15 @@
-@_exported import struct Foundation.URL
+@_exported import Foundation
 
 public struct PostgresConfiguration {
     public let address: () throws -> SocketAddress
     public let username: String
     public let password: String
     public let database: String?
     public let tlsConfiguration: TLSConfiguration?
-
+
+    public let encoder: PostgresDataEncoder
+    public let decoder: PostgresDataDecoder
+
     internal var _hostname: String?
 
     public init?(url: URL) {
@@ -49,7 +52,9 @@ public struct PostgresConfiguration {
         username: String,
         password: String,
         database: String? = nil,
-        tlsConfiguration: TLSConfiguration? = nil
+        tlsConfiguration: TLSConfiguration? = nil,
+        encoder: PostgresDataEncoder = PostgresDataEncoder(),
+        decoder: PostgresDataDecoder = PostgresDataDecoder()
     ) {
         self.address = {
             return try SocketAddress.makeAddressResolvingHost(hostname, port: port)
@@ -59,5 +64,7 @@ public struct PostgresConfiguration {
         self.password = password
         self.tlsConfiguration = tlsConfiguration
         self._hostname = hostname
+        self.encoder = encoder
+        self.decoder = decoder
     }
 }

Sources/PostgresKit/PostgresDataDecoder.swift

@@ -7,16 +7,20 @@ struct DecoderUnwrapper: Decodable {
     }
 }
 
-public struct PostgresDataDecoder {
-    public init() {}
+public final class PostgresDataDecoder {
+    public let jsonDecoder: JSONDecoder
+
+    public init(json: JSONDecoder = JSONDecoder()) {
+        self.jsonDecoder = json
+    }
 
     public func decode<T>(_ type: T.Type, from data: PostgresData) throws -> T
         where T: Decodable
     {
         if let convertible = T.self as? PostgresDataConvertible.Type {
             return convertible.init(postgresData: data)! as! T
         } else {
-            return try T.init(from: _Decoder(data: data))
+            return try T.init(from: _Decoder(data: data, json: self.jsonDecoder))
         }
     }
 
@@ -30,8 +34,11 @@ public struct PostgresDataDecoder {
         }
 
         let data: PostgresData
-        init(data: PostgresData) {
+        let json: JSONDecoder
+
+        init(data: PostgresData, json: JSONDecoder) {
             self.data = data
+            self.json = json
         }
 
         func unkeyedContainer() throws -> UnkeyedDecodingContainer {
@@ -51,7 +58,7 @@ public struct PostgresDataDecoder {
                     debugDescription: "Cannot decode JSON from nil value"
                 ))
             }
-            let unwrapper = try JSONDecoder()
+            let unwrapper = try self.json
                 .decode(DecoderUnwrapper.self, from: Data(buffer.readableBytesView))
             return unwrapper.decoder
         }

Sources/PostgresKit/PostgresDataEncoder.swift

@@ -1,7 +1,11 @@
 import Foundation
 
-public struct PostgresDataEncoder {
-    public init() { }
+public final class PostgresDataEncoder {
+    public let jsonEncoder: JSONEncoder
+
+    public init(json: JSONEncoder = JSONEncoder()) {
+        self.jsonEncoder = json
+    }
 
     public func encode(_ value: Encodable) throws -> PostgresData {
         if let custom = value as? PostgresDataConvertible {
@@ -12,7 +16,8 @@ public struct PostgresDataEncoder {
                 try value.encode(to: encoder)
                 return encoder.data
             } catch is DoJSON {
-                return try PostgresData(jsonb: Wrapper(value))
+                let data = try self.jsonEncoder.encode(Wrapper(value))
+                return PostgresData(jsonb: data)
             }
         }
     }

Sources/PostgresKit/PostgresRow+SQL.swift

@@ -1,8 +1,17 @@
-extension PostgresRow: SQLRow {
-    public func decode<D>(column: String, as type: D.Type) throws -> D where D : Decodable {
-        guard let data = self.column(column) else {
+extension PostgresRow {
+    public func sql(using decoder: PostgresDataDecoder) -> SQLRow {
+        return _PostgreSQLRow(row: self, decoder: decoder)
+    }
+}
+
+private struct _PostgreSQLRow: SQLRow {
+    let row: PostgresRow
+    let decoder: PostgresDataDecoder
+
+    func decode<D>(column: String, as type: D.Type) throws -> D where D : Decodable {
+        guard let data = self.row.column(column) else {
             fatalError()
         }
-        return try PostgresDataDecoder().decode(D.self, from: data)
+        return try self.decoder.decode(D.self, from: data)
     }
 }