Merge branch 'main' into fix/opsqlite-transaction-notifications

Chriztiaan · Chriztiaan · commit c248447f877d · 2025-01-08T10:01:56.000+02:00
diff --git a/.changeset/rude-snakes-report.md b/.changeset/rude-snakes-report.md
diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @powersync/common
 
+## 1.22.1
+
+### Patch Changes
+
+- 7a47778: Fix issue where local changes could be reverted when a replication delay is present.
+- 4a262cd: Add schema validation
+
 ## 1.22.0
 
 ### Minor Changes
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@powersync/common",
-  "version": "1.22.0",
+  "version": "1.22.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
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;
diff --git a/packages/drizzle-driver/package.json b/packages/drizzle-driver/package.json
@@ -26,7 +26,7 @@
     "test": "vitest"
   },
   "peerDependencies": {
-    "@powersync/common": "workspace:^1.22.0",
+    "@powersync/common": "workspace:^1.22.1",
     "drizzle-orm": "<1.0.0"
   },
   "devDependencies": {
diff --git a/packages/kysely-driver/package.json b/packages/kysely-driver/package.json
@@ -26,7 +26,7 @@
     "test": "pnpm build && vitest"
   },
   "peerDependencies": {
-    "@powersync/common": "workspace:^1.22.0"
+    "@powersync/common": "workspace:^1.22.1"
   },
   "dependencies": {
     "kysely": "^0.27.4"
diff --git a/packages/powersync-op-sqlite/CHANGELOG.md b/packages/powersync-op-sqlite/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @powersync/op-sqlite
 
+## 0.1.4
+
+### Patch Changes
+
+- Updated dependencies [7a47778]
+- Updated dependencies [4a262cd]
+  - @powersync/common@1.22.1
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/packages/powersync-op-sqlite/package.json b/packages/powersync-op-sqlite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@powersync/op-sqlite",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "PowerSync - sync Postgres or MongoDB with SQLite in your React Native app for offline-first and real-time data",
   "source": "./src/index.ts",
   "main": "./lib/commonjs/index.js",
@@ -66,7 +66,7 @@
   },
   "peerDependencies": {
     "@op-engineering/op-sqlite": "^10.1.0",
-    "@powersync/common": "workspace:^1.22.0",
+    "@powersync/common": "workspace:^1.22.1",
     "react": "*",
     "react-native": "*"
   },
diff --git a/packages/react-native/CHANGELOG.md b/packages/react-native/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @powersync/react-native
 
+## 1.16.2
+
+### Patch Changes
+
+- Updated dependencies [7a47778]
+- Updated dependencies [4a262cd]
+  - @powersync/common@1.22.1
+
 ## 1.16.1
 
 ### Patch Changes
diff --git a/packages/react-native/package.json b/packages/react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@powersync/react-native",
-  "version": "1.16.1",
+  "version": "1.16.2",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -31,7 +31,7 @@
   "homepage": "https://docs.powersync.com/",
   "peerDependencies": {
     "@journeyapps/react-native-quick-sqlite": "^2.2.0",
-    "@powersync/common": "workspace:^1.22.0",
+    "@powersync/common": "workspace:^1.22.1",
     "react": "*",
     "react-native": "*"
   },
diff --git a/packages/tanstack-react-query/CHANGELOG.md b/packages/tanstack-react-query/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @powersync/tanstack-react-query
 
+## 0.0.11
+
+### Patch Changes
+
+- Updated dependencies [7a47778]
+- Updated dependencies [4a262cd]
+  - @powersync/common@1.22.1
+
 ## 0.0.10
 
 ### Patch Changes
diff --git a/packages/tanstack-react-query/package.json b/packages/tanstack-react-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@powersync/tanstack-react-query",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -29,7 +29,7 @@
   },
   "homepage": "https://docs.powersync.com",
   "peerDependencies": {
-    "@powersync/common": "workspace:^1.22.0",
+    "@powersync/common": "workspace:^1.22.1",
     "react": "*"
   },
   "dependencies": {
diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @powersync/web
 
+## 1.12.2
+
+### Patch Changes
+
+- Updated dependencies [7a47778]
+- Updated dependencies [4a262cd]
+  - @powersync/common@1.22.1
+
 ## 1.12.1
 
 ### Patch Changes
diff --git a/packages/web/package.json b/packages/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@powersync/web",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "description": "A Web SDK for JourneyApps PowerSync",
   "main": "lib/src/index.js",
   "types": "lib/src/index.d.ts",
@@ -61,7 +61,7 @@
   "license": "Apache-2.0",
   "peerDependencies": {
     "@journeyapps/wa-sqlite": "^1.0.0",
-    "@powersync/common": "workspace:^1.22.0"
+    "@powersync/common": "workspace:^1.22.1"
   },
   "dependencies": {
     "@powersync/common": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tools/diagnostics-app/CHANGELOG.md b/tools/diagnostics-app/CHANGELOG.md
diff --git a/tools/diagnostics-app/package.json b/tools/diagnostics-app/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@powersync/common",`
`3`		`- "version": "1.22.0",`
	`3`	`+ "version": "1.22.1",`
`4`	`4`	`"publishConfig": {`
`5`	`5`	`"registry": "https://registry.npmjs.org/",`
`6`	`6`	`"access": "public"`