wip: grdb

Author: stevensJourney

Sources/PowerSync/Kotlin/KotlinSQLiteConnectionPool.swift

@@ -25,7 +25,7 @@ final class SwiftSQLiteConnectionPoolAdapter: PowerSyncKotlin.SwiftPoolAdapter {
     func __leaseRead(callback: @escaping (Any) -> Void) async throws {
         do {
             try await pool.read { pointer in
-                callback(pointer)
+                callback(UInt(bitPattern: pointer))
             }
         } catch {
             try? PowerSyncKotlin.throwPowerSyncException(
@@ -40,7 +40,23 @@ final class SwiftSQLiteConnectionPoolAdapter: PowerSyncKotlin.SwiftPoolAdapter {
     func __leaseWrite(callback: @escaping (Any) -> Void) async throws {
         do {
             try await pool.write { pointer in
-                callback(pointer)
+                callback(UInt(bitPattern: pointer))
+            }
+        } catch {
+            try? PowerSyncKotlin.throwPowerSyncException(
+                exception: PowerSyncException(
+                    message: error.localizedDescription,
+                    cause: nil
+                )
+            )
+        }
+    }
+
+    func __leaseAll(callback: @escaping (Any, [Any]) -> Void) async throws {
+        // TODO, actually use all connections
+        do {
+            try await pool.write { pointer in
+                callback(UInt(bitPattern: pointer), [])
             }
         } catch {
             try? PowerSyncKotlin.throwPowerSyncException(

Sources/PowerSync/Protocol/SQLiteConnectionPool.swift

@@ -15,7 +15,7 @@ public protocol SQLiteConnectionPoolProtocol {
 
     /// Invokes the callback with all connections leased from the pool.
     func withAllConnections(
-        onConnection: @escaping (
+        onConnection: @Sendable @escaping (
             _ writer: OpaquePointer,
             _ readers: [OpaquePointer]
         ) -> Void,

Sources/PowerSyncGRDB/GRDBPool.swift

@@ -69,7 +69,8 @@ class GRDBConnectionPool: SQLiteConnectionPoolProtocol {
     func write(
         onConnection: @Sendable @escaping (OpaquePointer) -> Void
     ) async throws {
-        try await pool.write { database in
+        // Don't start an explicit transaction
+        try await pool.writeWithoutTransaction { database in
             guard let connection = database.sqliteConnection else {
                 return
             }

Tests/PowerSyncGRDBTests/BasicTest.swift

@@ -7,24 +7,22 @@ import XCTest
 final class GRDBTests: XCTestCase {
     private var database: PowerSyncDatabaseProtocol!
     private var schema: Schema!
+    private var pool: DatabasePool!
 
     override func setUp() async throws {
         try await super.setUp()
         schema = Schema(tables: [
             Table(name: "users", columns: [
-                .text("count"),
-                .integer("is_active"),
-                .real("weight"),
-                .text("description")
+                .text("name"),
+                .text("count")
             ])
         ])
 
         var config = Configuration()
         configurePowerSync(&config)
-
         let documentsDir = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
         let dbURL = documentsDir.appendingPathComponent("test.sqlite")
-        let pool = try DatabasePool(
+        pool = try DatabasePool(
             path: dbURL.path,
             configuration: config
         )
@@ -48,10 +46,39 @@ final class GRDBTests: XCTestCase {
 
     func testValidValues() async throws {
         let result = try await database.get(
-            "SELECT powersync_rs_version as r"
+            "SELECT powersync_rs_version() as r"
         ) { cursor in
             try cursor.getString(index: 0)
         }
         print(result)
+
+        try await database.execute(
+            "INSERT INTO users(id, name, count) VALUES(uuid(), 'steven', 1)"
+        )
+
+        let initialUsers = try await database.getAll(
+            "SELECT * FROM users"
+        ) { cursor in
+            try cursor.getString(name: "name")
+        }
+        print("initial users \(initialUsers)")
+
+        // Now use a GRDB query
+        struct Users: Codable, Identifiable, FetchableRecord, PersistableRecord {
+            var id: String
+            var name: String
+            var count: Int
+
+            enum Columns {
+                static let name = Column(CodingKeys.name)
+                static let count = Column(CodingKeys.count)
+            }
+        }
+
+        let grdbUsers = try await pool.write { db in
+            try Users.fetchAll(db)
+        }
+
+        print(grdbUsers)
     }
 }