Merge pull request #45 from vapor/tn-beta-4

Beta 4

Author: tanner0101

.github/workflows/test.yml

@@ -4,15 +4,15 @@ on:
 jobs:
   bionic:
     container: 
-      image: vapor/swift:5.1-bionic
+      image: vapor/swift:5.2-bionic
     runs-on: ubuntu-latest
     steps:
     - run: apt update -y; apt install -y libsqlite3-dev
     - uses: actions/checkout@v1
     - run: swift test --enable-test-discovery --sanitize=thread
   xenial:
     container: 
-      image: vapor/swift:5.1-xenial
+      image: vapor/swift:5.2-xenial
     runs-on: ubuntu-latest
     steps:
     - run: apt update -y; apt install -y libsqlite3-dev

Sources/FluentSQLiteDriver/FluentSQLiteDatabase.swift

@@ -32,6 +32,23 @@ extension _FluentSQLiteDatabase: Database {
                 }
         }
     }
+
+    func transaction<T>(_ closure: @escaping (Database) -> EventLoopFuture<T>) -> EventLoopFuture<T> {
+        self.database.withConnection { conn in
+            conn.query("BEGIN TRANSACTION").flatMap { _ in
+                let db = _FluentSQLiteDatabase(database: conn, context: self.context)
+                return closure(db).flatMap { result in
+                    conn.query("COMMIT TRANSACTION").map { _ in
+                        result
+                    }
+                }.flatMapError { error in
+                    conn.query("ROLLBACK TRANSACTION").flatMapThrowing { _ in
+                        throw error
+                    }
+                }
+            }
+        }
+    }
 
     func execute(schema: DatabaseSchema) -> EventLoopFuture<Void> {
         let sql = SQLSchemaConverter(delegate: SQLiteConverterDelegate()).convert(schema)

Tests/FluentSQLiteDriverTests/FluentSQLiteDriverTests.swift

@@ -32,10 +32,6 @@ final class FluentSQLiteDriverTests: XCTestCase {
         try self.benchmarker.testEagerLoadParent()
     }
 
-    func testEagerLoadParentJoin() throws {
-        try self.benchmarker.testEagerLoadParentJoin()
-    }
-
     func testEagerLoadParentJSON() throws {
         try self.benchmarker.testEagerLoadParentJSON()
     }
@@ -100,6 +96,10 @@ final class FluentSQLiteDriverTests: XCTestCase {
         try self.benchmarker.testTimestampable()
     }
 
+    func testTransaction() throws {
+        try self.benchmarker.testTransaction()
+    }
+
     func testModelMiddleware() throws {
         try self.benchmarker.testModelMiddleware()
     }
@@ -164,10 +164,22 @@ final class FluentSQLiteDriverTests: XCTestCase {
         try self.benchmarker.testRange()
     }
 
+    func testRelationMethods() throws {
+        try self.benchmarker.testRelationMethods()
+    }
+
     func testNonstandardIDKey() throws {
         try self.benchmarker.testNonstandardIDKey()
     }
 
+    func testGroup() throws {
+        try self.benchmarker.testGroup()
+    }
+
+    func testPagination() throws {
+        try self.benchmarker.testPagination()
+    }
+
     var benchmarker: FluentBenchmarker {
         return .init(database: self.database)
     }