Merge pull request #39 from vapor/dbkit-gm

dbkit 1.0.0 gm

Author: tanner0101

Package.swift

@@ -9,13 +9,13 @@ let package = Package(
     ],
     dependencies: [
         // 🌎 Utility package containing tools for byte manipulation, Codable, OS APIs, and debugging.
-        .package(url: "https://github.com/vapor/core.git", from: "3.0.0-rc.2"),
+        .package(url: "https://github.com/vapor/core.git", from: "3.0.0"),
 
         // Swift ORM framework (queries, models, and relations) for building NoSQL and SQL database integrations.
-        .package(url: "https://github.com/vapor/fluent.git", from: "3.0.0-rc.2"),
+        .package(url: "https://github.com/vapor/fluent.git", from: "3.0.0-rc"),
 
         // 🐘 Non-blocking, event-driven Swift client for PostgreSQL.
-        .package(url: "https://github.com/vapor/postgresql.git", from: "1.0.0-rc.2"),
+        .package(url: "https://github.com/vapor/postgresql.git", from: "1.0.0"),
     ],
     targets: [
         .target(name: "FluentPostgreSQL", dependencies: ["Async", "Fluent", "FluentSQL", "PostgreSQL"]),

Sources/FluentPostgreSQL/FluentPostgreSQLProvider.swift

@@ -24,7 +24,7 @@ public final class FluentPostgreSQLProvider: Provider {
 
     /// See `Provider.boot(_:)`
     public func willBoot(_ worker: Container) throws -> Future<Void> {
-        return worker.withConnection(to: .psql) { conn in
+        return worker.withPooledConnection(to: .psql) { conn in
             return conn.simpleQuery("SELECT current_setting('server_version') as version").map(to: Void.self) { rows in
                 _serverVersion = try rows[0].firstValue(forColumn: "version")!.decode(String.self)
                 if let versionString = _serverVersion {

Sources/FluentPostgreSQL/PostgreSQLDatabase+LogSupporting.swift

@@ -3,7 +3,7 @@ import Core
 import FluentSQL
 
 /// Adds ability to do basic Fluent queries using a `PostgreSQLDatabase`.
-extension PostgreSQLDatabase: QuerySupporting, CustomSQLSupporting {
+extension PostgreSQLDatabase: QuerySupporting, CustomSQLSupporting, KeyedCacheSupporting {
     /// See `QuerySupporting.execute`
     public static func execute(
         query: DatabaseQuery<PostgreSQLDatabase>,
@@ -15,15 +15,26 @@ extension PostgreSQLDatabase: QuerySupporting, CustomSQLSupporting {
             // Convert Fluent `DatabaseQuery` to generic FluentSQL `DataQuery`
             var (sqlQuery, bindValues) = query.makeDataQuery()
 
-            // If the query has an Encodable model attached serialize it.
-            // Dictionary keys should be added to the DataQuery as columns.
-            // Dictionary values should be added to the parameterized array.
-            var modelData: [PostgreSQLData] = []
-            modelData.reserveCapacity(query.data.count)
-            for (field, data) in query.data {
-                if case .create = query.action, data.isNull && field.name == "id" { continue } // bad hack
-                sqlQuery.columns.append(DataColumn(table: field.entity, name: field.name))
-                modelData.append(data)
+            /// Convert params
+            let parameters: [PostgreSQLData]
+
+            switch sqlQuery {
+            case .manipulation(var m):
+                // If the query has an Encodable model attached serialize it.
+                // Dictionary keys should be added to the DataQuery as columns.
+                // Dictionary values should be added to the parameterized array.
+                var modelData: [PostgreSQLData] = []
+                modelData.reserveCapacity(query.data.count)
+                m.columns = query.data.compactMap { (field, data) in
+                    // if case .create = query.action, data.isNull && field.name == "id" { return nil } // bad hack
+                    modelData.append(data)
+                    let col = DataColumn(table: field.entity, name: field.name)
+                    return .init(column: col, value: .placeholder)
+                }
+                parameters = modelData + bindValues
+                sqlQuery = .manipulation(m)
+            case .query: parameters = bindValues
+            case .definition: parameters = []
             }
 
             /// Apply custom sql transformations
@@ -33,18 +44,10 @@ extension PostgreSQLDatabase: QuerySupporting, CustomSQLSupporting {
 
             // Create a PostgreSQL-flavored SQL serializer to create a SQL string
             let sqlSerializer = PostgreSQLSQLSerializer()
-            let sqlString = sqlSerializer.serialize(data: sqlQuery)
-
-            /// Convert params
-            let parameters: [PostgreSQLData] = modelData + bindValues
-
-            /// Log supporting
-            if let logger = connection.logger {
-                logger.log(query: sqlString, parameters: parameters)
-            }
+            let sqlString = sqlSerializer.serialize(sqlQuery)
 
             // Run the query
-            return try connection.query(sqlString, parameters) { row in
+            return connection.query(sqlString, parameters) { row in
                 var res: [QueryField: PostgreSQLData] = [:]
                 for (col, data) in row {
                     let field = QueryField(entity: tableNameCache.storage[col.tableOID], name: col.name)

Sources/FluentPostgreSQL/PostgreSQLDatabase+QuerySupporting.swift

@@ -68,11 +68,16 @@ extension PostgreSQLDatabase: SchemaSupporting, IndexSupporting {
         return Future.flatMap(on: connection) {
             var schemaQuery = schema.makeSchemaQuery(dataTypeFactory: dataType)
             schema.applyReferences(to: &schemaQuery)
-            let sqlString = PostgreSQLSQLSerializer().serialize(schema: schemaQuery)
-            if let logger = connection.logger {
-                logger.log(query: sqlString, parameters: [])
+
+            var sqlQuery: SQLQuery = .definition(schemaQuery)
+
+            /// Apply custom sql transformations
+            for customSQL in schema.customSQL {
+                customSQL.closure(&sqlQuery)
             }
-            return try connection.query(sqlString).map(to: Void.self) { rows in
+
+            let sqlString = PostgreSQLSQLSerializer().serialize(sqlQuery)
+            return connection.query(sqlString).map(to: Void.self) { rows in
                 assert(rows.count == 0)
             }.flatMap(to: Void.self) {
                 /// handle indexes as separate query

Sources/FluentPostgreSQL/PostgreSQLDatabase+SchemaSupporting.swift

@@ -10,13 +10,13 @@ internal class PostgreSQLSQLSerializer: SQLSerializer {
         self.placeholderOffset = 1
     }
 
-    /// See `SQLSerializer.makeEscapedString(from:)`
+    /// See `SQLSerializer`
     func makeEscapedString(from string: String) -> String {
         return "\"\(string)\""
     }
 
-    /// See `SQLSerializer.makePlaceholder(name:)`
-    func makePlaceholder(name: String) -> String {
+    /// See `SQLSerializer`
+    func makePlaceholder() -> String {
         defer { placeholderOffset += 1 }
         return "$\(placeholderOffset)"
     }

Sources/FluentPostgreSQL/PostgreSQLSQLSerializer.swift

@@ -27,7 +27,7 @@ class FluentPostgreSQLTests: XCTestCase {
         )
         database = PostgreSQLDatabase(config: config)
         let eventLoop = MultiThreadedEventLoopGroup(numThreads: 1)
-        benchmarker = Benchmarker(database, on: eventLoop, onFail: XCTFail)
+        benchmarker = try! Benchmarker(database, on: eventLoop, onFail: XCTFail)
     }
 
     func testSchema() throws {
@@ -136,7 +136,6 @@ class FluentPostgreSQLTests: XCTestCase {
 
 
     func testUpdate() throws {
-        benchmarker.database.enableLogging(using: .print)
         let conn = try benchmarker.pool.requestConnection().wait()
         defer { try? User.revert(on: conn).wait() }
         try User.prepare(on: conn).wait()
@@ -148,7 +147,6 @@ class FluentPostgreSQLTests: XCTestCase {
     }
 
     func testGH24() throws {
-        benchmarker.database.enableLogging(using: .print)
         let conn = try benchmarker.pool.requestConnection().wait()
         defer { try? Allergy.revert(on: conn).wait() }
         try Allergy.prepare(on: conn).wait()
@@ -179,7 +177,6 @@ class FluentPostgreSQLTests: XCTestCase {
         try print(Pet.reflectProperties())
 
         /// - prepare db
-        benchmarker.database.enableLogging(using: .print)
         let conn = try benchmarker.pool.requestConnection().wait()
         defer { try? Pet.revert(on: conn).wait() }
         try Pet.prepare(on: conn).wait()
@@ -196,7 +193,6 @@ class FluentPostgreSQLTests: XCTestCase {
     }
 
     func testPersistsDateMillisecondPart() throws {
-        database.enableLogging(using: DatabaseLogger(handler: { print($0) }))
         let conn = try benchmarker.pool.requestConnection().wait()
         defer { try? DefaultTest.revert(on: conn).wait() }
         try DefaultTest.prepare(on: conn).wait()
@@ -220,7 +216,6 @@ class FluentPostgreSQLTests: XCTestCase {
         }
 
         /// - prepare db
-        benchmarker.database.enableLogging(using: .print)
         let conn = try benchmarker.pool.requestConnection().wait()
         defer { try? Foo.revert(on: conn).wait() }
         try Foo.prepare(on: conn).wait()

Tests/FluentPostgreSQLTests/FluentPostgreSQLTests.swift

@@ -1,13 +1,20 @@
 version: 2
 
 jobs:
+
+
+
   macos:
     macos:
       xcode: "9.2"
     steps:
       - checkout
       - run: swift build
       - run: swift test
+
+
+
+
   linux:
     docker:
       - image: codevapor/swift:4.1
@@ -23,6 +30,14 @@ jobs:
       - run: 
           name: Run unit tests
           command: swift test
+
+
+
+  linux-release:
+    docker:
+      - image: codevapor/swift:4.1
+    steps:
+      - checkout
       - run: 
           name: Compile code with optimizations
           command: swift build -c release
@@ -33,6 +48,7 @@ workflows:
   tests:
     jobs:
       - linux
+      - linux-release
       # - macos
 
   nightly: