Revert Dart testing changes

Author: simolus3

dart/pubspec.lock

@@ -13,18 +13,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0"
+      sha256: "13c1e6c6fd460522ea840abec3f677cc226f5fec7872c04ad7b425517ccf54f7"
       url: "https://pub.dev"
     source: hosted
-    version: "7.4.5"
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.7"
+    version: "7.4.4"
   args:
     dependency: transitive
     description:
@@ -53,10 +45,10 @@ packages:
     dependency: "direct main"
     description:
       name: bson
-      sha256: f8c80be7a62a88f4add7c48cc83567c36a77532de107224df8328ef71f125045
+      sha256: "9b761248a3494fea594aecf5d6f369b5f04d7b082aa2b8c06579ade77f1a7e47"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.7"
+    version: "5.0.6"
   cli_config:
     dependency: transitive
     description:
@@ -93,10 +85,10 @@ packages:
     dependency: transitive
     description:
       name: coverage
-      sha256: aa07dbe5f2294c827b7edb9a87bba44a9c15a3cc81bc8da2ca19b37322d30080
+      sha256: "9086475ef2da7102a0c0a4e37e1e30707e7fb7b6d28c209f559a9c5f8ce42016"
       url: "https://pub.dev"
     source: hosted
-    version: "1.14.1"
+    version: "1.12.0"
   crypto:
     dependency: transitive
     description:
@@ -109,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: decimal
-      sha256: "6c2041df7caefc9393ae0b0dcc4abc700831014a2c252dd10e3952499673f0b2"
+      sha256: "28239b8b929c1bd8618702e6dbc96e2618cf99770bbe9cb040d6cf56a11e4ec3"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.2"
+    version: "3.2.1"
   fake_async:
     dependency: "direct dev"
     description:
@@ -161,14 +153,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.3"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -229,10 +213,10 @@ packages:
     dependency: "direct dev"
     description:
       name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.16.0"
   mime:
     dependency: transitive
     description:
@@ -241,22 +225,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
-  native_assets_cli:
-    dependency: transitive
-    description:
-      name: native_assets_cli
-      sha256: "298ba641e47b44f039601141ab26f6865186b5d05b7f313d45797513d7205b3d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.14.0"
-  native_toolchain_c:
-    dependency: transitive
-    description:
-      name: native_toolchain_c
-      sha256: e5b14abd4309f820817a48701dfd40d1fbd80a1d5fa2ce6838b758e952ea46d9
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.0"
   node_preamble:
     dependency: transitive
     description:
@@ -297,14 +265,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
-  posix:
-    dependency: transitive
-    description:
-      name: posix
-      sha256: f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.2"
   power_extensions:
     dependency: transitive
     description:
@@ -401,14 +361,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.7.6"
-  sqlite3_native_assets:
-    dependency: "direct main"
-    description:
-      name: sqlite3_native_assets
-      sha256: "0b379f37a642b20905e86fba43940bb429e44bed1d0fc6149076090815d450a7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.0.4"
   sqlite3_test:
     dependency: "direct dev"
     description:
@@ -453,26 +405,26 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb"
+      sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.26.2"
+    version: "1.25.15"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
+      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.6"
+    version: "0.7.4"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a"
+      sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.11"
+    version: "0.6.8"
   typed_data:
     dependency: transitive
     description:
@@ -493,18 +445,18 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
       url: "https://pub.dev"
     source: hosted
-    version: "15.0.2"
+    version: "15.0.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a"
+      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.1"
   web:
     dependency: transitive
     description:
@@ -517,10 +469,10 @@ packages:
     dependency: transitive
     description:
       name: web_socket
-      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
+      sha256: bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.0"
   web_socket_channel:
     dependency: transitive
     description:

dart/pubspec.yaml

@@ -7,7 +7,6 @@ environment:
 dependencies:
   sqlite3: ^2.7.6
   bson: ^5.0.5
-  sqlite3_native_assets: ^0.0.4
 
 dev_dependencies:
   test: ^1.25.0
@@ -16,12 +15,3 @@ dev_dependencies:
   fake_async: ^1.3.3
   convert: ^3.1.2
   meta: ^1.16.0
-
-hooks:
-  user_defines:
-    sqlite3_native_assets:
-      defines:
-        defines:
-          # We use the sqlite_stmt virtual table in tests to assert that the core extension is properly
-          # returning all statements it starts.
-          - SQLITE_ENABLE_STMTVTAB

dart/test/js_key_encoding_test.dart

@@ -2,7 +2,7 @@ import 'dart:convert';
 
 import 'package:file/local.dart';
 import 'package:sqlite3/common.dart';
-import 'package:sqlite3/native_assets.dart';
+import 'package:sqlite3/sqlite3.dart';
 import 'package:sqlite3_test/sqlite3_test.dart';
 import 'package:test/test.dart';
 
