update package.swift + circle deps

Package.swift

@@ -11,7 +11,7 @@ let package = Package(
         .package(url: "https://github.com/vapor/core.git", from: "3.0.0"),
 
         // 🗄 Core services for creating database integrations.
-        .package(url: "https://github.com/vapor/database-kit.git", .branch("fluent-gm")),
+        .package(url: "https://github.com/vapor/database-kit.git", from: "1.0.0"),
     ],
     targets: [
         .testTarget(name: "SQLiteTests", dependencies: ["SQLite"]),

Sources/SQLite/Database/SQLiteConnection.swift

@@ -15,38 +15,34 @@ public final class SQLiteConnection: BasicWorker, DatabaseConnection {
 
     /// Optional logger, if set queries should be logged to it.
     public var logger: DatabaseLogger?
-
-    private let blockingIO: BlockingIOThreadPool
 
-    internal let c: OpaquePointer
+    internal let database: SQLiteDatabase
 
     /// Returns the last error message, if one exists.
     internal var errorMessage: String? {
-        guard let raw = sqlite3_errmsg(c) else {
+        guard let raw = sqlite3_errmsg(database.handle) else {
             return nil
         }
         return String(cString: raw)
     }
 
     /// Create a new SQLite conncetion.
-    internal init(c: OpaquePointer, blockingIO: BlockingIOThreadPool, on worker: Worker) {
-        self.c = c
+    internal init(database: SQLiteDatabase, on worker: Worker) {
+        self.database = database
         self.eventLoop = worker.eventLoop
         self.extend = [:]
         self.isClosed = false
-        self.blockingIO = blockingIO
     }
 
     /// Returns an identifier for the last inserted row.
     public var lastAutoincrementID: Int? {
-        let id = sqlite3_last_insert_rowid(c)
+        let id = sqlite3_last_insert_rowid(database.handle)
         return Int(id)
     }
 
     /// Closes the database connection.
     public func close() {
         isClosed = true
-        sqlite3_close(c)
     }
 
     public func query(_ query: SQLiteQuery) -> Future<[[SQLiteColumn: SQLiteData]]> {
@@ -82,7 +78,7 @@ public final class SQLiteConnection: BasicWorker, DatabaseConnection {
         let promise = eventLoop.newPromise(Void.self)
         // log before anything happens, in case there's an error
         logger?.record(query: string, values: parameters.map { $0.description })
-        blockingIO.submit { state in
+        database.blockingIO.submit { state in
             do {
                 let statement = try SQLiteStatement(query: string, on: self)
                 try statement.bind(parameters)
@@ -104,9 +100,4 @@ public final class SQLiteConnection: BasicWorker, DatabaseConnection {
         }
         return promise.futureResult
     }
-
-    /// Closes the database when deinitialized.
-    deinit {
-        close()
-    }
 }

Sources/SQLite/Database/SQLiteDatabase.swift

@@ -9,9 +9,9 @@ public final class SQLiteDatabase: Database, LogSupporting {
     /// The path to the SQLite file.
     public let storage: SQLiteStorage
 
-    private let blockingIO: BlockingIOThreadPool
+    internal let blockingIO: BlockingIOThreadPool
 
-    private let handle: OpaquePointer
+    internal let handle: OpaquePointer
 
     /// Create a new SQLite database.
     public init(storage: SQLiteStorage = .memory, threadPool: BlockingIOThreadPool? = nil) throws {
@@ -29,7 +29,7 @@ public final class SQLiteDatabase: Database, LogSupporting {
 
     /// See `Database`.
     public func newConnection(on worker: Worker) -> Future<SQLiteConnection> {
-        let conn = SQLiteConnection(c: handle, blockingIO: blockingIO, on: worker)
+        let conn = SQLiteConnection(database: self, on: worker)
         return worker.future(conn)
     }
 
@@ -39,6 +39,7 @@ public final class SQLiteDatabase: Database, LogSupporting {
     }
 
     deinit {
+        sqlite3_close(handle)
         self.blockingIO.shutdownGracefully { error in
             if let error = error {
                 print("[SQLite] [ERROR] Could not shutdown BlockingIOThreadPool: \(error)")

Sources/SQLite/Database/SQLiteStatement.swift

@@ -10,7 +10,7 @@ internal struct SQLiteStatement {
 
     internal init(query: String, on connection: SQLiteConnection) throws {
         var handle: OpaquePointer?
-        let ret = sqlite3_prepare_v2(connection.c, query, -1, &handle, nil)
+        let ret = sqlite3_prepare_v2(connection.database.handle, query, -1, &handle, nil)
         guard ret == SQLITE_OK, let c = handle else {
             throw SQLiteError(statusCode: ret, connection: connection, source: .capture())
         }

Tests/SQLiteTests/SQLiteTests.swift

@@ -206,7 +206,8 @@ class SQLiteTests: XCTestCase {
         group.enter()
         DispatchQueue.global().async {
             let conn = try! db.newConnection(on: a).wait()
-            for _ in 0..<100 {
+            for i in 0..<100 {
+                print("a \(i)")
                 let res = try! conn.query("SELECT (1 + 1) as a;").wait()
                 print(res)
             }
@@ -215,7 +216,8 @@ class SQLiteTests: XCTestCase {
         group.enter()
         DispatchQueue.global().async {
             let conn = try! db.newConnection(on: b).wait()
-            for _ in 0..<100 {
+            for i in 0..<100 {
+                print("b \(i)")
                 let res = try! conn.query("SELECT (1 + 1) as b;").wait()
                 print(res)
             }

circle.yml

@@ -37,7 +37,7 @@ jobs:
     steps:
       - run:
           name: Clone Fluent SQLite
-          command: git clone -b gm https://github.com/vapor/fluent-sqlite.git
+          command: git clone -b master https://github.com/vapor/fluent-sqlite.git
           working_directory: ~/
       - run:
           name: Switch Fluent SQLite to this SQLite revision