Expand tests

Author: simolus3

crates/core/src/error.rs

@@ -248,8 +248,8 @@ pub enum RawPowerSyncError {
         libversion_number: c_int,
         libversion: &'static str,
     },
-    #[error("{function_name} may only be called in transactions.")]
-    MustBeCalledInTransaction { function_name: &'static str },
+    #[error("This function may only be called in transactions.")]
+    MustBeCalledInTransaction,
 }
 
 #[derive(Debug)]

crates/core/src/schema/management.rs

@@ -266,7 +266,7 @@ fn powersync_replace_schema_impl(
     args: &[*mut sqlite::value],
 ) -> Result<String, PowerSyncError> {
     let db = ctx.db_handle();
-    verify_in_transaction(db, "powersync_replace_schema")?;
+    verify_in_transaction(db)?;
 
     let schema = args[0].text();
     let state = unsafe { DatabaseState::from_context(&ctx) };

crates/core/src/sync/interface.rs

@@ -206,7 +206,7 @@ pub fn register(db: *mut sqlite::sqlite3, state: Rc<DatabaseState>) -> Result<()
     ) -> () {
         let result = (|| -> Result<(), PowerSyncError> {
             let db = ctx.db_handle();
-            verify_in_transaction(db, "powersync_control")?;
+            verify_in_transaction(db)?;
 
             let state = unsafe { DatabaseState::from_context(&ctx) };
             let args = sqlite::args!(argc, argv);

crates/core/src/utils/mod.rs

@@ -12,17 +12,14 @@ use crate::error::{PowerSyncError, RawPowerSyncError};
 use uuid::Uuid;
 
 #[cold]
-fn must_be_in_tx_error(function_name: &'static str) -> PowerSyncError {
-    return RawPowerSyncError::MustBeCalledInTransaction { function_name }.into();
+fn must_be_in_tx_error() -> PowerSyncError {
+    return RawPowerSyncError::MustBeCalledInTransaction.into();
 }
 
 #[inline]
-pub fn verify_in_transaction(
-    db: *mut sqlite3,
-    function_name: &'static str,
-) -> Result<(), PowerSyncError> {
+pub fn verify_in_transaction(db: *mut sqlite3) -> Result<(), PowerSyncError> {
     if db.get_autocommit() {
-        return Err(must_be_in_tx_error(function_name));
+        return Err(must_be_in_tx_error());
     }
 
     Ok(())

crates/core/src/view_admin.rs

@@ -36,7 +36,7 @@ fn powersync_init_impl(
     _args: &[*mut sqlite::value],
 ) -> Result<String, PowerSyncError> {
     let db = ctx.db_handle();
-    verify_in_transaction(db, "powersync_init")?;
+    verify_in_transaction(db)?;
     powersync_migrate(ctx, LATEST_VERSION)?;
 
     // Register the powersync_internal_close vtab to implement a "pre-close hook".
@@ -54,7 +54,7 @@ fn powersync_test_migration_impl(
     args: &[*mut sqlite::value],
 ) -> Result<String, PowerSyncError> {
     let db = ctx.db_handle();
-    verify_in_transaction(db, "powersync_test_migration")?;
+    verify_in_transaction(db)?;
 
     let target_version = args[0].int();
     powersync_migrate(ctx, target_version)?;
@@ -73,7 +73,7 @@ fn powersync_clear_impl(
     args: &[*mut sqlite::value],
 ) -> Result<String, PowerSyncError> {
     let local_db = ctx.db_handle();
-    verify_in_transaction(local_db, "powersync_clear")?;
+    verify_in_transaction(local_db)?;
     let state = unsafe { DatabaseState::from_context(&ctx) };
 
     let flags = PowerSyncClearFlags(args[0].int());
@@ -180,7 +180,7 @@ fn powersync_trigger_resync_impl(
     args: &[*mut sqlite::value],
 ) -> Result<String, PowerSyncError> {
     let local_db = ctx.db_handle();
-    verify_in_transaction(local_db, "powersync_trigger_resync")?;
+    verify_in_transaction(local_db)?;
 
     let state = unsafe { DatabaseState::from_context(&ctx) };
     trigger_resync(local_db, state)?;

dart/test/error_test.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:sqlite3/common.dart';
 import 'package:test/test.dart';
 
@@ -12,6 +14,34 @@ void main() {
       db = openTestDatabase();
     });
 
+    test('not in transaction', () {
+      void expectErrorOutsideOfTransaction(String sql, String functionName,
+          [List<Object?> args = const []]) {
+        expect(
+          () => db.execute(sql, args),
+          throwsA(isSqliteException(
+            21,
+            '$functionName: This function may only be called in transactions.',
+          )),
+        );
+      }
+
+      expectErrorOutsideOfTransaction(
+          'SELECT powersync_init()', 'powersync_init');
+      db.executeInTx('SELECT powersync_init()');
+
+      expectErrorOutsideOfTransaction('SELECT powersync_control(?, ?)',
+          'powersync_control', ['STOP', null]);
+      expectErrorOutsideOfTransaction('SELECT powersync_replace_schema(?)',
+          'powersync_replace_schema', [json.encode({})]);
+      expectErrorOutsideOfTransaction('SELECT powersync_test_migration(?)',
+          'powersync_test_migration', [123]);
+      expectErrorOutsideOfTransaction(
+          'SELECT powersync_clear(?)', 'powersync_clear', [0]);
+      expectErrorOutsideOfTransaction(
+          'SELECT powersync_trigger_resync(TRUE)', 'powersync_trigger_resync');
+    });
+
     test('contain inner SQLite descriptions', () {
       // Create a wrong migrations table for the core extension to trip over.
       db.execute('CREATE TABLE IF NOT EXISTS ps_migration(foo TEXT)');