@@ -16,9 +16,9 @@ void main() {
 
   setUpAll(() {
     loadExtension();
-    sqlite3Native.registerVirtualFileSystem(vfs, makeDefault: false);
+    sqlite3.registerVirtualFileSystem(vfs, makeDefault: false);
   });
-  tearDownAll(() => sqlite3Native.unregisterVirtualFileSystem(vfs));
+  tearDownAll(() => sqlite3.unregisterVirtualFileSystem(vfs));
 
   setUp(() async {
     db = openTestDatabase(vfs: vfs)

dart/test/sync_local_performance_test.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:sqlite3/common.dart';
-import 'package:sqlite3/native_assets.dart';
+import 'package:sqlite3/sqlite3.dart';
 import 'package:test/test.dart';
 
 import 'utils/native_test_utils.dart';
@@ -32,13 +32,13 @@ void testFilesystemOperations(
     // Needs an unique name per test file to avoid concurrency issues
     vfs = new TrackingFileSystem(
         parent: new InMemoryFileSystem(), name: 'perf-test-vfs');
-    sqlite3Native.registerVirtualFileSystem(vfs, makeDefault: false);
+    sqlite3.registerVirtualFileSystem(vfs, makeDefault: false);
     db = openTestDatabase(vfs: vfs, fileName: 'test.db');
   });
 
   tearDown(() {
     db.dispose();
-    sqlite3Native.unregisterVirtualFileSystem(vfs);
+    sqlite3.unregisterVirtualFileSystem(vfs);
   });
 
   setUp(() {

dart/test/sync_test.dart

@@ -7,7 +7,7 @@ import 'package:fake_async/fake_async.dart';
 import 'package:file/local.dart';
 import 'package:meta/meta.dart';
 import 'package:sqlite3/common.dart';
-import 'package:sqlite3/native_assets.dart';
+import 'package:sqlite3/sqlite3.dart';
 import 'package:sqlite3_test/sqlite3_test.dart';
 import 'package:test/test.dart';
 import 'package:path/path.dart';
@@ -28,9 +28,9 @@ void main() {
 
   setUpAll(() {
     loadExtension();
-    sqlite3Native.registerVirtualFileSystem(vfs, makeDefault: false);
+    sqlite3.registerVirtualFileSystem(vfs, makeDefault: false);
   });
-  tearDownAll(() => sqlite3Native.unregisterVirtualFileSystem(vfs));
+  tearDownAll(() => sqlite3.unregisterVirtualFileSystem(vfs));
 
   group('text lines', () {
     _syncTests(vfs: vfs, isBson: false);
@@ -55,9 +55,10 @@ void _syncTests<T>({
 
     // Make sure that powersync_control doesn't leave any busy statements
     // behind.
-    const statement = 'SELECT * FROM sqlite_stmt WHERE busy AND sql != ?;';
-    final busy = db.select(statement, [statement]);
-    expect(busy, isEmpty);
+    // TODO: Re-enable after we can guarantee sqlite_stmt being available
+    // const statement = 'SELECT * FROM sqlite_stmt WHERE busy AND sql != ?;';
+    // final busy = db.select(statement, [statement]);
+    // expect(busy, isEmpty);
 
     db.execute('commit');
     return jsonDecode(row.columnAt(0));

dart/test/utils/native_test_utils.dart

@@ -1,7 +1,8 @@
 import 'dart:ffi';
+import 'dart:io';
 
 import 'package:sqlite3/common.dart';
-import 'package:sqlite3/native_assets.dart';
+import 'package:sqlite3/open.dart' as sqlite_open;
 import 'package:sqlite3/sqlite3.dart';
 import 'package:path/path.dart' as p;
 
@@ -10,19 +11,37 @@ const defaultSqlitePath = 'libsqlite3.so.0';
 const libPath = '../target/debug';
 var didLoadExtension = false;
 
+void applyOpenOverride() {
+  sqlite_open.open.overrideFor(sqlite_open.OperatingSystem.linux, () {
+    return DynamicLibrary.open('libsqlite3.so.0');
+  });
+  sqlite_open.open.overrideFor(sqlite_open.OperatingSystem.macOS, () {
+    // Prefer using Homebrew's SQLite which allows loading extensions.
+    const fromHomebrew = '/opt/homebrew/opt/sqlite/lib/libsqlite3.dylib';
+    if (File(fromHomebrew).existsSync()) {
+      return DynamicLibrary.open(fromHomebrew);
+    }
+
+    return DynamicLibrary.open('libsqlite3.dylib');
+  });
+}
+
 CommonDatabase openTestDatabase(
     {VirtualFileSystem? vfs, String fileName = ':memory:'}) {
+  applyOpenOverride();
   if (!didLoadExtension) {
     loadExtension();
   }
 
-  return sqlite3Native.open(fileName, vfs: vfs?.name);
+  return sqlite3.open(fileName, vfs: vfs?.name);
 }
 
 void loadExtension() {
+  applyOpenOverride();
+
   var lib = DynamicLibrary.open(getLibraryForPlatform(path: libPath));
   var extension = SqliteExtension.inLibrary(lib, 'sqlite3_powersync_init');
-  sqlite3Native.ensureExtensionLoaded(extension);
+  sqlite3.ensureExtensionLoaded(extension);
   didLoadExtension = true;
 }