add test for #24

Author: tanner0101

Sources/FluentPostgreSQL/FluentPostgreSQLProvider.swift

@@ -40,7 +40,7 @@ public final class PostgreSQLVersionCheckProvider: Provider {
     public func boot(_ worker: Container) throws {
         try worker.withConnection(to: .psql) { conn in
             conn.simpleQuery("SELECT current_setting('server_version') as version").map(to: Void.self) { rows in
-                _serverVersion = try rows[0]["version"]!.decode(String.self)
+                _serverVersion = try rows[0].firstValue(forColumn: "version")!.decode(String.self)
                 if let versionString = _serverVersion {
                     let pointIndex = versionString.index(of: ".") ?? versionString.endIndex
                     let majorVersion = versionString[..<pointIndex]
@@ -61,4 +61,4 @@ public final class PostgreSQLVersionCheckProvider: Provider {
 /// server version string
 internal var _serverVersion: String?
 /// Enabled by default
-internal var _globalEnableIdentityColumns: Bool = true
+internal var _globalEnableIdentityColumns: Bool = true

Sources/FluentPostgreSQL/PostgreSQLDatabase+QuerySupporting.swift

@@ -67,7 +67,7 @@ extension PostgreSQLDatabase: QuerySupporting, CustomSQLSupporting {
                 return Future.map(on: connection) { model }
             }
         case .didCreate:
-            if M.ID.self == Int.self {
+            if M.ID.self == Int.self, model.fluentID == nil {
                 return connection.simpleQuery("SELECT LASTVAL();").map(to: M.self) { row in
                     var model = model
                     try model.fluentID = row[0].firstValue(forColumn: "lastval")?.decode(Int.self) as? M.ID

Tests/FluentPostgreSQLTests/FluentPostgreSQLTests.swift

@@ -132,6 +132,22 @@ class FluentPostgreSQLTests: XCTestCase {
         benchmarker.pool.releaseConnection(conn)
     }
 
+    func testGH24() throws {
+        benchmarker.database.enableLogging(using: .print)
+        let conn = try benchmarker.pool.requestConnection().wait()
+        try? Allergy.revert(on: conn).wait()
+        try Allergy.prepare(on: conn).wait()
+        struct Allergy: PostgreSQLModel, Migration {
+            static let entity = "allergies"
+            var id: Int?
+        }
+        _ = try Allergy(id: 2).create(on: conn).wait()
+        _ = try Allergy(id: 4).create(on: conn).wait()
+        let stuff = try Allergy.query(on: conn).filter(\Allergy.id, in: [1, 2, 3]).all().wait()
+        XCTAssertEqual(stuff.count, 1)
+        XCTAssertEqual(stuff.first?.id, 2)
+    }
+
     static let allTests = [
         ("testSchema", testSchema),
         ("testModels", testModels),
@@ -146,6 +162,7 @@ class FluentPostgreSQLTests: XCTestCase {
         ("testReferentialActions", testReferentialActions),
         ("testIndexSupporting", testIndexSupporting),
         ("testMinimumViableModelDeclaration", testMinimumViableModelDeclaration),
+        ("testGH24", testGH24),
     ]
 }