dbkit gm 1.0.0 test fixes

Author: tanner0101

Sources/FluentPostgreSQL/PostgreSQLDatabase+QuerySupporting.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>,
@@ -32,6 +32,7 @@ extension PostgreSQLDatabase: QuerySupporting, CustomSQLSupporting {
                     return .init(column: col, value: .placeholder)
                 }
                 parameters = modelData + bindValues
+                sqlQuery = .manipulation(m)
             case .query: parameters = bindValues
             case .definition: parameters = []
             }
@@ -45,11 +46,6 @@ extension PostgreSQLDatabase: QuerySupporting, CustomSQLSupporting {
             let sqlSerializer = PostgreSQLSQLSerializer()
             let sqlString = sqlSerializer.serialize(sqlQuery)
 
-            /// Log supporting
-            if let logger = connection.logger {
-                logger.log(query: sqlString, parameters: parameters)
-            }
-
             // Run the query
             return connection.query(sqlString, parameters) { row in
                 var res: [QueryField: PostgreSQLData] = [:]

Sources/FluentPostgreSQL/PostgreSQLDatabase+SchemaSupporting.swift

@@ -77,9 +77,6 @@ extension PostgreSQLDatabase: SchemaSupporting, IndexSupporting {
             }
 
             let sqlString = PostgreSQLSQLSerializer().serialize(sqlQuery)
-            if let logger = connection.logger {
-                logger.log(query: sqlString, parameters: [])
-            }
             return connection.query(sqlString).map(to: Void.self) { rows in
                 assert(rows.count == 0)
             }.flatMap(to: Void.self) {

Sources/FluentPostgreSQL/PostgreSQLSQLSerializer.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)"
     }

Tests/FluentPostgreSQLTests/FluentPostgreSQLTests.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()