Merge pull request #12 from siemensikkema/feature/update-fluent

Feature/update fluent

.github/workflows/test.yml

@@ -0,0 +1,26 @@
+name: test
+on:
+  pull_request:
+  push:
+    branches:
+    - master
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    container: swift:5.2-bionic
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Run tests with Thread Sanitizer
+        run: swift test --enable-test-discovery --sanitize=thread
+  macOS:
+    runs-on: macos-latest
+    steps:
+      - name: Select latest available Xcode
+        uses: maxim-lobanov/setup-xcode@1.0
+        with:
+          xcode-version: latest
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Run tests with Thread Sanitizer
+        run: swift test --enable-test-discovery --sanitize=thread

Package.swift

@@ -15,7 +15,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
-        .package(url: "https://github.com/vapor/fluent.git", from: "4.0.0-rc.3"),
+        .package(url: "https://github.com/vapor/fluent.git", from: "4.0.0"),
         .package(url: "https://github.com/vapor/sql-kit.git", from: "3.1.0"),
         .package(url: "https://github.com/vapor/queues.git", from: "1.1.0"),
     ],
@@ -29,9 +29,10 @@ let package = Package(
                 .product(name: "Queues", package: "queues")
             ],
             path: "Sources"
-        )
-        /*.testTarget(
+        ),
+        .testTarget(
             name: "QueuesFluentDriverTests",
-            dependencies: ["QueuesFluentDriver"]),*/
+            dependencies: ["QueuesFluentDriver"]
+        ),
     ]
 )

Sources/QueuesFluentDriver/FluentQueue.swift

@@ -23,15 +23,13 @@ extension FluentQueue: Queue {
     }
 
     public func set(_ id: JobIdentifier, to jobStorage: JobData) -> EventLoopFuture<Void> {
-        //let data = try! JSONEncoder().encode(jobStorage)
         do {
             let jobModel = try JobModel(jobId: id.string, queue: queueName.string, data: jobStorage)
             return jobModel.save(on: db)
         }
         catch {
             return db.eventLoop.makeFailedFuture(QueuesFluentError.jobDataEncodingError(error.localizedDescription))
-        }
-
+        }        
     }
 
     public func clear(_ id: JobIdentifier) -> EventLoopFuture<Void> {

Sources/QueuesFluentDriver/FluentQueuesDriver.swift

@@ -13,10 +13,10 @@ public struct FluentQueuesDriver {
     let useSoftDeletes: Bool
     let eventLoopGroup: EventLoopGroup
 
-    init(on databaseId: DatabaseID? = nil, useSoftDeletes: Bool, on: EventLoopGroup) {
+    init(on databaseId: DatabaseID? = nil, useSoftDeletes: Bool, on eventLoopGroup: EventLoopGroup) {
         self.databaseId = databaseId
         self.useSoftDeletes = useSoftDeletes
-        self.eventLoopGroup = on
+        self.eventLoopGroup = eventLoopGroup
     }
 }
 

Sources/QueuesFluentDriver/PopQueries/MySQLPopQuery.swift

@@ -2,7 +2,7 @@ import Foundation
 import SQLKit
 import Fluent
 
-final class MySQLPop : PopQueryProtocol {
+final class MySQLPop: PopQueryProtocol {
     // MySQL is a bit challenging since it doesn't support updating a table that is
     //  used in a subquery.
     // So we first select, then update, with the whole process wrapped in a transaction.

Sources/QueuesFluentDriver/PopQueries/PostgresPopQuery.swift

@@ -3,7 +3,7 @@ import Foundation
 import SQLKit
 import Fluent
 
-final class PostgresPop : PopQueryProtocol {
+final class PostgresPop: PopQueryProtocol {
     func pop(db: Database, select: SQLExpression) -> EventLoopFuture<String?> {
         let db = db as! SQLDatabase
         let subQueryGroup = SQLGroupExpression.init(select)

Sources/QueuesFluentDriver/PopQueries/SqlitePopQuery.swift

@@ -2,7 +2,7 @@ import Foundation
 import SQLKit
 import Fluent
 
-final class SqlitePop : PopQueryProtocol {
+final class SqlitePop: PopQueryProtocol {
     func pop(db: Database, select: SQLExpression) -> EventLoopFuture<String?> {
         db.transaction { transaction in
             let database = transaction as! SQLDatabase

Sources/QueuesFluentDriver/SQLExpressionExtensions.swift

@@ -16,7 +16,7 @@ enum SQLSkipLocked: SQLExpression {
     }
 }
 
-enum SqlReturning : SQLExpression {
+enum SqlReturning: SQLExpression {
     /// `RETURNING *`
     case all
     case column(_ column: FieldKey)

Tests/LinuxMain.swift

@@ -1,7 +1 @@
-import XCTest
-
-import QueuesFluentDriverTests
-
-var tests = [XCTestCaseEntry]()
-tests += QueuesFluentDriverTests.allTests()
-XCTMain(tests)
+fatalError("Please use swift test --enable-test-discovery to run the tests instead")

Tests/QueuesFluentDriverTests/QueuesFluentDriverTests.swift

@@ -8,8 +8,4 @@ final class QueuesFluentDriverTests: XCTestCase {
         // results.
         //XCTAssertEqual(QueuesFluentDriver().text, "Hello, World!")
     }
-
-    static var allTests = [
-        ("testExample", testExample),
-    ]
 }