Use driver encoder instead of hardcoded String data type

m-barthelemy · Apr 5, 2020 · 9f50300 · 9f50300
1 parent 92e7552
commit 9f50300
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/Sources/MySQL/MySQL.swift b/Sources/MySQL/MySQL.swift
@@ -2,10 +2,11 @@ import Foundation
 import Fluent
 import SQLKit
 import FluentMySQLDriver
+import MySQLKit
 import QueuesFluentDriver
 
-/*
-struct dbDriver {
+
+/*struct dbDriver {
     private func dbDriver(_ database: Database) ->  MySQLDatabase {
         return database as! MySQLDatabase
     }
@@ -16,12 +17,12 @@ struct dbDriver {
 
     func rawQuery(db: Database, query: SQLExpression) -> EventLoopFuture<UUID?> {
         let sql = (db as! SQLDatabase).serialize(query)
-        let binds = sql.binds.map { encodeValue($0 as! String) }
+        let encoder = MySQLDataEncoder()
+        let binds = sql.binds.map { try! encoder.encode($0) }
         return dbDriver(db).query(sql.sql, binds).map { row in
             let id = row.first?.column(JobModel.init().$id.key.description)?.uuid
             return id
         }
     }
 }
-
 */
diff --git a/Sources/Postgres/Postgres.swift b/Sources/Postgres/Postgres.swift
@@ -6,13 +6,12 @@ struct dbDriver {
         return database as! PostgresDatabase
     }
 
-    private func encodeValue(_ value: String) -> PostgresData {
-        return PostgresData(string: value)
-    }
 
     func rawQuery(db: Database, query: SQLExpression) -> EventLoopFuture<UUID?> {
         let sql = (db as! SQLDatabase).serialize(query)
-        let binds = sql.binds.map { encodeValue($0 as! String) }
+        let encoder = PostgresDataEncoder()
+        let binds = sql.binds.map { try! encoder.encode($0) }
+
         return dbDriver(db).query(sql.sql, binds).map { row in
             let id = row.first?.column(JobModel.init().$id.key.description)?.uuid
             return id

diff --git a/Sources/Sqlite/Sqlite.swift b/Sources/Sqlite/Sqlite.swift
@@ -7,13 +7,10 @@ import QueuesFluentDriver
         return database as! SQLiteDatabase
     }
 
-    private func encodeValue(_ value: String) -> SQLiteData {
-        return SQLiteData.text(value)
-    }
-
     func rawQuery(db: Database, query: SQLExpression) -> EventLoopFuture<UUID?> {
         let sql = (db as! SQLDatabase).serialize(query)
-        let binds = sql.binds.map { encodeValue($0 as! String) }
+        let encoder = SQLiteDataEncoder()
+        let binds = sql.binds.map { try! encoder.encode($0) }
         return dbDriver(db).query(sql.sql, binds).map { row in
             let id = try? row.first?.decode(column: JobModel.init().$id.key.description, as: JobModel.IDValue.self)
             return id