Merge remote-tracking branch 'origin/main' into grdb

Author: stevensJourney

.github/workflows/build_and_test.yaml

@@ -14,25 +14,14 @@ jobs:
         uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable
+
+      - name: Test with strict concurrency
+        run: |
+          swift build -Xswiftc -strict-concurrency=complete
+          swift test -Xswiftc -strict-concurrency=complete
+
       - name: Build and Test
         run: |
           xcodebuild test -scheme PowerSync-Package -destination "platform=iOS Simulator,name=iPhone 16"
           xcodebuild test -scheme PowerSync-Package -destination "platform=macOS,arch=arm64,name=My Mac"
           xcodebuild test -scheme PowerSync-Package -destination "platform=watchOS Simulator,arch=arm64,name=Apple Watch Ultra 2 (49mm)"
-
-  buildSwift6:
-    name: Build and test with Swift 6
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up XCode
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: latest-stable
-      - name: Use Swift 6
-        run: |
-          sed -i '' 's|^// swift-tools-version:.*$|// swift-tools-version:6.1|' Package.swift
-      - name: Build and Test
-        run: |
-          swift build -Xswiftc -strict-concurrency=complete
-          swift test -Xswiftc -strict-concurrency=complete

CHANGELOG.md

@@ -1,9 +1,31 @@
 # Changelog
 
-## 1.6.1 (unreleased)
+## 1.8.0 (unreleased)
 
-* Update Kotlin SDK to 1.7.0.
+* Enable the `newClientImplementation` by default. This should improve performance and memory usage.
+* **Potential Breaking Change** The `newClientImplementation` now uses WebSockets to connect to the PowerSync service. These WebSockets connections do not log events to `SyncClientConfiguration->requestLogger`.
+* Add the `soft` flag to `disconnectAndClear()` which keeps an internal copy of synced data in the database, allowing faster re-sync if a compatible token is used in the next connect() call
 * Added Alpha `PowerSyncGRDB` product which supports sharing GRDB `DatabasePool`s with PowerSync and application logic.
+* Update PowerSync SQLite core to 0.4.10
+* Update Kotlin SDK to 1.7.0.
+
+
+## 1.7.0
+
+* Update Kotlin SDK to 1.7.0.
+* Add `close(deleteDatabase:)` method to `PowerSyncDatabaseProtocol` for deleting SQLite database files when closing the database. This includes the main database file and all WAL mode files (.wal, .shm, .journal). Files that don't exist are ignored, but an error is thrown if a file exists but cannot be deleted.
+
+```swift
+// Close the database and delete all SQLite files
+try await database.close(deleteDatabase: true)
+
+// Close the database without deleting files (default behavior)
+try await database.close(deleteDatabase: false)
+// or simply
+try await database.close()
+```
+* Add `PowerSyncDataTypeConvertible` protocol for casting query parameters to SQLite supported types.
+* [Internal] Removed unnecessary `Task` creation in Attachment helper `FileManagerStorageAdapter`.
 
 ## 1.6.0
 

Demo/PowerSyncExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -7,7 +7,7 @@ let packageName = "PowerSync"
 
 // Set this to the absolute path of your Kotlin SDK checkout if you want to use a local Kotlin
 // build. Also see docs/LocalBuild.md for details
-let localKotlinSdkOverride: String? = "/Users/stevenontong/Documents/platform_code/powersync/powersync-kotlin/internal"
+let localKotlinSdkOverride: String? = nil
 
 // Set this to the absolute path of your powersync-sqlite-core checkout if you want to use a
 // local build of the core extension.
@@ -25,16 +25,18 @@ var kotlinTargetDependency = Target.Dependency.target(name: "PowerSyncKotlin")
 if let kotlinSdkPath = localKotlinSdkOverride {
     // We can't depend on local XCFrameworks outside of this project's root, so there's a Package.swift
     // in the PowerSyncKotlin project pointing towards a local build.
-    conditionalDependencies.append(.package(path: "\(kotlinSdkPath)/PowerSyncKotlin"))
+    conditionalDependencies.append(.package(path: "\(kotlinSdkPath)/internal/PowerSyncKotlin"))
 
     kotlinTargetDependency = .product(name: "PowerSyncKotlin", package: "PowerSyncKotlin")
 } else {
     // Not using a local build, so download from releases
-    conditionalTargets.append(.binaryTarget(
-        name: "PowerSyncKotlin",
-        url: "https://github.com/powersync-ja/powersync-kotlin/releases/download/v1.7.0/PowersyncKotlinRelease.zip",
-        checksum: "836ac106c26a184c10373c862745d9af195737ad01505bb965f197797aa88535"
-    ))
+    conditionalTargets.append(
+        .binaryTarget(
+            name: "PowerSyncKotlin",
+            url:
+            "https://github.com/powersync-ja/powersync-kotlin/releases/download/v1.9.0/PowersyncKotlinRelease.zip",
+            checksum: "6d9847391ab2bbbca1f6a7abe163f0682ddca4a559ef5a1d2567b3e62e7d9979"
+        ))
 }
 
 var corePackageName = "powersync-sqlite-core-swift"
