wip

Author: mbrandonw

Sources/SharingGRDBCore/CloudKit/SyncEngine.swift

@@ -133,7 +133,7 @@
       )
     }
 
-    @TaskLocal package static var _isUpdatingRecord = false
+    @TaskLocal package static var _isSynchronizingChanges = false
 
     package func setUpSyncEngine() async throws {
       try await setUpSyncEngine(userDatabase: userDatabase, metadatabase: metadatabase)?.value
@@ -249,7 +249,7 @@
       }
 
       try userDatabase.write { db in
-        try Self.$_isUpdatingRecord.withValue(false) {
+        try Self.$_isSynchronizingChanges.withValue(false) {
           for tableName in newTableNames {
             guard let table = tablesByName[tableName]
             else { continue }
@@ -1001,7 +1001,7 @@
           else { continue }
           func open<T: PrimaryKeyedTable>(_: T.Type) throws {
             try userDatabase.write { db in
-              try Self.$_isUpdatingRecord.withValue(false) {
+              try Self.$_isSynchronizingChanges.withValue(false) {
                 switch foreignKey.onDelete {
                 case .cascade:
                   try T
@@ -1382,7 +1382,7 @@
     fileprivate static var syncEngineIsUpdatingRecord: Self {
       Self(.sqliteDataCloudKitSchemaName + "_" + "syncEngineIsUpdatingRecord", argumentCount: 0) {
         _ in
-        SyncEngine._isUpdatingRecord
+        SyncEngine._isSynchronizingChanges
       }
     }
 

Sources/SharingGRDBCore/Internal/UserDatabase.swift

@@ -17,7 +17,7 @@ package struct UserDatabase {
   ) async throws -> T {
     try await withEscapedDependencies { dependencies in
       try await database.write { db in
-        try SyncEngine.$_isUpdatingRecord.withValue(true) {
+        try SyncEngine.$_isSynchronizingChanges.withValue(true) {
           try dependencies.yield {
             try updates(db)
           }
@@ -31,7 +31,7 @@ package struct UserDatabase {
   ) async throws -> T {
     try await withEscapedDependencies { dependencies in
       try await database.read { db in
-        try SyncEngine.$_isUpdatingRecord.withValue(true) {
+        try SyncEngine.$_isSynchronizingChanges.withValue(true) {
           try dependencies.yield {
             try updates(db)
           }
@@ -46,7 +46,7 @@ package struct UserDatabase {
   ) throws -> T {
     try withEscapedDependencies { dependencies in
       try database.write { db in
-        try SyncEngine.$_isUpdatingRecord.withValue(true) {
+        try SyncEngine.$_isSynchronizingChanges.withValue(true) {
           try dependencies.yield {
             try updates(db)
           }
@@ -61,7 +61,7 @@ package struct UserDatabase {
   ) throws -> T {
     try withEscapedDependencies { dependencies in
       try database.read { db in
-        try SyncEngine.$_isUpdatingRecord.withValue(true) {
+        try SyncEngine.$_isSynchronizingChanges.withValue(true) {
           try dependencies.yield {
             try updates(db)
           }

Tests/SharingGRDBTests/Internal/UserDatabaseHelpers.swift

@@ -6,7 +6,7 @@ extension UserDatabase {
     _ updates: @escaping @Sendable (Database) throws -> T
   ) async throws -> T {
     try await write { db in
-      try SyncEngine.$_isUpdatingRecord.withValue(false) {
+      try SyncEngine.$_isSynchronizingChanges.withValue(false) {
         try updates(db)
       }
     }
@@ -16,7 +16,7 @@ extension UserDatabase {
     _ updates: @escaping @Sendable (Database) throws -> T
   ) async throws -> T {
     try await read { db in
-      try SyncEngine.$_isUpdatingRecord.withValue(false) {
+      try SyncEngine.$_isSynchronizingChanges.withValue(false) {
         try updates(db)
       }
     }
@@ -27,7 +27,7 @@ extension UserDatabase {
     _ updates: (Database) throws -> T
   ) throws -> T {
     try write { db in
-      try SyncEngine.$_isUpdatingRecord.withValue(false) {
+      try SyncEngine.$_isSynchronizingChanges.withValue(false) {
         try updates(db)
       }
     }
@@ -38,7 +38,7 @@ extension UserDatabase {
     _ updates: (Database) throws -> T
   ) throws -> T {
     try write { db in
-      try SyncEngine.$_isUpdatingRecord.withValue(false) {
+      try SyncEngine.$_isSynchronizingChanges.withValue(false) {
         try updates(db)
       }
     }