Merge pull request #31 from vapor/alpha

alpha

Author: tanner0101

.gitignore

@@ -7,4 +7,5 @@ Database
 database.db
 Package.resolved
 DerivedData
+.swiftpm
 

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.1
 import PackageDescription
 
 let package = Package(
@@ -7,18 +7,14 @@ let package = Package(
         .library(name: "FluentSQLiteDriver", targets: ["FluentSQLiteDriver"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/fluent-kit.git", .branch("master")),
-        .package(url: "https://github.com/vapor/nio-sqlite.git", .branch("master")),
-        .package(url: "https://github.com/vapor/sql.git", .branch("master")),
-        .package(url: "https://github.com/vapor/nio-kit.git", .branch("master")),
+        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.0.0-alpha"),
+        .package(url: "https://github.com/vapor/sqlite-kit.git", from: "4.0.0-alpha"),
     ],
     targets: [
         .target(name: "FluentSQLiteDriver", dependencies: [
             "FluentKit",
             "FluentSQL",
-            "NIOKit",
-            "NIOSQLite",
-            "SQLKit"
+            "SQLiteKit",
         ]),
         .testTarget(name: "FluentSQLiteDriverTests", dependencies: ["FluentBenchmark", "FluentSQLiteDriver"]),
     ]

README.md

@@ -1,20 +1,20 @@
 <p align="center">
-    <img src="https://user-images.githubusercontent.com/1342803/36623069-9e1f049e-18cf-11e8-99ee-5bf317486191.png" height="64" alt="Fluent SQLite">
+    <img src="https://user-images.githubusercontent.com/1342803/59050726-08a4dd80-8859-11e9-88c0-7b3915690c46.png" alt="FluentSQLiteDriver">
     <br>
     <br>
-    <a href="http://docs.vapor.codes/3.0/fluent/getting-started/">
-        <img src="http://img.shields.io/badge/read_the-docs-2196f3.svg" alt="Documentation">
+    <a href="https://api.vapor.codes/fluent-sqlite-driver/master/FluentSQLiteDriver/index.html">
+        <img src="http://img.shields.io/badge/api-docs-2196f3.svg" alt="Documentation">
     </a>
     <a href="https://discord.gg/vapor">
         <img src="https://img.shields.io/discord/431917998102675485.svg" alt="Team Chat">
     </a>
     <a href="LICENSE">
         <img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT License">
     </a>
-    <a href="https://circleci.com/gh/vapor/fluent-sqlite">
-        <img src="https://circleci.com/gh/vapor/fluent-sqlite.svg?style=shield" alt="Continuous Integration">
+    <a href="https://circleci.com/gh/vapor/fluent-sqlite-driver">
+        <img src="https://circleci.com/gh/vapor/fluent-sqlite-driver.svg?style=shield" alt="Continuous Integration">
     </a>
     <a href="https://swift.org">
-        <img src="http://img.shields.io/badge/swift-4.1-brightgreen.svg" alt="Swift 4.1">
+        <img src="http://img.shields.io/badge/swift-5.1-brightgreen.svg" alt="Swift 5.1">
     </a>
 </p>

Sources/FluentSQLiteDriver/ConnectionPool+Database.swift

@@ -0,0 +1,15 @@
+extension ConnectionPool: Database where Source.Connection: Database {
+    public func execute(_ query: DatabaseQuery, _ onOutput: @escaping (DatabaseOutput) throws -> ()) -> EventLoopFuture<Void> {
+        return self.withConnection { $0.execute(query, onOutput) }
+    }
+
+    public func execute(_ schema: DatabaseSchema) -> EventLoopFuture<Void> {
+        return self.withConnection { $0.execute(schema) }
+    }
+
+    public func withConnection<T>(_ closure: @escaping (Database) -> EventLoopFuture<T>) -> EventLoopFuture<T> {
+        return self.withConnection { (conn: Source.Connection) in
+            return closure(conn)
+        }
+    }
+}

Sources/FluentSQLiteDriver/Databases+SQLite.swift

@@ -0,0 +1,23 @@
+extension DatabaseID {
+    public static var sqlite: DatabaseID {
+        return .init(string: "sqlite")
+    }
+}
+
+extension Databases {
+    public mutating func sqlite(
+        configuration: SQLiteConfiguration = .init(storage: .memory),
+        threadPool: NIOThreadPool,
+        poolConfiguration: ConnectionPoolConfig = .init(),
+        as id: DatabaseID = .sqlite,
+        isDefault: Bool = true
+    ) {
+        let db = SQLiteConnectionSource(
+            configuration: configuration,
+            threadPool: threadPool,
+            on: self.eventLoop
+        )
+        let pool = ConnectionPool(config: poolConfiguration, source: db)
+        self.add(pool, as: id, isDefault: isDefault)
+    }
+}

Sources/FluentSQLiteDriver/Exports.swift

@@ -1,5 +1,2 @@
 @_exported import FluentKit
-
-@_exported import class NIOKit.ConnectionPool
-
-@_exported import NIOSQLite
+@_exported import SQLiteKit

Sources/FluentSQLiteDriver/SQLite+Fluent.swift

@@ -0,0 +1,53 @@
+import FluentSQL
+
+extension SQLiteConnection: Database {
+    public func withConnection<T>(_ closure: @escaping (Database) -> EventLoopFuture<T>) -> EventLoopFuture<T> {
+        return closure(self)
+    }
+
+    public func execute(_ query: DatabaseQuery, _ onOutput: @escaping (DatabaseOutput) throws -> ()) -> EventLoopFuture<Void> {
+        let sql = SQLQueryConverter(delegate: SQLiteConverterDelegate()).convert(query)
+        return self.execute(sql: sql) { row in
+            try onOutput(row as! DatabaseOutput)
+        }.flatMapThrowing {
+            switch query.action {
+            case .create:
+                let row = LastInsertRow(lastAutoincrementID: self.lastAutoincrementID)
+                try onOutput(row)
+            default: break
+            }
+        }
+    }
+
+    public func execute(_ schema: DatabaseSchema) -> EventLoopFuture<Void> {
+        let sql = SQLSchemaConverter(delegate: SQLiteConverterDelegate()).convert(schema)
+        return self.execute(sql: sql) { row in
+            fatalError("unexpected output")
+        }
+    }
+}
+
+private struct LastInsertRow: DatabaseOutput {
+    var description: String {
+        return ["id": lastAutoincrementID].description
+    }
+
+    let lastAutoincrementID: Int64?
+
+    func contains(field: String) -> Bool {
+        return field == "fluentID"
+    }
+
+    func decode<T>(field: String, as type: T.Type) throws -> T where T : Decodable {
+        switch field {
+        case "fluentID":
+            if T.self is Int.Type {
+                return Int(self.lastAutoincrementID!) as! T
+            } else {
+                fatalError()
+            }
+        default: throw FluentError.missingField(name: field)
+        }
+    }
+}
+

Sources/FluentSQLiteDriver/SQLiteConnection+Database.swift

@@ -0,0 +1,16 @@
+import FluentSQL
+
+struct SQLiteConverterDelegate: SQLConverterDelegate {
+    func customDataType(_ dataType: DatabaseSchema.DataType) -> SQLExpression? {
+        switch dataType {
+        case .string: return SQLRaw("TEXT")
+        case .datetime: return SQLRaw("REAL")
+        case .int64: return SQLRaw("INTEGER")
+        default: return nil
+        }
+    }
+
+    func nestedFieldExpression(_ column: String, _ path: [String]) -> SQLExpression {
+        return SQLRaw("JSON_EXTRACT(\(column), '$.\(path[0])')")
+    }
+}