update from main

Author: stevensJourney

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.0
+
+- BREAKING CHANGE: Update all Database types to use a `CommonDatabase` interface.
+- Update `openDB` and `open` methods to be synchronous.
+- Fix `ArgumentError (Invalid argument(s): argument value for 'return_value' is null)` in sqlite3 when closing the database connection by upgrading to version 2.4.4.
+
 ## 0.7.0-alpha.5
 
 - The dependency for the `Drift` package is now removed in favour of using the new `sqlite3_web` package.

example/custom_functions_example.dart

@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
 
@@ -11,8 +10,8 @@ class TestOpenFactory extends DefaultSqliteOpenFactory {
   TestOpenFactory({required super.path, super.sqliteOptions});
 
   @override
-  FutureOr<CommonDatabase> open(SqliteOpenOptions options) async {
-    final db = await super.open(options);
+  CommonDatabase open(SqliteOpenOptions options) {
+    final db = super.open(options);
 
     db.createFunction(
       functionName: 'sleep',

example/linux_cli_example.dart

@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:ffi';
 
 import 'package:sqlite3/common.dart';
@@ -17,7 +16,7 @@ class TestOpenFactory extends DefaultSqliteOpenFactory {
       this.sqlitePath = defaultSqlitePath});
 
   @override
-  FutureOr<CommonDatabase> open(SqliteOpenOptions options) async {
+  CommonDatabase open(SqliteOpenOptions options) {
     // For details, see:
     // https://pub.dev/packages/sqlite3#manually-providing-sqlite3-libraries
     sqlite_open.open.overrideFor(sqlite_open.OperatingSystem.linux, () {

lib/src/common/abstract_open_factory.dart

@@ -15,7 +15,7 @@ abstract class SqliteOpenFactory<Database extends sqlite.CommonDatabase> {
   String get path;
 
   /// Opens a direct connection to the SQLite database
-  FutureOr<Database> open(SqliteOpenOptions options);
+  Database open(SqliteOpenOptions options);
 
   /// Opens an asynchronous [SqliteConnection]
   FutureOr<SqliteConnection> openConnection(SqliteOpenOptions options);
@@ -77,14 +77,14 @@ abstract class AbstractDefaultSqliteOpenFactory<
   @protected
 
   /// Opens a direct connection to a SQLite database connection
-  FutureOr<Database> openDB(SqliteOpenOptions options);
+  Database openDB(SqliteOpenOptions options);
 
   @override
 
   /// Opens a direct connection to a SQLite database connection
   /// and executes setup pragma statements to initialize the DB
-  FutureOr<Database> open(SqliteOpenOptions options) async {
-    var db = await openDB(options);
+  Database open(SqliteOpenOptions options) {
+    var db = openDB(options);
 
     // Pragma statements don't have the same BUSY_TIMEOUT behavior as normal statements.
     // We add a manual retry loop for those.

lib/src/native/database/native_sqlite_connection_impl.dart

@@ -264,7 +264,7 @@ void _sqliteConnectionIsolate(_SqliteConnectionParams params) async {
     await client.post(const InitDb());
   }
 
-  final db = await params.openFactory.open(SqliteOpenOptions(
+  final db = params.openFactory.open(SqliteOpenOptions(
       primaryConnection: params.primary, readOnly: params.readOnly));
 
   runZonedGuarded(() async {

lib/src/web/web_sqlite_open_factory.dart

@@ -34,19 +34,10 @@ class DefaultSqliteOpenFactory
 
   @override
 
-  /// It is possible to open a CommonDatabase in the main Dart/JS context with standard sqlite3.dart,
-  /// This connection requires an external Webworker implementation for asynchronous operations.
-  /// Do not use this in conjunction with async connections provided by Drift
-  Future<CommonDatabase> openDB(SqliteOpenOptions options) async {
-    final wasmSqlite = await WasmSqlite3.loadFromUrl(
-        Uri.parse(sqliteOptions.webSqliteOptions.wasmUri));
-
-    wasmSqlite.registerVirtualFileSystem(
-      await IndexedDbFileSystem.open(dbName: path),
-      makeDefault: true,
-    );
-
-    return wasmSqlite.open(path);
+  /// This is currently not supported on web
+  CommonDatabase openDB(SqliteOpenOptions options) {
+    throw UnimplementedError(
+        'Direct access to CommonDatabase is not available on web.');
   }
 
   @override

pubspec.yaml

@@ -5,9 +5,15 @@ repository: https://github.com/powersync-ja/sqlite_async.dart
 environment:
   sdk: ">=3.4.0 <4.0.0"
 
+topics:
+  - sqlite
+  - async
+  - sql
+  - flutter
+
 dependencies:
+  sqlite3: "^2.4.4"
   sqlite3_web: ^0.1.2-wip
-  sqlite3: ^2.4.4
   async: ^2.10.0
   collection: ^1.17.0
   mutex: ^3.1.0

test/utils/native_test_utils.dart

@@ -21,11 +21,11 @@ class TestSqliteOpenFactory extends TestDefaultSqliteOpenFactory {
       initStatements});
 
   @override
-  FutureOr<CommonDatabase> open(SqliteOpenOptions options) async {
+  CommonDatabase open(SqliteOpenOptions options) {
     sqlite_open.open.overrideFor(sqlite_open.OperatingSystem.linux, () {
       return DynamicLibrary.open(sqlitePath);
     });
-    final db = await super.open(options);
+    final db = super.open(options);
 
     db.createFunction(
       functionName: 'test_sleep',