wip

Author: mbrandonw

Examples/CloudKitDemo/CountersListFeature.swift

@@ -1,13 +1,11 @@
 import CloudKit
 import SQLiteData
-import SwiftData
 import SwiftUI
 import SwiftUINavigation
 
 struct CountersListView: View {
   @FetchAll var counters: [Counter]
   @Dependency(\.defaultDatabase) var database
-  @Dependency(\.defaultSyncEngine) var syncEngine
 
   var body: some View {
     List {
@@ -35,55 +33,8 @@ struct CountersListView: View {
           }
         }
       }
-      ToolbarItem {
-        Button("Trigger") {
-          Task { await trigger() }
-        }
-      }
-    }
-  }
-
-func trigger() async {
-  await withErrorReporting {
-    // Step 1: Create a new counter
-    let newCounter = try await database.write { db in
-      try Counter.insert { Counter.Draft() }
-        .returning(\.self)
-        .fetchOne(db)!
-    }
-
-    // Step 2: Force sending all data to iCloud
-    try await syncEngine.sendChanges()
-
-    // Step 3: Grab the CKRecord for the newly inserted counter
-    let newCounterLastKnownServerRecord = try await database.read { db in
-      try SyncMetadata.find(newCounter.syncMetadataID).select(\.lastKnownServerRecord)
-        .fetchOne(db)!!
-    }
-
-    // Step 4: Make a change to the counter directly on iCloud
-    let container = CKContainer(identifier: ModelConfiguration(groupContainer: .automatic).cloudKitContainerIdentifier!)
-    let serverCounter = try await container.privateCloudDatabase.record(for: newCounterLastKnownServerRecord.recordID)
-    serverCounter.encryptedValues["count"] = Int.random(in: 1...1_000)
-    let (saveResults, _) = try await container.privateCloudDatabase.modifyRecords(saving: [serverCounter], deleting: [])
-
-    // Step 5: Make two changes to the local database: 1) decrement any counter besides the one
-    //         created above (should succeed), and 2) increment the counter just created (should
-    //         fail due to conflict)
-    try await database.write { db in
-      try Counter
-        .where { $0.id.neq(newCounter.id) }
-        .update { $0.count -= 1 }
-        .execute(db)
-      try Counter
-        .find(newCounter.id)
-        .update { $0.count += 1 }
-        .execute(db)
     }
-
-    try await syncEngine.sendChanges()
   }
-}
 
   func deleteRows(at indexSet: IndexSet) {
     withErrorReporting {

Examples/CloudKitDemo/Schema.swift

@@ -11,11 +11,7 @@ nonisolated struct Counter: Identifiable {
 extension DependencyValues {
   mutating func bootstrapDatabase() throws {
     @Dependency(\.context) var context
-    var configuration = Configuration()
-    configuration.prepareDatabase {
-      try $0.attachMetadatabase()
-    }
-    let database = try SQLiteData.defaultDatabase(configuration: configuration)
+    let database = try SQLiteData.defaultDatabase()
     logger.debug(
       """
       App database

Sources/SQLiteData/CloudKit/SyncEngine.swift

@@ -915,8 +915,7 @@
         parentForeignKey: parentForeignKey,
         defaultZone: defaultZone,
         privateTables: privateTables
-      )
-      {
+      ) {
         try trigger.execute(db)
       }
     }
@@ -932,7 +931,7 @@
         defaultZone: defaultZone,
         privateTables: privateTables
       )
-        .reversed() {
+      .reversed() {
         try trigger.drop().execute(db)
       }
     }
@@ -1722,20 +1721,43 @@
         }
       }
 
+      for (failedRecordID, error) in failedRecordDeletes {
+      }
+
+      //
+      //
+
       let enqueuedUnsyncedRecordID =
         await withErrorReporting(.sqliteDataCloudKitFailure) {
           try await userDatabase.write { db in
             var enqueuedUnsyncedRecordID = false
             for (failedRecordID, error) in failedRecordDeletes {
-              guard
-                error.code == .referenceViolation
-              else { continue }
-              try UnsyncedRecordID.insert(or: .ignore) {
-                UnsyncedRecordID(recordID: failedRecordID)
+              switch error.code {
+              case .referenceViolation:
+                enqueuedUnsyncedRecordID = true
+                try UnsyncedRecordID.insert(or: .ignore) {
+                  UnsyncedRecordID(recordID: failedRecordID)
+                }
+                .execute(db)
+                syncEngine.state.remove(pendingRecordZoneChanges: [.deleteRecord(failedRecordID)])
+                break
+              case .batchRequestFailed:
+                syncEngine.state.add(pendingRecordZoneChanges: [.deleteRecord(failedRecordID)])
+                break
+              case .networkFailure, .networkUnavailable, .zoneBusy, .serviceUnavailable,
+                  .notAuthenticated, .operationCancelled, .internalError, .partialFailure,
+                  .badContainer, .requestRateLimited, .missingEntitlement, .invalidArguments,
+                  .resultsTruncated, .assetFileNotFound, .assetFileModified, .incompatibleVersion,
+                  .constraintViolation, .changeTokenExpired, .badDatabase, .quotaExceeded,
+                  .limitExceeded, .userDeletedZone, .tooManyParticipants, .alreadyShared,
+                  .managedAccountRestricted, .participantMayNeedVerification, .serverResponseLost,
+                  .assetNotAvailable, .accountTemporarilyUnavailable, .permissionFailure,
+                  .unknownItem, .serverRecordChanged, .serverRejectedRequest, .zoneNotFound,
+                  .participantAlreadyInvited:
+                break
+              @unknown default:
+                break
               }
-              .execute(db)
-              syncEngine.state.remove(pendingRecordZoneChanges: [.deleteRecord(failedRecordID)])
-              enqueuedUnsyncedRecordID = true
             }
             return enqueuedUnsyncedRecordID
           }

Tests/SQLiteDataTests/CloudKitTests/AtomicTests.swift

@@ -11,9 +11,10 @@
 
   extension BaseCloudKitTests {
     @MainActor
+    @Suite(.atomicByZone(true))
     final class AtomicTests: BaseCloudKitTests, @unchecked Sendable {
       @available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
-      @Test(.atomicByZone(true)) func basics() async throws {
+      @Test func editConflictAndNewRecord() async throws {
         try await userDatabase.userWrite { db in
           try db.seed {
             RemindersList(id: 1, title: "Personal")
@@ -96,6 +97,39 @@
           """
         }
       }
+
+      @available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
+      @Test func deleteConflictAndNewRecord() async throws {
+        try await userDatabase.userWrite { db in
+          try db.seed {
+            RemindersList(id: 1, title: "Personal")
+          }
+        }
+        try await syncEngine.processPendingRecordZoneChanges(scope: .private)
+
+        let remindersListRecord = try syncEngine.private.database.record(
+          for: RemindersList.recordID(for: 1)
+        )
+        remindersListRecord.setValue("My stuff", forKey: "title", at: 1)
+        let (saveResults, _) = try syncEngine.private.database.modifyRecords(saving: [remindersListRecord])
+        #expect(saveResults.values.allSatisfy { $0.error == nil })
+
+        try await withDependencies {
+          $0.currentTime.now = 2
+        } operation: {
+          try await userDatabase.userWrite { db in
+            try RemindersList.find(1).delete().execute(db)
+            try RemindersList.insert { RemindersList(id: 2, title: "Business") }.execute(db)
+          }
+        }
+        try await syncEngine.processPendingRecordZoneChanges(scope: .private)
+
+        assertInlineSnapshot(of: container, as: .customDump)
+
+        try await syncEngine.processPendingRecordZoneChanges(scope: .private)
+
+        assertInlineSnapshot(of: container, as: .customDump)
+      }
     }
   }
 #endif