test for table not in schema scenario

Author: simolus3

crates/core/src/schema/mod.rs

@@ -23,7 +23,7 @@ use crate::{
     schema::raw_table::{InferredTableStructure, generate_raw_table_trigger},
     state::DatabaseState,
     sync::RawTableWithCachedStatements,
-    utils::{SqlBuffer, WriteType},
+    utils::{SqlBuffer, WriteType, verify_in_transaction},
     views::table_columns_to_json_object,
 };
 
@@ -92,11 +92,8 @@ fn raw_table_migration(
     args: &[*mut sqlite::value],
 ) -> Result<(), PowerSyncError> {
     let db = context.db_handle();
-    if db.get_autocommit() {
-        return Err(PowerSyncError::argument_error(
-            "powersync_raw_table_migrate must be called within a transaction",
-        ));
-    }
+    verify_in_transaction(db)?;
+
     let context = unsafe { DatabaseState::from_context(&context) };
     let action = RawTableMigration::from_args(args)?;
 
@@ -159,7 +156,7 @@ fn raw_table_migration(
                 // Generate an INSERT INTO ps_untyped with a SELECT source transforming existing
                 // rows into JSON objects.
                 let mut buffer = SqlBuffer::new();
-                let fragment = table_columns_to_json_object(&local_table_name, &as_schema_table)?;
+                let fragment = table_columns_to_json_object(local_table_name, &as_schema_table)?;
                 buffer.push_str("INSERT INTO ps_untyped (type, id, data) SELECT ?, id, ");
                 buffer.push_str(&fragment);
                 buffer.push_str(" FROM ");

dart/test/error_test.dart

@@ -40,6 +40,8 @@ void main() {
           'SELECT powersync_clear(?)', 'powersync_clear', [0]);
       expectErrorOutsideOfTransaction(
           'SELECT powersync_trigger_resync(TRUE)', 'powersync_trigger_resync');
+      expectErrorOutsideOfTransaction('SELECT powersync_raw_table_migrate(?,?)',
+          'powersync_raw_table_migrate', ['create', 'a']);
     });
 
     test('contain inner SQLite descriptions', () {

dart/test/schema_test.dart

@@ -333,15 +333,7 @@ END''',
         };
       }
 
-      setUp(() => db.execute('SELECT powersync_init();'));
-
-      test('requires a transaction', () {
-        expect(
-          () => db.execute(
-              'SELECT powersync_raw_table_migrate(?, ?)', ['create', syncName]),
-          throwsA(isA<SqliteException>()),
-        );
-      });
+      setUp(() => db.executeInTx('SELECT powersync_init();'));
 
       group('create', () {
         void createUntypedItem(String id, Object? json) {
@@ -355,17 +347,15 @@ END''',
           createUntypedItem('foo', {'hello': 'world'});
           createUntypedItem('bar', {'hello': 'again'});
 
-          db.execute('SELECT powersync_replace_schema(?)', [
+          db.executeInTx('SELECT powersync_replace_schema(?)', [
             json.encode(singleRawTableSchema(
                 {'name': syncName, 'table_name': 'greetings'})),
           ]);
           db.execute(
               'CREATE TABLE greetings (id TEXT PRIMARY KEY, hello TEXT) STRICT;');
 
-          db.execute('BEGIN');
-          db.execute(
+          db.executeInTx(
               'SELECT powersync_raw_table_migrate(?, ?)', ['create', syncName]);
-          db.execute('COMMIT');
           expect(db.select('select * from ps_untyped'), isEmpty);
           expect(db.select('select * from greetings'), [
             {'id': 'foo', 'hello': 'world'},
@@ -377,7 +367,7 @@ END''',
           createUntypedItem('foo', {'hello': 'world'});
           createUntypedItem('bar', {'hello': 'again'});
 
-          db.execute('SELECT powersync_replace_schema(?)', [
+          db.executeInTx('SELECT powersync_replace_schema(?)', [
             json.encode(singleRawTableSchema({
               'name': syncName,
               'put': {
@@ -393,16 +383,27 @@ END''',
           db.execute(
               'CREATE TABLE greetings (id TEXT PRIMARY KEY, hello TEXT) STRICT;');
 
-          db.execute('BEGIN');
-          db.execute(
+          db.executeInTx(
               'SELECT powersync_raw_table_migrate(?, ?)', ['create', syncName]);
-          db.execute('COMMIT');
           expect(db.select('select * from ps_untyped'), isEmpty);
           expect(db.select('select * from greetings'), [
             {'id': 'foo', 'hello': 'world'},
             {'id': 'bar', 'hello': 'again'},
           ]);
         });
+
+        test('errors when table is not in schema', () {
+          db.executeInTx('SELECT powersync_replace_schema(?)', [
+            json.encode(singleRawTableSchema(
+                {'name': syncName, 'table_name': 'greetings'})),
+          ]);
+
+          expect(
+            () => db.executeInTx('SELECT powersync_raw_table_migrate(?, ?)',
+                ['create', 'unknown_table']),
+            throwsA(isA<SqliteException>()),
+          );
+        });
       });
 
       test('drop', () {
@@ -417,28 +418,26 @@ END''',
             'INSERT INTO greetings (id, hello, local) VALUES (?, ?, uuid())',
             ['id_1', 'second'],
           )
-          ..execute('BEGIN')
-          ..execute('SELECT powersync_raw_table_migrate(?, ?)', [
+          ..executeInTx('SELECT powersync_raw_table_migrate(?, ?)', [
             'drop',
             json.encode({
               'name': syncName,
               'table_name': 'greetings',
               'synced_columns': ['hello']
             })
-          ])
-          ..execute('COMMIT');
-
+          ]);
         expect(db.select('select * from ps_untyped'), [
           {'type': 'synced_table', 'id': 'id_0', 'data': '{"hello":"first"}'},
           {'type': 'synced_table', 'id': 'id_1', 'data': '{"hello":"second"}'},
         ]);
+        expect(db.select('select * from greetings'), isEmpty);
       });
 
       test('crud triggers are not invoked during migration', () {
         final tableJson =
             json.encode({'name': syncName, 'table_name': 'greetings'});
 
-        db.execute('SELECT powersync_replace_schema(?)', [
+        db.executeInTx('SELECT powersync_replace_schema(?)', [
           json.encode(singleRawTableSchema(
               {'name': syncName, 'table_name': 'greetings'})),
         ]);