beta 3 fixes

Author: tanner0101

Package.swift

@@ -15,10 +15,10 @@ let package = Package(
         .package(url: "https://github.com/vapor/core.git", "3.0.0-beta.1"..<"3.0.0-beta.2"),
 
         // Swift ORM framework (queries, models, and relations) for building NoSQL and SQL database integrations.
-        .package(url: "https://github.com/vapor/fluent.git", "3.0.0-beta.2"..<"3.0.0-beta.3"),
+        .package(url: "https://github.com/vapor/fluent.git", "3.0.0-beta.3"..<"3.0.0-beta.4"),
 
         // Pure Swift, async/non-blocking client for PostgreSQL.
-        .package(url: "https://github.com/vapor/postgresql.git", "1.0.0-beta.2"..<"1.0.0-beta.3"),
+        .package(url: "https://github.com/vapor/postgresql.git", "1.0.0-beta.3"..<"1.0.0-beta.4"),
     ],
     targets: [
         .target(name: "FluentPostgreSQL", dependencies: ["Async", "CodableKit", "Fluent", "FluentSQL", "PostgreSQL"]),

Sources/FluentPostgreSQL/FluentPostgreSQLProvider.swift

@@ -6,7 +6,14 @@ public final class FluentPostgreSQLProvider: Provider {
     public static let repositoryName = "fluent-postgresql"
 
     /// Creates a new `FluentPostgreSQLProvider`
-    public init() {}
+    ///
+    /// - enableIdentityColumns: If true, `GENERATED BY DEFAULT AS IDENTITY` will be used.
+    ///                          `true` by default.
+    public init(enableIdentityColumns: Bool? = nil) {
+        if let enableIdentityColumns = enableIdentityColumns {
+            _globalEnableIdentityColumns = enableIdentityColumns
+        }
+    }
 
     /// See `Provider.register(_:)`
     public func register(_ services: inout Services) throws {
@@ -17,3 +24,6 @@ public final class FluentPostgreSQLProvider: Provider {
     /// See `Provider.boot(_:)`
     public func boot(_ worker: Container) throws { }
 }
+
+/// Enabled by default
+internal var _globalEnableIdentityColumns: Bool = true

Sources/FluentPostgreSQL/PostgreSQLDatabase+SchemaSupporting.swift

@@ -2,7 +2,7 @@ import Async
 import Foundation
 
 /// Adds ability to create, update, and delete schemas using a `PostgreSQLDatabase`.
-extension PostgreSQLDatabase: SchemaSupporting {
+extension PostgreSQLDatabase: SchemaSupporting, IndexSupporting {
     /// See `SchemaSupporting.dataType`
     public static func dataType(for field: SchemaField<PostgreSQLDatabase>) -> String {
         var string: String
@@ -18,7 +18,13 @@ extension PostgreSQLDatabase: SchemaSupporting {
 
         if field.isIdentifier {
             switch field.type.type {
-            case .int8, .int4, .int2: string += " GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY"
+            case .int8, .int4, .int2:
+                if _globalEnableIdentityColumns {
+                    string += " GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY"
+                } else {
+                    // not appending!
+                    string = "SERIAL PRIMARY KEY"
+                }
             default: string += " PRIMARY KEY"
             }
         } else if !field.isOptional {
@@ -52,9 +58,37 @@ extension PostgreSQLDatabase: SchemaSupporting {
             let sqlString = PostgreSQLSQLSerializer().serialize(schema: schemaQuery)
             return try connection.query(sqlString).map(to: Void.self) { rows in
                 assert(rows.count == 0)
+            }.flatMap(to: Void.self) {
+                /// handle indexes as separate query
+                var indexFutures: [Future<Void>] = []
+                for addIndex in schema.addIndexes {
+                    let fields = addIndex.fields.map { "\"\($0.name)\"" }.joined(separator: ", ")
+                    let name = addIndex.psqlName(for: schema.entity)
+                    let add = connection.simpleQuery("CREATE \(addIndex.isUnique ? "UNIQUE " : "")INDEX \"\(name)\" ON \"\(schema.entity)\" (\(fields))").map(to: Void.self) { rows in
+                        assert(rows.count == 0)
+                    }
+                    indexFutures.append(add)
+                }
+                for removeIndex in schema.removeIndexes {
+                    let name = removeIndex.psqlName(for: schema.entity)
+                    let remove = connection.simpleQuery("DROP INDEX \"\(name)\"").map(to: Void.self) { rows in
+                        assert(rows.count == 0)
+                    }
+                    indexFutures.append(remove)
+                }
+                return indexFutures.flatten()
             }
+
+            
         } catch {
             return Future(error: error)
         }
     }
 }
+
+extension SchemaIndex {
+    func psqlName(for entity: String) -> String {
+        return "_fluent_index_\(entity)_" + fields.map { $0.name }.joined(separator: "_")
+    }
+}
+

Tests/FluentPostgreSQLTests/FluentPostgreSQLTests.swift

@@ -11,7 +11,7 @@ class FluentPostgreSQLTests: XCTestCase {
     override func setUp() {
         eventLoop = try! DefaultEventLoop(label: "codes.vapor.postgresql.test")
         database = PostgreSQLDatabase(config: .default())
-        benchmarker = Benchmarker(database, config: .init(), on: eventLoop, onFail: XCTFail)
+        benchmarker = Benchmarker(database, on: eventLoop, onFail: XCTFail)
     }
 
     func testSchema() throws {
@@ -61,7 +61,7 @@ class FluentPostgreSQLTests: XCTestCase {
     func testNestedStruct() throws {
         /// Swift runtime does not yet support dynamically querying conditional conformance ('Swift.Array<Swift.String>': 'CodableKit.AnyKeyStringDecodable')
         return;
-        let conn = try database.makeConnection(using: .init(), on: eventLoop).await(on: eventLoop)
+        let conn = try database.makeConnection(on: eventLoop).await(on: eventLoop)
         try User.prepare(on: conn).await(on: eventLoop)
         let user = User(id: nil, name: "Tanner", pet: Pet(name: "Zizek"))
         user.favoriteColors = ["pink", "blue"]
@@ -80,6 +80,10 @@ class FluentPostgreSQLTests: XCTestCase {
         conn.close()
     }
 
+    func testIndexSupporting() throws {
+        try benchmarker.benchmarkIndexSupporting_withSchema()
+    }
+
     static let allTests = [
         ("testSchema", testSchema),
         ("testModels", testModels),
@@ -92,6 +96,7 @@ class FluentPostgreSQLTests: XCTestCase {
         ("testJoins", testJoins),
         ("testSoftDeletable", testSoftDeletable),
         ("testReferentialActions", testReferentialActions),
+        ("testIndexSupporting", testIndexSupporting),
     ]
 }