final tests passing

Author: tanner0101

Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         .package(url: "https://github.com/vapor/async.git", .branch("beta")),
 
         // Swift ORM framework (queries, models, and relations) for building NoSQL and SQL database integrations.
-        .package(url: "https://github.com/vapor/fluent.git", .branch("benchmark-await")),
+        .package(url: "https://github.com/vapor/fluent.git", .branch("beta")),
 
         // Pure Swift, async/non-blocking client for PostgreSQL.
         .package(url: "https://github.com/vapor/postgresql.git", .branch("beta")),

Sources/FluentPostgreSQL/PostgreSQLDatabase+QuerySupporting.swift

@@ -8,7 +8,7 @@ extension PostgreSQLDatabase: QuerySupporting {
     public static func execute<I, D>(query: DatabaseQuery<PostgreSQLDatabase>, into stream: I, on connection: PostgreSQLConnection)
         where I: Async.InputStream, D: Decodable, D == I.Input
     {
-        let future = Future<Void> {
+        let future = Future<Void>.flatMap {
             // Convert Fluent `DatabaseQuery` to generic FluentSQL `DataQuery`
             var (sqlQuery, bindValues) = query.makeDataQuery()
 

Sources/FluentPostgreSQL/PostgreSQLDatabase+SchemaSupporting.swift

@@ -65,8 +65,9 @@ extension PostgreSQLDatabase: SchemaSupporting {
     /// See `SchemaSupporting.execute`
     public static func execute(schema: DatabaseSchema<PostgreSQLDatabase>, on connection: PostgreSQLConnection) -> Future<Void> {
         do {
-            let sqlQuery = schema.makeSchemaQuery(dataTypeFactory: dataType)
-            let sqlString = PostgreSQLSQLSerializer().serialize(schema: sqlQuery)
+            var schemaQuery = schema.makeSchemaQuery(dataTypeFactory: dataType)
+            schema.applyReferences(to: &schemaQuery)
+            let sqlString = PostgreSQLSQLSerializer().serialize(schema: schemaQuery)
             return try connection.query(sqlString).map(to: Void.self) { rows in
                 assert(rows.count == 0)
             }

Sources/FluentPostgreSQL/PostgreSQLDatabase+TransactionSupporting.swift

@@ -6,37 +6,11 @@ extension PostgreSQLDatabase: TransactionSupporting {
         return connection.simpleQuery("BEGIN TRANSACTION").flatMap(to: Void.self) { results in
             return transaction.run(on: connection).flatMap(to: Void.self) { void in
                 return connection.simpleQuery("END TRANSACTION").transform(to: ())
-            }.flatMapError { error in
+            }.catchFlatMap { error in
                 return connection.simpleQuery("ROLLBACK").map(to: Void.self) { results in
                     throw error
                 }
             }
         }
     }
 }
-
-
-extension Future {
-    func mapError(_ callback: @escaping (Error) -> (Expectation)) -> Future<Expectation> {
-        let promise = Promise(Expectation.self)
-        addAwaiter { result in
-            switch result {
-            case .error(let error): promise.complete(callback(error))
-            case .expectation(let e): promise.complete(e)
-            }
-        }
-        return promise.future
-    }
-
-
-    func flatMapError(_ callback: @escaping (Error) -> (Future<Expectation>)) -> Future<Expectation> {
-        let promise = Promise(Expectation.self)
-        addAwaiter { result in
-            switch result {
-            case .error(let error): callback(error).chain(to: promise)
-            case .expectation(let e): promise.complete(e)
-            }
-        }
-        return promise.future
-    }
-}