Merge branch 'main' into feat/crud-transactions-warning

Author: mugikhan

demos/django-todolist/ios/Podfile.lock

@@ -3,25 +3,28 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - powersync-sqlite-core (0.1.6)
+  - powersync-sqlite-core (0.2.1)
   - powersync_flutter_libs (0.0.1):
     - Flutter
-    - powersync-sqlite-core (~> 0.1.6)
+    - powersync-sqlite-core (~> 0.2.1)
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - "sqlite3 (3.46.0+1)":
-    - "sqlite3/common (= 3.46.0+1)"
-  - "sqlite3/common (3.46.0+1)"
-  - "sqlite3/fts5 (3.46.0+1)":
+  - "sqlite3 (3.46.1+1)":
+    - "sqlite3/common (= 3.46.1+1)"
+  - "sqlite3/common (3.46.1+1)"
+  - "sqlite3/dbstatvtab (3.46.1+1)":
     - sqlite3/common
-  - "sqlite3/perf-threadsafe (3.46.0+1)":
+  - "sqlite3/fts5 (3.46.1+1)":
     - sqlite3/common
-  - "sqlite3/rtree (3.46.0+1)":
+  - "sqlite3/perf-threadsafe (3.46.1+1)":
+    - sqlite3/common
+  - "sqlite3/rtree (3.46.1+1)":
     - sqlite3/common
   - sqlite3_flutter_libs (0.0.1):
     - Flutter
-    - sqlite3 (~> 3.46.0)
+    - "sqlite3 (~> 3.46.0+1)"
+    - sqlite3/dbstatvtab
     - sqlite3/fts5
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
@@ -52,12 +55,12 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
-  powersync-sqlite-core: 4c38c8f470f6dca61346789fd5436a6826d1e3dd
-  powersync_flutter_libs: 5d6b132a398de442c0853a8b14bfbb62cd4ff5a1
-  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
-  sqlite3: 292c3e1bfe89f64e51ea7fc7dab9182a017c8630
-  sqlite3_flutter_libs: 0d611efdf6d1c9297d5ab03dab21b75aeebdae31
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  powersync-sqlite-core: 38ead13d8b21920cfbc79e9b3415b833574a506d
+  powersync_flutter_libs: 9d26987384a376a18879b9d4fa71629407683163
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
+  sqlite3_flutter_libs: c00457ebd31e59fa6bb830380ddba24d44fbcd3b
 
 PODFILE CHECKSUM: f7b3cb7384a2d5da4b22b090e1f632de7f377987
 

demos/django-todolist/lib/powersync.dart

@@ -32,8 +32,7 @@ class DjangoConnector extends PowerSyncBackendConnector {
   /// Get a token to authenticate against the PowerSync instance.
   @override
   Future<PowerSyncCredentials?> fetchCredentials() async {
-    final prefs = await SharedPreferences.getInstance();
-    final userId = prefs.getString('id');
+    final userId = await getUserId();
     if (userId == null) {
       throw Exception('User does not have session');
     }
@@ -88,21 +87,23 @@ late final PowerSyncDatabase db;
 // Hacky flag to ensure the database is only initialized once, better to do this with listeners
 bool _dbInitialized = false;
 
+/// id of the user currently logged in
+Future<String?> getUserId() async {
+  final prefs = await SharedPreferences.getInstance();
+  return prefs.getString('id');
+}
+
 Future<bool> isLoggedIn() async {
-  final prefs =
-      await SharedPreferences.getInstance(); // Initialize SharedPreferences
-  final userId = prefs.getString('id');
-  if (userId != null) {
-    return true;
-  }
-  return false;
+  final userId = await getUserId();
+  return userId != null;
 }
 
 Future<String> getDatabasePath() async {
   final dir = await getApplicationSupportDirectory();
   return join(dir.path, 'powersync-demo.db');
 }
 
+// opens the database and connects if logged in
 Future<void> openDatabase() async {
   // Open the local database
   if (!_dbInitialized) {
@@ -130,9 +131,3 @@ Future<void> openDatabase() async {
 Future<void> logout() async {
   await db.disconnectAndClear();
 }
-
-/// id of the user currently logged in
-Future<String?> getUserId() async {
-  final prefs = await SharedPreferences.getInstance();
-  return prefs.getString('id');
-}

demos/supabase-todolist-optional-sync/lib/models/schema.dart

@@ -79,12 +79,15 @@ switchToSyncedSchema(PowerSyncDatabase db, String userId) async {
   await db.writeTransaction((tx) async {
     // Copy local-only data to the sync-enabled views.
     // This records each operation in the upload queue.
+    // Overwrites the local-only owner_id value with the logged-in user's id.
     await tx.execute(
         'INSERT INTO $listsTable(id, name, created_at, owner_id) SELECT id, name, created_at, ? FROM inactive_local_$listsTable',
         [userId]);
 
+    // Overwrites the local-only created_by value with the logged-in user's id.
     await tx.execute(
-        'INSERT INTO $todosTable SELECT * FROM inactive_local_$todosTable');
+        'INSERT INTO $todosTable(id, list_id, created_at, completed_at, description, completed, created_by) SELECT id, list_id, created_at, completed_at, description, completed, ? FROM inactive_local_$todosTable',
+        [userId]);
 
     // Delete the local-only data.
     await tx.execute('DELETE FROM inactive_local_$todosTable');

packages/powersync/lib/src/open_factory/native/native_open_factory.dart

@@ -13,13 +13,14 @@ class PowerSyncOpenFactory extends AbstractPowerSyncOpenFactory {
   @Deprecated('Override PowerSyncOpenFactory instead.')
   final SqliteConnectionSetup? _sqliteSetup;
 
-  PowerSyncOpenFactory(
-      {required super.path,
-      super.sqliteOptions,
-      @Deprecated('Override PowerSyncOpenFactory instead.')
-      SqliteConnectionSetup? sqliteSetup})
-      // ignore: deprecated_member_use_from_same_package
-      : _sqliteSetup = sqliteSetup;
+  PowerSyncOpenFactory({
+    required super.path,
+    super.sqliteOptions,
+    @Deprecated('Override PowerSyncOpenFactory instead.')
+    SqliteConnectionSetup? sqliteSetup,
+  })
+  // ignore: deprecated_member_use_from_same_package
+  : _sqliteSetup = sqliteSetup;
 
   @override
   void enableExtension() {
@@ -66,7 +67,12 @@ class PowerSyncOpenFactory extends AbstractPowerSyncOpenFactory {
     // ignore: deprecated_member_use_from_same_package
     _sqliteSetup?.setup();
 
-    enableExtension();
+    try {
+      enableExtension();
+    } on PowersyncNotReadyException catch (e) {
+      autoLogger.severe(e.message);
+      rethrow;
+    }
 
     var db = super.open(options);
     db.execute('PRAGMA recursive_triggers = TRUE');