Merge pull request #72 from powersync-ja/fix-schema-duplicate-change

Fix unecessary schema changes

Author: simolus3

Cargo.lock

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

Cargo.toml

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "co.powersync"
-version = "0.3.13"
+version = "0.3.14"
 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.13"
+  "version": "0.3.14"
 }

android/src/prefab/prefab.json

@@ -213,7 +213,7 @@ fn setup_internal_views(db: *mut sqlite::sqlite3) -> Result<(), ResultCode> {
     AS SELECT
         view.name name,
         view.sql sql,
-        ifnull(trigger1.sql, '') delete_trigger_sql,
+        ifnull(group_concat(trigger1.sql, ';\n' ORDER BY trigger1.name DESC), '') delete_trigger_sql,
         ifnull(trigger2.sql, '') insert_trigger_sql,
         ifnull(trigger3.sql, '') update_trigger_sql
         FROM sqlite_master view
@@ -223,7 +223,8 @@ fn setup_internal_views(db: *mut sqlite::sqlite3) -> Result<(), ResultCode> {
             ON trigger2.tbl_name = view.name AND trigger2.type = 'trigger' AND trigger2.name GLOB 'ps_view_insert*'
         LEFT JOIN sqlite_master trigger3
             ON trigger3.tbl_name = view.name AND trigger3.type = 'trigger' AND trigger3.name GLOB 'ps_view_update*'
-        WHERE view.type = 'view' AND view.sql GLOB  '*-- powersync-auto-generated';
+        WHERE view.type = 'view' AND view.sql GLOB  '*-- powersync-auto-generated'
+        GROUP BY view.name;
 
     CREATE TRIGGER IF NOT EXISTS powersync_views_insert
     INSTEAD OF INSERT ON powersync_views

crates/core/src/view_admin.rs

@@ -129,14 +129,15 @@ DELETE FROM {internal_name} WHERE id = OLD.id;
 INSERT INTO powersync_crud_(data) VALUES(json_object('op', 'DELETE', 'type', {type_string}, 'id', OLD.id{old_fragment}));
 INSERT OR IGNORE INTO ps_updated_rows(row_type, row_id) VALUES({type_string}, OLD.id);
 INSERT OR REPLACE INTO ps_buckets(name, last_op, target_op) VALUES('$local', 0, {MAX_OP_ID});
-END;"
+END"
         );
 
         // The DELETE statement can't include metadata for the delete operation, so we create
         // another trigger to delete with a fake UPDATE syntax.
         if table_info.flags.include_metadata() {
             let trigger_name = quote_identifier_prefixed("ps_view_delete2_", view_name);
             write!(&mut trigger,  "\
+;
 CREATE TRIGGER {trigger_name}
 INSTEAD OF UPDATE ON {quoted_name}
 FOR EACH ROW
@@ -146,7 +147,7 @@ DELETE FROM {internal_name} WHERE id = NEW.id;
 INSERT INTO powersync_crud_(data) VALUES(json_object('op', 'DELETE', 'type', {type_string}, 'id', NEW.id{old_fragment}, 'metadata', NEW._metadata));
 INSERT OR IGNORE INTO ps_updated_rows(row_type, row_id) VALUES({type_string}, NEW.id);
 INSERT OR REPLACE INTO ps_buckets(name, last_op, target_op) VALUES('$local', 0, {MAX_OP_ID});
-END;"
+END"
                     ).expect("writing to string should be infallible");
         }