@@ -43,18 +45,19 @@ if let corePath = localCoreExtension {
     corePackageName = "powersync-sqlite-core"
 } else {
     // Not using a local build, so download from releases
-    conditionalDependencies.append(.package(
-        url: "https://github.com/powersync-ja/powersync-sqlite-core-swift.git",
-        exact: "0.4.6"
-    ))
+    conditionalDependencies.append(
+        .package(
+            url: "https://github.com/powersync-ja/powersync-sqlite-core-swift.git",
+            exact: "0.4.10"
+        ))
 }
 
 let package = Package(
     name: packageName,
     platforms: [
         .iOS(.v15),
         .macOS(.v12),
-        .watchOS(.v9)
+        .watchOS(.v9),
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
@@ -78,7 +81,8 @@ let package = Package(
         )
     ],
     dependencies: conditionalDependencies + [
-        .package(url: "https://github.com/groue/GRDB.swift.git", from: "7.7.0")
+        .package(url: "https://github.com/groue/GRDB.swift.git", from: "7.9.0"),
+        .package(url: "https://github.com/powersync-ja/CSQLite.git", revision: "3.51.1")
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.
@@ -87,7 +91,8 @@ let package = Package(
             name: packageName,
             dependencies: [
                 kotlinTargetDependency,
-                .product(name: "PowerSyncSQLiteCore", package: corePackageName)
+                .product(name: "PowerSyncSQLiteCore", package: corePackageName),
+                .product(name: "CSQLite", package: "CSQLite"),
             ]
         ),
         .target(

Package.resolved

@@ -2,7 +2,7 @@
   <a href="https://www.powersync.com" target="_blank"><img src="https://github.com/powersync-ja/.github/assets/7372448/d2538c43-c1a0-4c47-9a76-41462dba484f"/></a>
 </p>
 
-_[PowerSync](https://www.powersync.com) is a sync engine for building local-first apps with instantly-responsive UI/UX and simplified state transfer. Syncs between SQLite on the client-side and Postgres, MongoDB or MySQL on the server-side._
+_[PowerSync](https://www.powersync.com) is a sync engine for building local-first apps with instantly-responsive UI/UX and simplified state transfer. Syncs between SQLite on the client-side and Postgres, MongoDB, MySQL or SQL Server on the server-side._
 
 # PowerSync Swift
 

Package.swift

@@ -49,7 +49,8 @@ enum KotlinAdapter {
             return PowerSyncKotlin.RawTable(
                 name: table.name,
                 put: translateStatement(table.put),
-                delete: translateStatement(table.delete)
+                delete: translateStatement(table.delete),
+                clear: table.clear
             );
         }
 

README.md

@@ -1,3 +1,4 @@
+import CSQLite
 import Foundation
 import PowerSyncKotlin
 
@@ -9,13 +10,18 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol,
     private let kotlinDatabase: PowerSyncKotlin.PowerSyncDatabase
     private let encoder = JSONEncoder()
     let currentStatus: SyncStatus
+    private let dbFilename: String
 
     init(
         kotlinDatabase: PowerSyncKotlin.PowerSyncDatabase,
+        dbFilename: String,
         logger: DatabaseLogger
     ) {
         self.logger = logger
         self.kotlinDatabase = kotlinDatabase
+        // We currently use the dbFilename to delete the database files when the database is closed
+        // The kotlin PowerSyncdatabase.identifier currently prepends `null` to the dbFilename (for the directory).
+        self.dbFilename = dbFilename
         currentStatus = KotlinSyncStatus(
             baseStatus: kotlinDatabase.currentStatus
         )
@@ -80,9 +86,10 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol,
         try await kotlinDatabase.disconnect()
     }
 
-    func disconnectAndClear(clearLocal: Bool = true) async throws {
+    func disconnectAndClear(clearLocal: Bool, soft: Bool) async throws {
         try await kotlinDatabase.disconnectAndClear(
-            clearLocal: clearLocal
+            clearLocal: clearLocal,
+            soft: soft
         )
     }
 
@@ -316,6 +323,21 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol,
         try await kotlinDatabase.close()
     }
 
+    func close(deleteDatabase: Bool = false) async throws {
+        // Close the SQLite connections
+        try await close()
+
+        if deleteDatabase {
+            try await self.deleteDatabase()
+        }
+    }
+
+    private func deleteDatabase() async throws {
+        // We can use the supplied dbLocation when we support that in future
+        let directory = try appleDefaultDatabaseDirectory()
+        try deleteSQLiteFiles(dbFilename: dbFilename, in: directory)
+    }
+
     /// Tries to convert Kotlin PowerSyncExceptions to Swift Exceptions
     private func wrapPowerSyncException<R: Sendable>(
         handler: () async throws -> R)
@@ -391,15 +413,22 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol,
 func openKotlinDBDefault(
     schema: Schema,
     dbFilename: String,
-    logger: DatabaseLogger
+    logger: DatabaseLogger,
 ) -> PowerSyncDatabaseProtocol {
+    let rc = sqlite3_initialize()
+    if rc != 0 {
+        fatalError("Call to sqlite3_initialize() failed with \(rc)")
+    }
+
+    let factory = sqlite3DatabaseFactory(initialStatements: [])
     return KotlinPowerSyncDatabaseImpl(
         kotlinDatabase: PowerSyncDatabase(
-            factory: PowerSyncKotlin.DatabaseDriverFactory(),
+            factory: factory,
             schema: KotlinAdapter.Schema.toKotlin(schema),
             dbFilename: dbFilename,
             logger: logger.kLogger
         ),
+        dbFilename: dbFilename,
         logger: logger
     )
 }
@@ -417,6 +446,7 @@ func openKotlinDBWithPool(
             schema: KotlinAdapter.Schema.toKotlin(schema),
             logger: logger.kLogger
         ),
+        dbFilename: identifier,
         logger: logger
     )
 }
@@ -475,3 +505,46 @@ func wrapTransactionContext(
         }
     }
 }
+
+/// This returns the default directory in which we store SQLite database files.
+func appleDefaultDatabaseDirectory() throws -> URL {
+    let fileManager = FileManager.default
+
+    // Get the application support directory
+    guard let documentsDirectory = fileManager.urls(
+        for: .applicationSupportDirectory,
+        in: .userDomainMask
+    ).first else {
+        throw PowerSyncError.operationFailed(message: "Unable to find application support directory")
+    }
+
+    return documentsDirectory.appendingPathComponent("databases")
+}
+
+/// Deletes all SQLite files for a given database filename in the specified directory.
+/// This includes the main database file and WAL mode files (.wal, .shm, and .journal if present).
+/// Throws an error if a file exists but could not be deleted. Files that don't exist are ignored.
+func deleteSQLiteFiles(dbFilename: String, in directory: URL) throws {
+    let fileManager = FileManager.default
+
+    // SQLite files to delete:
+    // 1. Main database file: dbFilename
+    // 2. WAL file: dbFilename-wal
+    // 3. SHM file: dbFilename-shm
+    // 4. Journal file: dbFilename-journal (for rollback journal mode, though WAL mode typically doesn't use it)
+
+    let filesToDelete = [
+        dbFilename,
+        "\(dbFilename)-wal",
+        "\(dbFilename)-shm",
+        "\(dbFilename)-journal"
+    ]
+
+    for filename in filesToDelete {
+        let fileURL = directory.appendingPathComponent(filename)
+        if fileManager.fileExists(atPath: fileURL.path) {
+            try fileManager.removeItem(at: fileURL)
+        }
+        // If file doesn't exist, we ignore it and continue
+    }
+}

Sources/PowerSync/Kotlin/KotlinAdapter.swift

@@ -97,6 +97,11 @@ final class KotlinTransactionContext: Transaction, KotlinConnectionContextProtoc
 // Allows nil values to be passed to the Kotlin [Any] params
 func mapParameters(_ parameters: [Any?]?) -> [Any] {
     parameters?.map { item in
-        item ?? NSNull()
+        switch item {
+        case .none: NSNull()
+        case let item as PowerSyncDataTypeConvertible:
+            item.psDataType?.unwrap() ?? NSNull()
+        default: item as Any
+        }
     } ?? []
 }