Merge pull request #459 from powersync-ja/fix-write-checkpoint-handling

Avoid deleting the $local bucket on connect()
powersync-ja · Jan 6, 2025 · 9ca3ea7 · 9ca3ea7
2 parents 3f8f748 + 7a47778
commit 9ca3ea7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.changeset/moody-shoes-remain.md b/.changeset/moody-shoes-remain.md
@@ -0,0 +1,5 @@
+---
+'@powersync/common': patch
+---
+
+Fix issue where local changes could be reverted when a replication delay is present.
diff --git a/packages/common/src/client/AbstractPowerSyncDatabase.ts b/packages/common/src/client/AbstractPowerSyncDatabase.ts
@@ -582,12 +582,12 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
       if (writeCheckpoint) {
         const check = await tx.execute(`SELECT 1 FROM ${PSInternalTable.CRUD} LIMIT 1`);
         if (!check.rows?.length) {
-          await tx.execute(`UPDATE ${PSInternalTable.BUCKETS} SET target_op = ? WHERE name='$local'`, [
+          await tx.execute(`UPDATE ${PSInternalTable.BUCKETS} SET target_op = CAST(? as INTEGER) WHERE name='$local'`, [
             writeCheckpoint
           ]);
         }
       } else {
-        await tx.execute(`UPDATE ${PSInternalTable.BUCKETS} SET target_op = ? WHERE name='$local'`, [
+        await tx.execute(`UPDATE ${PSInternalTable.BUCKETS} SET target_op = CAST(? as INTEGER) WHERE name='$local'`, [
           this.bucketStorageAdapter.getMaxOpId()
         ]);
       }

diff --git a/packages/common/src/client/sync/bucket/SqliteBucketStorage.ts b/packages/common/src/client/sync/bucket/SqliteBucketStorage.ts
@@ -85,7 +85,7 @@ export class SqliteBucketStorage extends BaseObserver<BucketStorageListener> imp
 
   async getBucketStates(): Promise<BucketState[]> {
     const result = await this.db.getAll<BucketState>(
-      'SELECT name as bucket, cast(last_op as TEXT) as op_id FROM ps_buckets WHERE pending_delete = 0'
+      "SELECT name as bucket, cast(last_op as TEXT) as op_id FROM ps_buckets WHERE pending_delete = 0 AND name != '$local'"
     );
     return result;
   }
@@ -249,9 +249,10 @@ export class SqliteBucketStorage extends BaseObserver<BucketStorageListener> imp
   }
 
   async updateLocalTarget(cb: () => Promise<string>): Promise<boolean> {
-    const rs1 = await this.db.getAll("SELECT target_op FROM ps_buckets WHERE name = '$local' AND target_op = ?", [
-      MAX_OP_ID
-    ]);
+    const rs1 = await this.db.getAll(
+      "SELECT target_op FROM ps_buckets WHERE name = '$local' AND target_op = CAST(? as INTEGER)",
+      [MAX_OP_ID]
+    );
     if (!rs1.length) {
       // Nothing to update
       return false;