clean up

Author: mbrandonw

Examples/CloudKitDemo/CountersListFeature.swift

@@ -129,6 +129,7 @@ struct CounterRow: View {
 #Preview {
   let _ = try! prepareDependencies {
     try $0.bootstrapDatabase()
+    try $0.defaultDatabase.seedSampleData()
   }
   NavigationStack {
     CountersListView()

Examples/CloudKitDemo/Schema.swift

@@ -47,3 +47,16 @@ extension DependencyValues {
 }
 
 private let logger = Logger(subsystem: "CloudKitDemo", category: "Database")
+
+#if DEBUG
+  extension DatabaseWriter {
+    func seedSampleData() throws {
+      try write { db in
+        try db.seed {
+          Counter.Draft(count: 24)
+          Counter.Draft(count: 1729)
+        }
+      }
+    }
+  }
+#endif

Examples/SyncUps/App.swift

@@ -77,6 +77,9 @@ struct AppView: View {
 }
 
 #Preview("Happy path") {
-  let _ = try! prepareDependencies { try $0.bootstrapDatabase() }
+  let _ = try! prepareDependencies {
+    try $0.bootstrapDatabase()
+    try $0.defaultDatabase.seedSampleData()
+  }
   AppView(model: AppModel())
 }

Examples/SyncUps/Schema.swift

@@ -152,35 +152,37 @@ extension DependencyValues {
 private let logger = Logger(subsystem: "SyncUps", category: "Database")
 
 #if DEBUG
-  extension Database {
+  extension DatabaseWriter {
     func seedSampleData() throws {
-      try seed {
-        SyncUp(id: UUID(1), seconds: 60, theme: .appOrange, title: "Design")
-        SyncUp(id: UUID(2), seconds: 60 * 10, theme: .periwinkle, title: "Engineering")
-        SyncUp(id: UUID(3), seconds: 60 * 30, theme: .poppy, title: "Product")
+      try write { db in
+        try db.seed {
+          SyncUp(id: UUID(1), seconds: 60, theme: .appOrange, title: "Design")
+          SyncUp(id: UUID(2), seconds: 60 * 10, theme: .periwinkle, title: "Engineering")
+          SyncUp(id: UUID(3), seconds: 60 * 30, theme: .poppy, title: "Product")
 
-        for name in ["Blob", "Blob Jr", "Blob Sr", "Blob Esq", "Blob III", "Blob I"] {
-          Attendee.Draft(name: name, syncUpID: UUID(1))
-        }
-        for name in ["Blob", "Blob Jr"] {
-          Attendee.Draft(name: name, syncUpID: UUID(2))
-        }
-        for name in ["Blob Sr", "Blob Jr"] {
-          Attendee.Draft(name: name, syncUpID: UUID(3))
-        }
+          for name in ["Blob", "Blob Jr", "Blob Sr", "Blob Esq", "Blob III", "Blob I"] {
+            Attendee.Draft(name: name, syncUpID: UUID(1))
+          }
+          for name in ["Blob", "Blob Jr"] {
+            Attendee.Draft(name: name, syncUpID: UUID(2))
+          }
+          for name in ["Blob Sr", "Blob Jr"] {
+            Attendee.Draft(name: name, syncUpID: UUID(3))
+          }
 
-        Meeting.Draft(
-          date: Date().addingTimeInterval(-60 * 60 * 24 * 7),
-          syncUpID: UUID(1),
-          transcript: """
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor \
-            incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud \
-            exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute \
-            irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla \
-            pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia \
-            deserunt mollit anim id est laborum.
-            """
-        )
+          Meeting.Draft(
+            date: Date().addingTimeInterval(-60 * 60 * 24 * 7),
+            syncUpID: UUID(1),
+            transcript: """
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor \
+              incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud \
+              exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute \
+              irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla \
+              pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia \
+              deserunt mollit anim id est laborum.
+              """
+          )
+        }
       }
     }
   }

Examples/SyncUps/SyncUpDetail.swift

@@ -273,8 +273,9 @@ struct MeetingView: View {
 #Preview {
   let syncUp = try! prepareDependencies {
     try $0.bootstrapDatabase()
+    try $0.defaultDatabase.seedSampleData()
     return try $0.defaultDatabase.read { db in
-      try SyncUp.limit(1).fetchOne(db)!
+      try SyncUp.fetchOne(db)!
     }
   }
   NavigationStack {

Examples/SyncUps/SyncUpsList.swift

@@ -34,9 +34,7 @@ final class SyncUpsListModel {
   #if DEBUG
     func seedDatabase() {
       withErrorReporting {
-        try database.write { db in
-          try db.seedSampleData()
-        }
+        try database.seedSampleData()
       }
     }
   #endif
@@ -156,6 +154,7 @@ private struct SeedDatabaseTip: Tip {
 #Preview {
   let _ = try! prepareDependencies {
     try $0.bootstrapDatabase()
+    try $0.defaultDatabase.seedSampleData()
   }
   NavigationStack {
     SyncUpsList(model: SyncUpsListModel())

Sources/SQLiteData/CloudKit/SyncEngine.swift

@@ -1789,8 +1789,9 @@
               switch error.code {
               case .referenceViolation:
                 enqueuedUnsyncedRecordID = true
-                try UnsyncedRecordID.insert(or: .ignore) {
+                try UnsyncedRecordID.insert {
                   UnsyncedRecordID(recordID: failedRecordID)
+                } onConflictDoUpdate: { _ in
                 }
                 .execute(db)
                 syncEngine.state.remove(pendingRecordZoneChanges: [.deleteRecord(failedRecordID)])
@@ -1955,8 +1956,9 @@
             else {
               throw error
             }
-            try UnsyncedRecordID.insert(or: .ignore) {
+            try UnsyncedRecordID.insert {
               UnsyncedRecordID(recordID: serverRecord.recordID)
+            } onConflictDoUpdate: { _ in
             }
             .execute(db)
           }