update from master

Author: stevensJourney

.github/workflows/test.yaml

@@ -30,20 +30,20 @@ jobs:
     strategy:
       matrix:
         include:
-          - sqlite_version: '3440200'
-            sqlite_url: 'https://www.sqlite.org/2023/sqlite-autoconf-3440200.tar.gz'
+          - sqlite_version: "3440200"
+            sqlite_url: "https://www.sqlite.org/2023/sqlite-autoconf-3440200.tar.gz"
             dart_sdk: 3.3.3
-          - sqlite_version: '3430200'
-            sqlite_url: 'https://www.sqlite.org/2023/sqlite-autoconf-3430200.tar.gz'
+          - sqlite_version: "3430200"
+            sqlite_url: "https://www.sqlite.org/2023/sqlite-autoconf-3430200.tar.gz"
             dart_sdk: 3.3.3
-          - sqlite_version: '3420000'
-            sqlite_url: 'https://www.sqlite.org/2023/sqlite-autoconf-3420000.tar.gz'
+          - sqlite_version: "3420000"
+            sqlite_url: "https://www.sqlite.org/2023/sqlite-autoconf-3420000.tar.gz"
             dart_sdk: 3.3.3
-          - sqlite_version: '3410100'
-            sqlite_url: 'https://www.sqlite.org/2023/sqlite-autoconf-3410100.tar.gz'
+          - sqlite_version: "3410100"
+            sqlite_url: "https://www.sqlite.org/2023/sqlite-autoconf-3410100.tar.gz"
             dart_sdk: 3.3.3
-          - sqlite_version: '3380000'
-            sqlite_url: 'https://www.sqlite.org/2022/sqlite-autoconf-3380000.tar.gz'
+          - sqlite_version: "3380000"
+            sqlite_url: "https://www.sqlite.org/2022/sqlite-autoconf-3380000.tar.gz"
             dart_sdk: 3.3.3
     steps:
       - uses: actions/checkout@v3

lib/sqlite3_common.dart

@@ -1,2 +1,2 @@
-// Exports common Sqlite3 exports which are available on web and ffi environments
+// Exports common Sqlite3 exports which are available in different environments.
 export 'package:sqlite3/common.dart';

test/basic_shared_test.dart renamed to test/basic_test.dart

@@ -305,10 +305,11 @@ void main() {
       // 4. Now second connection is ready. Second query has two connections to choose from.
       // 5. However, first connection is closed, so it's removed from the pool.
       // 6. Triggers `Concurrent modification during iteration: Instance(length:1) of '_GrowableList'`
-      final db = await testUtils.setupDatabase(path: path, initStatements: [
+      final db = SqliteDatabase.withFactory(
+          await testUtils.testFactory(path: path, initStatements: [
         // Second connection to sleep more than first connection
         'SELECT test_sleep(test_connection_number() * 10)'
-      ]);
+      ]));
       await db.initialize();
 
       final future1 = db.get('SELECT test_sleep(10) as sleep');

test/native/basic_test.dart

@@ -5,27 +5,14 @@ import 'dart:math';
 
 import 'package:sqlite3/common.dart';
 import 'package:sqlite_async/sqlite_async.dart';
-import 'package:sqlite_async/src/utils/database_utils.dart';
 import 'package:test/test.dart';
 
 import '../utils/test_utils_impl.dart';
+import '../watch_test.dart';
 
 final testUtils = TestUtils();
 
 void main() {
-  createTables(SqliteDatabase db) async {
-    await db.writeTransaction((tx) async {
-      await tx.execute(
-          'CREATE TABLE assets(id INTEGER PRIMARY KEY AUTOINCREMENT, make TEXT, customer_id INTEGER)');
-      await tx.execute('CREATE INDEX assets_customer ON assets(customer_id)');
-      await tx.execute(
-          'CREATE TABLE customers(id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT)');
-      await tx.execute(
-          'CREATE TABLE other_customers(id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT)');
-      await tx.execute('CREATE VIEW assets_alias AS SELECT * FROM assets');
-    });
-  }
-
   group('Query Watch Tests', () {
     late String path;
 
@@ -34,37 +21,6 @@ void main() {
       await testUtils.cleanDb(path: path);
     });
 
-    for (var sqlite in testUtils.findSqliteLibraries()) {
-      test('getSourceTables - $sqlite', () async {
-        final db = SqliteDatabase.withFactory(
-            await testUtils.testFactory(path: path, sqlitePath: sqlite));
-        await db.initialize();
-        await createTables(db);
-
-        var versionRow = await db.get('SELECT sqlite_version() as version');
-        print('Testing SQLite ${versionRow['version']} - $sqlite');
-
-        final tables = await getSourceTables(db,
-            'SELECT * FROM assets INNER JOIN customers ON assets.customer_id = customers.id');
-        expect(tables, equals({'assets', 'customers'}));
-
-        final tables2 = await getSourceTables(db,
-            'SELECT count() FROM assets INNER JOIN "other_customers" AS oc ON assets.customer_id = oc.id AND assets.make = oc.name');
-        expect(tables2, equals({'assets', 'other_customers'}));
-
-        final tables3 = await getSourceTables(db, 'SELECT count() FROM assets');
-        expect(tables3, equals({'assets'}));
-
-        final tables4 =
-            await getSourceTables(db, 'SELECT count() FROM assets_alias');
-        expect(tables4, equals({'assets'}));
-
-        final tables5 =
-            await getSourceTables(db, 'SELECT sqlite_version() as version');
-        expect(tables5, equals(<String>{}));
-      });
-    }
-
     test('watch in isolate', () async {
       final db = await testUtils.setupDatabase(path: path);
       await createTables(db);

test/native/watch_test.dart

@@ -22,9 +22,12 @@ abstract class AbstractTestUtils {
   Future<TestDefaultSqliteOpenFactory> testFactory(
       {String? path,
       String sqlitePath = '',
+      List<String> initStatements = const [],
       SqliteOptions options = const SqliteOptions.defaults()}) async {
     return TestDefaultSqliteOpenFactory(
-        path: path ?? dbPath(), sqliteOptions: options);
+      path: path ?? dbPath(),
+      sqliteOptions: options,
+    );
   }
 
   /// Creates a SqliteDatabaseConnection

test/utils/abstract_test_utils.dart

@@ -40,9 +40,11 @@ class TestUtils extends AbstractTestUtils {
   Future<TestDefaultSqliteOpenFactory> testFactory(
       {String? path,
       String? sqlitePath,
+      List<String> initStatements = const [],
       SqliteOptions options = const SqliteOptions.defaults()}) async {
     await _isInitialized;
-    return super.testFactory(path: path, options: webOptions);
+    return super.testFactory(
+        path: path, options: webOptions, initStatements: initStatements);
   }
 
   @override
@@ -56,6 +58,7 @@ class TestUtils extends AbstractTestUtils {
 
   @override
   List<String> findSqliteLibraries() {
-    return [];
+    // Maintains consistency with native tests
+    return ['sqlite3.wasm'];
   }
 }