Merge branch 'update-options-update' into skip-empty-updates

Author: simolus3

.github/workflows/android.yml

@@ -1,9 +1,11 @@
 on:
   push:
+  pull_request:
 name: "android"
 jobs:
   build:
     name: Building Android
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -16,7 +18,7 @@ jobs:
           java-version: "17"
 
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3
+        uses: gradle/actions/wrapper-validation@v4
 
       - name: Setup
         run: |

.github/workflows/ios.yml

@@ -1,9 +1,11 @@
 on:
   push:
+  pull_request:
 name: "ios"
 jobs:
   build:
     name: Building iOS
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/linux.yml

@@ -1,9 +1,11 @@
 on:
   push:
+  pull_request:
 name: "linux"
 jobs:
   build_x86_64:
     name: Building Linux x86_64
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -21,6 +23,7 @@ jobs:
 
   build_aarch64:
     name: Building Linux aarch64
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
     runs-on: ubuntu-arm64
     steps:
       - uses: actions/checkout@v3

.github/workflows/macos.yml

@@ -1,9 +1,11 @@
 on:
   push:
+  pull_request:
 name: "macos"
 jobs:
   build_macOS_aarch64:
     name: Building macOS aarch64
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
@@ -21,6 +23,7 @@ jobs:
 
   build_macOS_x64:
     name: Building macOS x64
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v3

.github/workflows/release.yml

@@ -96,7 +96,7 @@ jobs:
       - name: setup-cocoapods
         uses: maxim-lobanov/setup-cocoapods@v1
         with:
-          version: 1.12.1
+          version: 1.16.2
 
       - name: Build iOS & macOS xcframework
         run: |

.github/workflows/tests.yml

@@ -1,9 +1,11 @@
 on:
   push:
+  pull_request:
 name: "tests"
 jobs:
   build:
     name: Testing on ${{ matrix.os }}
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false

.github/workflows/valgrind.yml

@@ -6,6 +6,7 @@ jobs:
   build:
     name: Testing with Valgrind on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
     strategy:
       matrix:
         include:

.github/workflows/wasm.yml

@@ -1,9 +1,11 @@
 on:
   push:
+  pull_request:
 name: "wasm"
 jobs:
   build_wasm:
     name: Basic WASM build
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/windows.yml

@@ -1,9 +1,11 @@
 on:
   push:
+  pull_request:
 name: "windows"
 jobs:
   build_windows:
     name: Building Windows
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3

Cargo.lock

@@ -29,7 +29,7 @@ inherits = "release"
 inherits = "wasm"
 
 [workspace.package]
-version = "0.3.9"
+version = "0.3.13"
 edition = "2021"
 authors = ["JourneyApps"]
 keywords = ["sqlite", "powersync"]

Cargo.toml

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "co.powersync"
-version = "0.3.9"
+version = "0.3.13"
 description = "PowerSync Core SQLite Extension"
 
 repositories {

android/build.gradle.kts

@@ -2,5 +2,5 @@
   "name": "powersync_sqlite_core",
   "schema_version": 2,
   "dependencies": [],
-  "version": "0.3.9"
+  "version": "0.3.13"
 }

android/src/prefab/prefab.json

@@ -12,6 +12,8 @@ use crate::bucket_priority::BucketPriority;
 use crate::error::{PSResult, SQLiteError};
 use crate::fix035::apply_v035_fix;
 
+pub const LATEST_VERSION: i32 = 9;
+
 pub fn powersync_migrate(
     ctx: *mut sqlite::context,
     target_version: i32,
@@ -333,5 +335,40 @@ json_object('sql', 'DELETE FROM ps_migration WHERE id >= 7')
         local_db.exec_safe(&stmt).into_db_result(local_db)?;
     }
 
+    if current_version < 8 && target_version >= 8 {
+        let stmt = "\
+ALTER TABLE ps_sync_state RENAME TO ps_sync_state_old;
+CREATE TABLE ps_sync_state (
+  priority INTEGER NOT NULL PRIMARY KEY,
+  last_synced_at TEXT NOT NULL
+) STRICT;
+INSERT INTO ps_sync_state (priority, last_synced_at)
+  SELECT priority, MAX(last_synced_at) FROM ps_sync_state_old GROUP BY priority;
+DROP TABLE ps_sync_state_old;
+INSERT INTO ps_migration(id, down_migrations) VALUES(8, json_array(
+json_object('sql', 'ALTER TABLE ps_sync_state RENAME TO ps_sync_state_new'),
+json_object('sql', 'CREATE TABLE ps_sync_state (\n  priority INTEGER NOT NULL,\n  last_synced_at TEXT NOT NULL\n) STRICT'),
+json_object('sql', 'INSERT INTO ps_sync_state SELECT * FROM ps_sync_state_new'),
+json_object('sql', 'DROP TABLE ps_sync_state_new'),
+json_object('sql', 'DELETE FROM ps_migration WHERE id >= 8')
+));
+";
+        local_db.exec_safe(&stmt).into_db_result(local_db)?;
+    }
+
+    if current_version < 9 && target_version >= 9 {
+        let stmt = "\
+ALTER TABLE ps_buckets ADD COLUMN count_at_last INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE ps_buckets ADD COLUMN count_since_last INTEGER NOT NULL DEFAULT 0;
+INSERT INTO ps_migration(id, down_migrations) VALUES(9, json_array(
+json_object('sql', 'ALTER TABLE ps_buckets DROP COLUMN count_at_last'),
+json_object('sql', 'ALTER TABLE ps_buckets DROP COLUMN count_since_last'),
+json_object('sql', 'DELETE FROM ps_migration WHERE id >= 9')
+));
+";
+
+        local_db.exec_safe(stmt).into_db_result(local_db)?;
+    }
+
     Ok(())
 }

