Revert to using CommonDatabase type

Author: mugikhan

example/custom_functions_example.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 import 'dart:isolate';
 
 import 'package:sqlite3/common.dart';
-import 'package:sqlite_async/sqlite3.dart' as sqlite;
 import 'package:sqlite_async/sqlite_async.dart';
 
 /// Since the functions need to be created on every SQLite connection,
@@ -12,7 +11,7 @@ class TestOpenFactory extends DefaultSqliteOpenFactory {
   TestOpenFactory({required super.path, super.sqliteOptions});
 
   @override
-  FutureOr<sqlite.Database> open(SqliteOpenOptions options) async {
+  FutureOr<CommonDatabase> open(SqliteOpenOptions options) async {
     final db = await super.open(options);
 
     db.createFunction(

example/linux_cli_example.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:ffi';
 
-import 'package:sqlite_async/sqlite3.dart' as sqlite;
+import 'package:sqlite_async/sqlite3_common.dart';
 import 'package:sqlite_async/sqlite_async.dart';
 import 'package:sqlite3/open.dart' as sqlite_open;
 
@@ -17,7 +17,7 @@ class TestOpenFactory extends DefaultSqliteOpenFactory {
       this.sqlitePath = defaultSqlitePath});
 
   @override
-  FutureOr<sqlite.Database> open(SqliteOpenOptions options) async {
+  FutureOr<CommonDatabase> open(SqliteOpenOptions options) async {
     // 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

@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'package:meta/meta.dart';
 
-import 'package:sqlite_async/sqlite3.dart' as sqlite;
+import 'package:sqlite_async/sqlite3_common.dart' as sqlite;
 import 'package:sqlite_async/src/common/mutex.dart';
 import 'package:sqlite_async/src/sqlite_connection.dart';
 import 'package:sqlite_async/src/sqlite_options.dart';
@@ -11,11 +11,11 @@ import 'package:sqlite_async/src/update_notification.dart';
 ///
 /// Since connections are opened in dedicated background isolates, this class
 /// must be safe to pass to different isolates.
-abstract class SqliteOpenFactory {
+abstract class SqliteOpenFactory<Database extends sqlite.CommonDatabase> {
   String get path;
 
   /// Opens a direct connection to the SQLite database
-  FutureOr<sqlite.Database> open(SqliteOpenOptions options);
+  FutureOr<Database> open(SqliteOpenOptions options);
 
   /// Opens an asynchronous [SqliteConnection]
   FutureOr<SqliteConnection> openConnection(SqliteOpenOptions options);
@@ -61,7 +61,9 @@ class SqliteOpenOptions {
 /// to configure the connection.
 ///
 /// Override the [open] method to customize the process.
-abstract class AbstractDefaultSqliteOpenFactory implements SqliteOpenFactory {
+abstract class AbstractDefaultSqliteOpenFactory<
+        Database extends sqlite.CommonDatabase>
+    implements SqliteOpenFactory<Database> {
   @override
   final String path;
   final SqliteOptions sqliteOptions;
@@ -75,13 +77,13 @@ abstract class AbstractDefaultSqliteOpenFactory implements SqliteOpenFactory {
   @protected
 
   /// Opens a direct connection to a SQLite database connection
-  FutureOr<sqlite.Database> openDB(SqliteOpenOptions options);
+  FutureOr<Database> openDB(SqliteOpenOptions options);
 
   @override
 
   /// Opens a direct connection to a SQLite database connection
   /// and executes setup pragma statements to initialize the DB
-  FutureOr<sqlite.Database> open(SqliteOpenOptions options) async {
+  FutureOr<Database> open(SqliteOpenOptions options) async {
     var db = await openDB(options);
 
     // Pragma statements don't have the same BUSY_TIMEOUT behavior as normal statements.

lib/src/common/isolate_connection_factory.dart

@@ -1,13 +1,14 @@
 import 'dart:async';
-import 'package:sqlite3/sqlite3.dart' as sqlite;
+import 'package:sqlite_async/sqlite3.dart';
+import 'package:sqlite_async/sqlite3_common.dart' as sqlite;
 import 'package:sqlite_async/src/common/mutex.dart';
 import 'package:sqlite_async/src/common/abstract_open_factory.dart';
 import 'package:sqlite_async/src/impl/isolate_connection_factory_impl.dart';
 import 'package:sqlite_async/src/sqlite_connection.dart';
 import 'port_channel.dart';
 
-mixin IsolateOpenFactoryMixin {
-  AbstractDefaultSqliteOpenFactory get openFactory;
+mixin IsolateOpenFactoryMixin<Database extends sqlite.CommonDatabase> {
+  AbstractDefaultSqliteOpenFactory<Database> get openFactory;
 
   /// Opens a synchronous sqlite.Database directly in the current isolate.
   ///
@@ -16,14 +17,15 @@ mixin IsolateOpenFactoryMixin {
   ///     with SQLITE_BUSY if another isolate is using the database at the same time.
   ///  2. Other connections are not notified of any updates to tables made within
   ///     this connection.
-  FutureOr<sqlite.Database> openRawDatabase({bool readOnly = false}) async {
+  FutureOr<Database> openRawDatabase({bool readOnly = false}) async {
     return openFactory
         .open(SqliteOpenOptions(primaryConnection: false, readOnly: readOnly));
   }
 }
 
 /// A connection factory that can be passed to different isolates.
-abstract class IsolateConnectionFactory with IsolateOpenFactoryMixin {
+abstract class IsolateConnectionFactory<Database extends sqlite.CommonDatabase>
+    with IsolateOpenFactoryMixin<Database> {
   Mutex get mutex;
 
   SerializedPortClient get upstreamPort;
@@ -35,7 +37,7 @@ abstract class IsolateConnectionFactory with IsolateOpenFactoryMixin {
     return IsolateConnectionFactoryImpl(
         openFactory: openFactory,
         mutex: mutex,
-        upstreamPort: upstreamPort) as IsolateConnectionFactory;
+        upstreamPort: upstreamPort) as IsolateConnectionFactory<Database>;
   }
 
   /// Open a new SqliteConnection.

lib/src/impl/stub_sqlite_open_factory.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:sqlite3/sqlite3.dart' as sqlite;
+import 'package:sqlite3/common.dart';
 import 'package:sqlite_async/src/common/abstract_open_factory.dart';
 import 'package:sqlite_async/src/sqlite_connection.dart';
 import 'package:sqlite_async/src/sqlite_options.dart';
@@ -11,7 +11,7 @@ class DefaultSqliteOpenFactory extends AbstractDefaultSqliteOpenFactory {
       super.sqliteOptions = const SqliteOptions.defaults()});
 
   @override
-  sqlite.Database openDB(SqliteOpenOptions options) {
+  CommonDatabase openDB(SqliteOpenOptions options) {
     throw UnimplementedError();
   }
 

test/utils/native_test_utils.dart

@@ -8,7 +8,6 @@ import 'package:glob/list_local_fs.dart';
 import 'package:sqlite_async/sqlite3_common.dart';
 import 'package:sqlite_async/sqlite_async.dart';
 import 'package:sqlite3/open.dart' as sqlite_open;
-import 'package:sqlite3/sqlite3.dart' as sqlite;
 
 import 'abstract_test_utils.dart';
 
@@ -22,7 +21,7 @@ class TestSqliteOpenFactory extends TestDefaultSqliteOpenFactory {
       initStatements});
 
   @override
-  FutureOr<sqlite.Database> open(SqliteOpenOptions options) async {
+  FutureOr<CommonDatabase> open(SqliteOpenOptions options) async {
     sqlite_open.open.overrideFor(sqlite_open.OperatingSystem.linux, () {
       return DynamicLibrary.open(sqlitePath);
     });