Verify schema invalidation

Author: simolus3

crates/core/src/schema/raw_table.rs

@@ -125,29 +125,24 @@ impl InferredSchemaCache {
         schema_version: usize,
         tbl: &RawTable,
     ) -> Result<Rc<PendingStatement>, PowerSyncError> {
-        let mut entries = self.entries.borrow_mut();
-        let mut entry = entries.entry(tbl.name.clone());
-        let entry = match entry {
-            Entry::Vacant(entry) => entry.insert(SchemaCacheEntry::infer(db, schema_version, tbl)?),
-            Entry::Occupied(ref mut entry) => {
-                let value = entry.get_mut();
-                if value.schema_version != schema_version {
-                    // Values are outdated, refresh.
-                    *value = SchemaCacheEntry::infer(db, schema_version, tbl)?;
-                }
-
-                value
-            }
-        };
-
-        Ok(entry.put())
+        self.with_entry(db, schema_version, tbl, SchemaCacheEntry::put)
     }
 
     pub fn infer_delete_statement(
         &self,
         db: *mut sqlite::sqlite3,
         schema_version: usize,
         tbl: &RawTable,
+    ) -> Result<Rc<PendingStatement>, PowerSyncError> {
+        self.with_entry(db, schema_version, tbl, SchemaCacheEntry::delete)
+    }
+
+    fn with_entry(
+        &self,
+        db: *mut sqlite::sqlite3,
+        schema_version: usize,
+        tbl: &RawTable,
+        f: fn(&mut SchemaCacheEntry) -> Rc<PendingStatement>,
     ) -> Result<Rc<PendingStatement>, PowerSyncError> {
         let mut entries = self.entries.borrow_mut();
         let mut entry = entries.entry(tbl.name.clone());
@@ -164,7 +159,7 @@ impl InferredSchemaCache {
             }
         };
 
-        Ok(entry.delete())
+        Ok(f(entry))
     }
 }
 

dart/test/sync_test.dart

@@ -1171,6 +1171,79 @@ CREATE TRIGGER users_delete
     });
 
     syncTest('inferred schema smoke test', (_) {
+      db.execute(
+          'CREATE TABLE local_users (id TEXT NOT NULL PRIMARY KEY, name TEXT NOT NULL, local TEXT) STRICT;');
+      final table = {
+        'name': 'users',
+        'table_name': 'local_users',
+        'local_only_columns': ['local'],
+        // This also tests that the trigger preventing updates and deletes on
+        // insert-only tables is inert during sync_local.
+        'insert_only': true,
+      };
+
+      invokeControl(
+          'start',
+          json.encode({
+            'schema': {
+              'raw_tables': [table],
+              'tables': [],
+            }
+          }));
+
+      // Insert
+      pushCheckpoint(buckets: [bucketDescription('a')]);
+      pushSyncData(
+        'a',
+        '1',
+        'my_user',
+        'PUT',
+        {
+          'name': 'First user',
+          'local': 'ignored because the column is local-only'
+        },
+        objectType: 'users',
+      );
+      pushCheckpointComplete();
+
+      var users = db.select('SELECT * FROM local_users;');
+      expect(users, [
+        {
+          'id': 'my_user',
+          'name': 'First user',
+          'local': null,
+        }
+      ]);
+
+      // Now, alter the underlying table to add a new column
+      db.execute('ALTER TABLE local_users ADD COLUMN email TEXT');
+      pushCheckpoint(buckets: [bucketDescription('a')]);
+      pushSyncData(
+        'a',
+        '2',
+        'my_user',
+        'PUT',
+        {
+          'name': 'First user',
+          'email': 'email@example.org',
+          'local': 'still ignored'
+        },
+        objectType: 'users',
+      );
+      pushCheckpointComplete();
+
+      users = db.select('SELECT * FROM local_users;');
+      expect(users, [
+        {
+          'id': 'my_user',
+          'name': 'First user',
+          'email': 'email@example.org',
+          'local': null,
+        }
+      ]);
+    });
+
+    test('inferred schema with changes', () {
       db.execute(
           'CREATE TABLE local_users (id TEXT NOT NULL PRIMARY KEY, name TEXT NOT NULL) STRICT;');
       final table = {