more clean up

Author: mbrandonw

Examples/Reminders/ReminderForm.swift

@@ -177,7 +177,7 @@ struct ReminderFormView: View {
           .execute(db)
         try ReminderTag.insert(
           selectedTags.map { tag in
-            ReminderTag(reminderID: reminderID, tagID: tag.id)
+            ReminderTag.Draft(reminderID: reminderID, tagID: tag.id)
           }
         )
         .execute(db)

Examples/Reminders/Schema.swift

@@ -84,9 +84,9 @@ extension Tag.TableColumns {
 
 @Table("remindersTags")
 struct ReminderTag: Hashable, Identifiable {
+  let id: UUID
   var reminderID: Reminder.ID
   var tagID: Tag.ID
-  var id: Self { self }
 }
 
 func appDatabase() throws -> any DatabaseWriter {
@@ -171,6 +171,7 @@ func appDatabase() throws -> any DatabaseWriter {
     try #sql(
       """
       CREATE TABLE "remindersTags" (
+        "id" TEXT UNIQUE NOT NULL ON CONFLICT REPLACE DEFAULT (uuid()),
         "reminderID" TEXT NOT NULL,
         "tagID" TEXT NOT NULL,
 
@@ -348,18 +349,18 @@ private let logger = Logger(subsystem: "Reminders", category: "Database")
         Tag(id: tagIDs[4], title: "social")
         Tag(id: tagIDs[5], title: "night")
         Tag(id: tagIDs[6], title: "adulting")
-        ReminderTag(reminderID: reminderIDs[0], tagID: tagIDs[2])
-        ReminderTag(reminderID: reminderIDs[0], tagID: tagIDs[3])
-        ReminderTag(reminderID: reminderIDs[0], tagID: tagIDs[6])
-        ReminderTag(reminderID: reminderIDs[1], tagID: tagIDs[2])
-        ReminderTag(reminderID: reminderIDs[1], tagID: tagIDs[3])
-        ReminderTag(reminderID: reminderIDs[2], tagID: tagIDs[6])
-        ReminderTag(reminderID: reminderIDs[3], tagID: tagIDs[0])
-        ReminderTag(reminderID: reminderIDs[3], tagID: tagIDs[1])
-        ReminderTag(reminderID: reminderIDs[4], tagID: tagIDs[4])
-        ReminderTag(reminderID: reminderIDs[3], tagID: tagIDs[4])
-        ReminderTag(reminderID: reminderIDs[10], tagID: tagIDs[4])
-        ReminderTag(reminderID: reminderIDs[4], tagID: tagIDs[5])
+        ReminderTag.Draft(reminderID: reminderIDs[0], tagID: tagIDs[2])
+        ReminderTag.Draft(reminderID: reminderIDs[0], tagID: tagIDs[3])
+        ReminderTag.Draft(reminderID: reminderIDs[0], tagID: tagIDs[6])
+        ReminderTag.Draft(reminderID: reminderIDs[1], tagID: tagIDs[2])
+        ReminderTag.Draft(reminderID: reminderIDs[1], tagID: tagIDs[3])
+        ReminderTag.Draft(reminderID: reminderIDs[2], tagID: tagIDs[6])
+        ReminderTag.Draft(reminderID: reminderIDs[3], tagID: tagIDs[0])
+        ReminderTag.Draft(reminderID: reminderIDs[3], tagID: tagIDs[1])
+        ReminderTag.Draft(reminderID: reminderIDs[4], tagID: tagIDs[4])
+        ReminderTag.Draft(reminderID: reminderIDs[3], tagID: tagIDs[4])
+        ReminderTag.Draft(reminderID: reminderIDs[10], tagID: tagIDs[4])
+        ReminderTag.Draft(reminderID: reminderIDs[4], tagID: tagIDs[5])
       }
     }
   }

Examples/RemindersTests/Internal.swift

@@ -139,18 +139,18 @@ extension Database {
       Tag(id: UUID(4), title: "social")
       Tag(id: UUID(5), title: "night")
       Tag(id: UUID(6), title: "adulting")
-      ReminderTag(reminderID: UUID(0), tagID: UUID(2))
-      ReminderTag(reminderID: UUID(0), tagID: UUID(3))
-      ReminderTag(reminderID: UUID(0), tagID: UUID(6))
-      ReminderTag(reminderID: UUID(1), tagID: UUID(2))
-      ReminderTag(reminderID: UUID(1), tagID: UUID(3))
-      ReminderTag(reminderID: UUID(2), tagID: UUID(6))
-      ReminderTag(reminderID: UUID(3), tagID: UUID(0))
-      ReminderTag(reminderID: UUID(3), tagID: UUID(1))
-      ReminderTag(reminderID: UUID(4), tagID: UUID(4))
-      ReminderTag(reminderID: UUID(3), tagID: UUID(4))
-      ReminderTag(reminderID: UUID(10), tagID: UUID(4))
-      ReminderTag(reminderID: UUID(4), tagID: UUID(5))
+      ReminderTag.Draft(reminderID: UUID(0), tagID: UUID(2))
+      ReminderTag.Draft(reminderID: UUID(0), tagID: UUID(3))
+      ReminderTag.Draft(reminderID: UUID(0), tagID: UUID(6))
+      ReminderTag.Draft(reminderID: UUID(1), tagID: UUID(2))
+      ReminderTag.Draft(reminderID: UUID(1), tagID: UUID(3))
+      ReminderTag.Draft(reminderID: UUID(2), tagID: UUID(6))
+      ReminderTag.Draft(reminderID: UUID(3), tagID: UUID(0))
+      ReminderTag.Draft(reminderID: UUID(3), tagID: UUID(1))
+      ReminderTag.Draft(reminderID: UUID(4), tagID: UUID(4))
+      ReminderTag.Draft(reminderID: UUID(3), tagID: UUID(4))
+      ReminderTag.Draft(reminderID: UUID(10), tagID: UUID(4))
+      ReminderTag.Draft(reminderID: UUID(4), tagID: UUID(5))
     }
   }
 }

Examples/SyncUps/Schema.swift

@@ -91,12 +91,15 @@ func appDatabase() throws -> any DatabaseWriter {
       }
     #endif
   }
-  if context == .live {
-    let path = URL.documentsDirectory.appending(component: "db.sqlite").path()
+  if context == .preview {
+    database = try DatabaseQueue(configuration: configuration)
+  } else {
+    let path =
+    context == .live
+    ? URL.documentsDirectory.appending(component: "db.sqlite").path()
+    : URL.temporaryDirectory.appending(component: "\(UUID().uuidString)-db.sqlite").path()
     logger.info("open \(path)")
     database = try DatabasePool(path: path, configuration: configuration)
-  } else {
-    database = try DatabaseQueue(configuration: configuration)
   }
   var migrator = DatabaseMigrator()
   #if DEBUG