First usable release with working Postgres support

README.md

@@ -16,7 +16,15 @@ This package should be compatible with:
 - Postgres >= 9.5
 - Mysql >= 8.0.1
 - MariaDB >= 10.3
-- Sqlite
+
+ 
+
+:rotating_light: At the moment the Fluent MySQL driver seems to have issues with `Data` (`blob`) fields. 
+This means that currently (QueuesFluentDriver 0.2.0, fluent-mysql-driver 4.0.0-rc) **ONLY POSTGRES IS SUPPORTED  BY THIS DRIVER** 
+
+ 
+
+Sqlite could be made to work in theory, but it would currently require that there is only one single Queues worker polling for jobs - and that the database has `journal_mode` set to `wal`. In short: it won't work, don't try.
 
 
 ## Usage
@@ -40,7 +48,7 @@ let package = Package(
     ],
     dependencies: [
         ...
-        .package(url: "https://github.com/m-barthelemy/vapor-queues-fluent-driver.git", from: "0.1.11"),
+        .package(url: "https://github.com/m-barthelemy/vapor-queues-fluent-driver.git", from: "0.2.0"),
         ...
     ],
     targets: [
@@ -81,7 +89,7 @@ app.migrations.add(JobModelMigrate())
 
 Finally. load the `QueuesFluentDriver` driver:
 ```swift    
-app.queues.use(.fluent(.psql, dbType: .postgres))
+app.queues.use(.fluent(.psql))
 ```
 
 
@@ -94,7 +102,7 @@ In that case you would initialize the Queues configuration like this:
 ```swift
 let queuesDb = DatabaseID(string: "my_queues_db")
 app.databases.use(.postgres(configuration: dbConfig), as: queuesDb, isDefault: false)
-app.queues.use(.fluent(queuesDb, dbType: .postgres))
+app.queues.use(.fluent(queuesDb))
 ```
 
 ### Customizing the jobs table name
@@ -122,6 +130,6 @@ By default, this driver uses Fluent's "soft delete" feature, meaning that comple
 If you want to delete the entry as soon as job is completed, you can set the `useSoftDeletes` option to `false`:
 
 ```swift
-app.queues.use(.fluent(.psql, dbType: .postgres, useSoftDeletes: false))
+app.queues.use(.fluent(.psql, useSoftDeletes: false))
 ```
 

Sources/QueuesFluentDriver/FluentQueue.swift

@@ -37,8 +37,8 @@ extension FluentQueue: Queue {
         guard let uuid = UUID(uuidString: id.string) else {
             return database.eventLoop.makeFailedFuture(QueuesFluentError.invalidIdentifier)
         }
-        let data = jobStorage //try JSONEncoder().encode(jobStorage)
-        return JobModel(id: uuid, key: key, data: data).save(on: database)
+        //let data = try! JSONEncoder().encode(jobStorage)
+        return JobModel(id: uuid, key: key, data: jobStorage).save(on: database)
             .map { return }
     }
 
@@ -109,7 +109,9 @@ extension FluentQueue: Queue {
             case .mysql:
                 popProvider = MySQLPop()
             case .sqlite:
-                popProvider = SqlitePop()            
+                popProvider = SqlitePop()
+            default:
+                return self.context.eventLoop.makeFailedFuture(QueuesFluentError.databaseNotFound)
         }
         return popProvider.pop(db: database, select: selectQuery.query).optionalMap { id in
             return JobIdentifier(string: id.uuidString)

Sources/QueuesFluentDriver/JobModelMigrate.swift

@@ -13,7 +13,7 @@ public struct JobModelMigrate: Migration {
         return database.schema(JobModel.schema)
             .id()
             .field(model.$key.key,               .string,   .required)
-            .field(model.$data.key,              .data,    .required)
+            .field(model.$data.key,              .data,     .required)
             .field(model.$state.key,             .string,   .required)
             .field(model.$createdAt.path.first!, .datetime)
             .field(model.$updatedAt.path.first!, .datetime)

Sources/QueuesFluentDriver/PopQueries/SqlitePopQuery.swift

@@ -8,10 +8,9 @@ final class SqlitePop : PopQueryProtocol {
         let database = db as! SQLDatabase
         //let beginImmediateTrxn = database.raw("BEGIN IMMEDIATE").
 
-        return database.raw(SQLQueryString("BEGIN IMMEDIATE")).run().flatMap { void in
+        //return database.raw(SQLQueryString("BEGIN IMMEDIATE")).run().flatMap { void in
             var id: UUID?
             return database.execute(sql: select) { (row) -> Void in
-                print("••• columns: \(row.allColumns)")
                 id = try? row.decode(column: "\(FluentQueue.model.$id.key)", as: UUID.self)
             }
             .flatMap {
@@ -31,6 +30,6 @@ final class SqlitePop : PopQueryProtocol {
                 }
                 return database.eventLoop.makeSucceededFuture(nil)
             }
-        }
+        //}
     }
 }

Sources/QueuesFluentDriver/Queues.Provider+fluent.swift

@@ -5,11 +5,7 @@ import Queues
 
 extension Application.Queues.Provider {
     /// `database`: the Fluent `Database` already configured in your application.
-    /// `dbType`: one of `.psql`, `.mysq;`, `.sqlite`
     /// `useSoftDeletes`: if set to `false`, really delete completed jobs insetad of using Fluent's default SoftDelete feature.
-    /// **WARNING**: if set to `false`, with any database engine other than Sqlite, a given job could be picked by multiple workers, unless you only have one single Queues worker/process.
-    /// `useSkipLocked` is `true` by default and is supported on Mysql >= 8.0.1, MariaDB >= 10.3, Postgres >= 9.5, Oracle >= 9i(?).
-    /// Sqlite doesn't have nor need it since it uses full table locking on update. Other dbs are just too weird (SQL Server).
     public static func fluent(_ dbId: DatabaseID, useSoftDeletes: Bool = true) -> Self {
         .init {
             $0.queues.use(custom: