Fix enabling metadata

Author: simolus3

crates/core/src/view_admin.rs

@@ -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

dart/test/schema_test.dart

@@ -44,6 +44,82 @@ void main() {
       expect(versionAfter3['schema_version'],
           greaterThan(versionAfter2['schema_version'] as int));
     });
+
+    group('metadata', () {
+      // This is a special because we have two delete triggers when
+      // include_metadata is true (one for actual `DELETE` statements and one
+      // for `UPDATE ... SET _deleted = TRUE` that allows attaching metadata).
+      Object createSchema(bool withMetadata) {
+        return {
+          "tables": [
+            {
+              "name": "customers",
+              "view_name": null,
+              "local_only": false,
+              "insert_only": false,
+              "include_metadata": withMetadata,
+              "columns": [
+                {"name": "name", "type": "TEXT"},
+                {"name": "email", "type": "TEXT"}
+              ],
+              "indexes": []
+            },
+          ]
+        };
+      }
+
+      test('enabling', () {
+        db.execute('SELECT powersync_replace_schema(?)',
+            [json.encode(createSchema(false))]);
+        expect(
+          db.select("select * from sqlite_schema where type = 'trigger' "
+              "AND tbl_name = 'customers' "
+              "AND name GLOB 'ps_view_delete*'"),
+          hasLength(1),
+        );
+
+        db.execute('SELECT powersync_replace_schema(?)',
+            [json.encode(createSchema(true))]);
+        expect(
+          db.select("select * from sqlite_schema where type = 'trigger' "
+              "AND tbl_name = 'customers' "
+              "AND name GLOB 'ps_view_delete*'"),
+          hasLength(2),
+        );
+      });
+
+      test('unchanged', () {
+        final schema = createSchema(true);
+        db.execute('SELECT powersync_replace_schema(?)', [json.encode(schema)]);
+
+        final [versionBefore] = db.select('PRAGMA schema_version');
+        db.execute('SELECT powersync_replace_schema(?)', [json.encode(schema)]);
+        final [versionAfter] = db.select('PRAGMA schema_version');
+
+        expect(versionAfter['schema_version'],
+            equals(versionBefore['schema_version']));
+      });
+
+      test('disabling', () {
+        db.execute('SELECT powersync_replace_schema(?)',
+            [json.encode(createSchema(true))]);
+        expect(
+          db.select("select * from sqlite_schema where type = 'trigger' "
+              "AND tbl_name = 'customers' "
+              "AND name GLOB 'ps_view_delete*'"),
+          hasLength(2),
+        );
+
+        db.execute('SELECT powersync_replace_schema(?)',
+            [json.encode(createSchema(false))]);
+        expect(
+          db.select("select * from sqlite_schema where type = 'trigger' "
+              "AND tbl_name = 'customers' "
+              "AND name GLOB 'ps_view_delete*'"),
+          hasLength(1),
+        );
+      });
+    });
   });
 }