crates/core/src/migrations.rs

@@ -103,6 +103,7 @@ INSERT OR IGNORE INTO ps_updated_rows(row_type, row_id) VALUES(?1, ?2)",
     let mut last_op: Option<i64> = None;
     let mut add_checksum: i32 = 0;
     let mut op_checksum: i32 = 0;
+    let mut added_ops: i32 = 0;
 
     while iterate_statement.step()? == ResultCode::ROW {
         let op_id = iterate_statement.column_int64(0);
@@ -113,6 +114,7 @@ INSERT OR IGNORE INTO ps_updated_rows(row_type, row_id) VALUES(?1, ?2)",
         let op_data = iterate_statement.column_text(5);
 
         last_op = Some(op_id);
+        added_ops += 1;
 
         if op == "PUT" || op == "REMOVE" {
             let key: String;
@@ -236,13 +238,15 @@ WHERE bucket = ?1",
             "UPDATE ps_buckets
                 SET last_op = ?2,
                     add_checksum = (add_checksum + ?3) & 0xffffffff,
-                    op_checksum = (op_checksum + ?4) & 0xffffffff
+                    op_checksum = (op_checksum + ?4) & 0xffffffff,
+                    count_since_last = count_since_last + ?5
             WHERE id = ?1",
         )?;
         statement.bind_int64(1, bucket_id)?;
         statement.bind_int64(2, *last_op)?;
         statement.bind_int(3, add_checksum)?;
         statement.bind_int(4, op_checksum)?;
+        statement.bind_int(5, added_ops)?;
 
         statement.exec()?;
     }

crates/core/src/operations.rs

@@ -63,7 +63,7 @@ impl<'a> SyncOperation<'a> {
 
     fn can_apply_sync_changes(&self) -> Result<bool, SQLiteError> {
         // Don't publish downloaded data until the upload queue is empty (except for downloaded data
-        //in priority 0, which is published earlier).
+        // in priority 0, which is published earlier).
 
         let needs_check = match &self.partial {
             Some(p) => !p.priority.may_publish_with_outstanding_uploads(),

crates/core/src/sync_local.rs

@@ -10,7 +10,7 @@ use sqlite_nostd as sqlite;
 use sqlite_nostd::{Connection, Context};
 
 use crate::error::SQLiteError;
-use crate::migrations::powersync_migrate;
+use crate::migrations::{powersync_migrate, LATEST_VERSION};
 use crate::util::quote_identifier;
 use crate::{create_auto_tx_function, create_sqlite_text_fn};
 
@@ -119,7 +119,7 @@ fn powersync_init_impl(
 
     setup_internal_views(local_db)?;
 
-    powersync_migrate(ctx, 7)?;
+    powersync_migrate(ctx, LATEST_VERSION)?;
 
     Ok(String::from(""))
 }
@@ -161,6 +161,7 @@ DELETE FROM ps_buckets;
 DELETE FROM ps_untyped;
 DELETE FROM ps_updated_rows;
 DELETE FROM ps_kv WHERE key != 'client_id';
+DELETE FROM ps_sync_state;
 ",
     )?;
 

crates/core/src/view_admin.rs

@@ -215,6 +215,8 @@ fn powersync_trigger_insert_sql_impl(
       SELECT CASE
       WHEN (NEW.id IS NULL)
       THEN RAISE (FAIL, 'id is required')
+      WHEN (typeof(NEW.id) != 'text')
+      THEN RAISE (FAIL, 'id should be text')
       END;
       INSERT INTO {internal_name}
       SELECT NEW.id, {json_fragment};

crates/core/src/views.rs

@@ -49,6 +49,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.0"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
   collection:
     dependency: transitive
     description:
@@ -81,6 +89,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.6"
+  fake_async:
+    dependency: "direct dev"
+    description:
+      name: fake_async
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
@@ -90,7 +106,7 @@ packages:
     source: hosted
     version: "2.1.4"
   file:
-    dependency: transitive
+    dependency: "direct dev"
     description:
       name: file
       sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
@@ -281,6 +297,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.7.5"
+  sqlite3_test:
+    dependency: "direct dev"
+    description:
+      name: sqlite3_test
+      sha256: "0b6f76541385cbe0cebf9454854f78dc9aa18b8cb512d8e597e63385e61d4f45"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.1"
   stack_trace:
     dependency: transitive
     description:

dart/pubspec.lock

@@ -8,3 +8,6 @@ dependencies:
   sqlite3: ^2.4.5
 dev_dependencies:
   test: ^1.25.0
+  file: ^7.0.1
+  sqlite3_test: ^0.1.1
+  fake_async: ^1.3.3