Removed exclusiveLock, simplified implementation of refreshSchema.

Author: Chriztiaan

packages/sqlite_async/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 0.8.2
 
-- Added `refreshSchema()` and `exclusiveLock()` to `SqliteDatabaseMixin`, allowing queries and watch calls to work against updated schemas.
+- Added `refreshSchema()`, allowing queries and watch calls to work against updated schemas.
 
 ## 0.8.1
 

packages/sqlite_async/lib/src/common/sqlite_database.dart

@@ -38,21 +38,6 @@ mixin SqliteDatabaseMixin implements SqliteConnection, SqliteQueries {
   ///
   /// Use this to access the database in background isolates.
   IsolateConnectionFactory isolateConnectionFactory();
-
-  /// TODO Improve on this definition by supporting a writeable context.
-  Future<void> exclusiveLock<T>(
-    Future<T> Function(SqliteReadContext ctx) callback,
-  ) {
-    return writeLock(callback);
-  }
-
-  /// Ensures that all connections are aware of the latest schema changes applied (if any).
-  /// Queries and watch calls can potentially use outdated schema information after a schema update.
-  Future<void> refreshSchema() {
-    return exclusiveLock((ctx) async {
-      return ctx.get("PRAGMA table_info('sqlite_master')");
-    });
-  }
 }
 
 /// A SQLite database instance.

packages/sqlite_async/lib/src/native/database/connection_pool.dart

@@ -54,67 +54,6 @@ class SqliteConnectionPool with SqliteQueries implements SqliteConnection {
     _writeConnection?.updates?.forEach(updatesController.add);
   }
 
-  /// Executes a provided callback function exclusively across all read and
-  /// write connections in the pool.
-  ///
-  /// This function first locks all read and write connections, collecting their
-  /// contexts. It then executes the provided [callback] function on each of these
-  /// contexts. After the [callback] completes for each context, the locks are released.
-  ///
-  /// Example usage:
-  /// ```dart
-  /// await runExclusive((ctx) async {
-  ///   // Perform some database operation with the ctx
-  ///   await ctx.execute('PRAGMA schema_version');
-  /// });
-  /// ```
-  exclusiveLock<T>(
-    Future<T> Function(SqliteReadContext tx) callback,
-  ) async {
-    final List<Completer<SqliteReadContext>> completers = [];
-    final List<Completer<void>> releasers = [];
-
-    for (final read in _allReadConnections) {
-      final completer = Completer<SqliteReadContext>();
-
-      completers.add(completer);
-      read.readLock((ctx) async {
-        completer.complete(ctx);
-
-        final releaser = Completer();
-        releasers.add(releaser);
-
-        // Keep this active, close the context when finished
-        await releaser.future;
-      });
-    }
-
-    final writeCompleter = Completer<SqliteReadContext>();
-    completers.add(writeCompleter);
-    _writeConnection?.writeLock((ctx) async {
-      writeCompleter.complete(ctx);
-
-      final releaser = Completer();
-      releasers.add(releaser);
-      await releaser.future;
-    });
-
-    // Get all the connection contexts and execute the callback on each of them
-    final List<SqliteReadContext> contexts = [];
-    for (final completer in completers) {
-      contexts.add(await completer.future);
-    }
-
-    for (final c in contexts) {
-      await callback(c);
-    }
-
-    // Release all the releasers
-    for (final r in releasers) {
-      r.complete();
-    }
-  }
-
   /// Returns true if the _write_ connection is currently in autocommit mode.
   @override
   Future<bool> getAutoCommit() async {
@@ -282,6 +221,17 @@ class SqliteConnectionPool with SqliteQueries implements SqliteConnection {
     // read-only connections first.
     await _writeConnection?.close();
   }
+
+  @override
+  Future<void> refreshSchema() async {
+    final toRefresh = _allReadConnections.toList();
+
+    await _writeConnection?.refreshSchema();
+
+    for (var connection in toRefresh) {
+      await connection.refreshSchema();
+    }
+  }
 }
 
 typedef ReadCallback<T> = Future<T> Function(SqliteReadContext tx);

packages/sqlite_async/lib/src/native/database/native_sqlite_database.dart

@@ -168,8 +168,7 @@ class SqliteDatabaseImpl
   }
 
   @override
-  Future<void> exclusiveLock<T>(
-      Future<T> Function(SqliteReadContext ctx) callback) {
-    return _pool.exclusiveLock(callback);
+  Future<void> refreshSchema() {
+    return _pool.refreshSchema();
   }
 }

packages/sqlite_async/lib/src/sqlite_queries.dart

@@ -137,4 +137,10 @@ mixin SqliteQueries implements SqliteWriteContext, SqliteConnection {
       return tx.executeBatch(sql, parameterSets);
     });
   }
+
+  /// Ensures that all connections are aware of the latest schema changes applied (if any).
+  /// Queries and watch calls can potentially use outdated schema information after a schema update.
+  Future<void> refreshSchema() {
+    return get("PRAGMA table_info('sqlite_master')");
+  }
 }