Beta 4 (#138)

* beta 4

* updates

* 5.2

Author: tanner0101

.github/workflows/test.yml

@@ -4,7 +4,7 @@ on:
 jobs:
   xenial:
     container: 
-      image: vapor/swift:5.1-xenial
+      image: vapor/swift:5.2-xenial
     services:
       psql:
         image: postgres
@@ -20,7 +20,7 @@ jobs:
     - run: swift test --enable-test-discovery --sanitize=thread
   bionic:
     container: 
-      image: vapor/swift:5.1-bionic
+      image: vapor/swift:5.2-bionic
     services:
       psql:
         image: postgres

Sources/FluentPostgresDriver/FluentPostgresDatabase.swift

@@ -39,6 +39,28 @@ extension _FluentPostgresDatabase: Database {
             return self.eventLoop.makeFailedFuture(error)
         }
     }
+
+    func transaction<T>(_ closure: @escaping (Database) -> EventLoopFuture<T>) -> EventLoopFuture<T> {
+        self.database.withConnection { conn in
+            conn.simpleQuery("BEGIN").flatMap { _ in
+                let db = _FluentPostgresDatabase(
+                    database: conn,
+                    context: self.context,
+                    encoder: self.encoder,
+                    decoder: self.decoder
+                )
+                return closure(db).flatMap { result in
+                    conn.simpleQuery("COMMIT").map { _ in
+                        result
+                    }
+                }.flatMapError { error in
+                    conn.simpleQuery("ROLLBACK").flatMapThrowing { _ in
+                        throw error
+                    }
+                }
+            }
+        }
+    }
 
     func withConnection<T>(_ closure: @escaping (Database) -> EventLoopFuture<T>) -> EventLoopFuture<T> {
         self.database.withConnection {

Tests/FluentPostgresDriverTests/FluentPostgresDriverTests.swift

@@ -32,10 +32,6 @@ final class FluentPostgresDriverTests: XCTestCase {
         try self.benchmarker.testEagerLoadParent()
     }
 
-    func testEagerLoadParentJoin() throws {
-        try self.benchmarker.testEagerLoadParentJoin()
-    }
-
     func testEagerLoadParentJSON() throws {
         try self.benchmarker.testEagerLoadParentJSON()
     }
@@ -180,6 +176,14 @@ final class FluentPostgresDriverTests: XCTestCase {
         try self.benchmarker.testMultipleSet()
     }
 
+    func testTransaction() throws {
+        try self.benchmarker.testTransaction()
+    }
+
+    func testPagination() throws {
+        try self.benchmarker.testPagination()
+    }
+
     func testBlob() throws {
         final class Foo: Model {
             static let schema = "foos"