Merge branch 'master' into feature/user-parameters

Chriztiaan · Chriztiaan · commit 60f1fe4d3f54 · 2024-06-24T13:07:47.000+02:00
# Conflicts:
#	packages/powersync/CHANGELOG.md
diff --git a/demos/supabase-anonymous-auth/pubspec.lock b/demos/supabase-anonymous-auth/pubspec.lock
@@ -326,7 +326,7 @@ packages:
       path: "../../packages/powersync"
       relative: true
     source: path
-    version: "1.4.2"
+    version: "1.4.3"
   powersync_flutter_libs:
     dependency: "direct overridden"
     description:
diff --git a/demos/supabase-anonymous-auth/pubspec.yaml b/demos/supabase-anonymous-auth/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  powersync: ^1.4.2
+  powersync: ^1.4.3
   path_provider: ^2.1.1
   supabase_flutter: ^2.0.2
   path: ^1.8.3
diff --git a/demos/supabase-edge-function-auth/pubspec.lock b/demos/supabase-edge-function-auth/pubspec.lock
@@ -326,7 +326,7 @@ packages:
       path: "../../packages/powersync"
       relative: true
     source: path
-    version: "1.4.2"
+    version: "1.4.3"
   powersync_flutter_libs:
     dependency: "direct overridden"
     description:
diff --git a/demos/supabase-edge-function-auth/pubspec.yaml b/demos/supabase-edge-function-auth/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  powersync: ^1.4.2
+  powersync: ^1.4.3
   path_provider: ^2.1.1
   supabase_flutter: ^2.0.2
   path: ^1.8.3
diff --git a/demos/supabase-simple-chat/pubspec.lock b/demos/supabase-simple-chat/pubspec.lock
@@ -358,7 +358,7 @@ packages:
       path: "../../packages/powersync"
       relative: true
     source: path
-    version: "1.4.2"
+    version: "1.4.3"
   powersync_flutter_libs:
     dependency: "direct overridden"
     description:
diff --git a/demos/supabase-simple-chat/pubspec.yaml b/demos/supabase-simple-chat/pubspec.yaml
@@ -37,7 +37,7 @@ dependencies:
 
   supabase_flutter: ^1.10.25
   timeago: ^3.6.0
-  powersync: ^1.4.2
+  powersync: ^1.4.3
   path_provider: ^2.1.1
   path: ^1.8.3
   logging: ^1.2.0
diff --git a/demos/supabase-todolist/pubspec.lock b/demos/supabase-todolist/pubspec.lock
@@ -406,7 +406,7 @@ packages:
       path: "../../packages/powersync"
       relative: true
     source: path
-    version: "1.4.2"
+    version: "1.4.3"
   powersync_attachments_helper:
     dependency: "direct main"
     description:
diff --git a/demos/supabase-todolist/pubspec.yaml b/demos/supabase-todolist/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   powersync_attachments_helper: ^0.4.1
-  powersync: ^1.4.2
+  powersync: ^1.4.3
   path_provider: ^2.1.1
   supabase_flutter: ^2.0.1
   path: ^1.8.3
diff --git a/melos.yaml b/melos.yaml
@@ -31,7 +31,7 @@ scripts:
 
   test:
     description: Run tests in a specific package.
-    run: dart test
+    run: flutter test
     exec:
       concurrency: 1
     packageFilters:
diff --git a/packages/powersync/CHANGELOG.md b/packages/powersync/CHANGELOG.md
@@ -1,14 +1,18 @@
-## 1.4.2
+## 1.4.3
 
 - Added support for user parameters when connecting.
 
+## 1.4.2
+
+- Fix `Bad state: Future already completed` error when calling `disconnectAndClear()`.
+
 ## 1.4.1
 
 - Upgrades dependency `powersync_flutter_libs` to version `0.1.0`.
 
 ## 1.4.0
 
-- Introduces the use of the `powersync-sqlite-core` native extension.
+- Introduces the use of the `powersync-sqlite-core` native extension. This is our common Rust core which means all PowerSync SDKs now use the same core logic for PowerSync functionality, improving maintainability and support.
 - Added a new package dependency on `powersync_flutter_libs` for loading the extension.
 
 ## 1.3.1
diff --git a/packages/powersync/lib/src/abort_controller.dart b/packages/powersync/lib/src/abort_controller.dart
@@ -17,14 +17,18 @@ class AbortController {
   /// Abort, and wait until aborting is complete.
   Future<void> abort() async {
     aborted = true;
-    _abortRequested.complete();
+    if (!_abortRequested.isCompleted) {
+      _abortRequested.complete();
+    }
 
     await _abortCompleter.future;
   }
 
   /// Signal that an abort has completed.
   void completeAbort() {
-    _abortCompleter.complete();
+    if (!_abortCompleter.isCompleted) {
+      _abortCompleter.complete();
+    }
   }
 
   /// Signal that an abort has failed.
diff --git a/packages/powersync/lib/src/open_factory.dart b/packages/powersync/lib/src/open_factory.dart
@@ -79,13 +79,22 @@ class PowerSyncOpenFactory extends DefaultSqliteOpenFactory {
   }
 
   void enableExtension() {
-    var powersyncLib = Platform.isIOS || Platform.isMacOS
-        ? DynamicLibrary.process()
-        : DynamicLibrary.open(getLibraryForPlatform());
+    var powersyncLib = _getDynamicLibraryForPlatform();
     sqlite.sqlite3.ensureExtensionLoaded(
         SqliteExtension.inLibrary(powersyncLib, 'sqlite3_powersync_init'));
   }
 
+  /// Returns the dynamic library for the current platform.
+  DynamicLibrary _getDynamicLibraryForPlatform() {
+    /// When running tests, we need to load the library for all platforms.
+    if (Platform.environment.containsKey('FLUTTER_TEST')) {
+      return DynamicLibrary.open(getLibraryForPlatform());
+    }
+    return (Platform.isIOS || Platform.isMacOS)
+        ? DynamicLibrary.process()
+        : DynamicLibrary.open(getLibraryForPlatform());
+  }
+
   void setupFunctions(sqlite.Database db) {
     db.createFunction(
       functionName: 'powersync_sleep',
diff --git a/packages/powersync/pubspec.yaml b/packages/powersync/pubspec.yaml
@@ -1,5 +1,5 @@
 name: powersync
-version: 1.4.2
+version: 1.4.3
 homepage: https://powersync.com
 repository: https://github.com/powersync-ja/powersync.dart
 description: PowerSync Flutter SDK - keep PostgreSQL databases in sync with on-device SQLite databases.
diff --git a/packages/powersync/test/util.dart b/packages/powersync/test/util.dart
@@ -35,6 +35,9 @@ class TestOpenFactory extends PowerSyncOpenFactory {
     sqlite_open.open.overrideFor(sqlite_open.OperatingSystem.linux, () {
       return DynamicLibrary.open('libsqlite3.so.0');
     });
+    sqlite_open.open.overrideFor(sqlite_open.OperatingSystem.macOS, () {
+      return DynamicLibrary.open('libsqlite3.dylib');
+    });
     return super.open(options);
   }
 
