StructuredQueries 0.22.0 support (#238)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

Author: stephencelis

Examples/CaseStudies/Animations.swift

@@ -4,8 +4,8 @@ import SwiftUI
 struct AnimationsCaseStudy: SwiftUICaseStudy {
   let readMe = """
     This demonstrates how to animate fetching data from the database, or when data changes in \
-    the database. Simply provide the `animation` argument to `fetchAll` (or the other querying \
-    tools, such as `fetch` and `fetchOne`). 
+    the database. Simply provide the `animation` argument to `@FetchAll` (or the other querying \
+    tools, such as `@Fetch` and `@FetchOne`).
 
     This is analogous to how animations work in SwiftData in which one provides an `animation` \
     argument to the `@Query` macro.
@@ -35,8 +35,10 @@ struct AnimationsCaseStudy: SwiftUICaseStudy {
             as: UTF8.self
           )
           try await database.write { db in
-            try Fact.insert(Fact.Draft(body: fact))
-              .execute(db)
+            try Fact.insert {
+              Fact.Draft(body: fact)
+            }
+            .execute(db)
           }
         }
       } catch {}

Examples/CaseStudies/DynamicQuery.swift

@@ -68,8 +68,10 @@ struct DynamicQueryDemo: SwiftUICaseStudy {
             as: UTF8.self
           )
           try await database.write { db in
-            try Fact.insert(Fact.Draft(body: fact))
-              .execute(db)
+            try Fact.insert {
+              Fact.Draft(body: fact)
+            }
+            .execute(db)
           }
         }
       } catch {}

Examples/CaseStudies/ObservableModelDemo.swift

@@ -65,8 +65,10 @@ private class Model {
         as: UTF8.self
       )
       try await database.write { db in
-        try Fact.insert(Fact.Draft(body: fact))
-          .execute(db)
+        try Fact.insert {
+          Fact.Draft(body: fact)
+        }
+        .execute(db)
       }
     }
   }

Examples/CaseStudies/SwiftUIDemo.swift

@@ -44,8 +44,10 @@ struct SwiftUIDemo: SwiftUICaseStudy {
             as: UTF8.self
           )
           try await database.write { db in
-            try Fact.insert(Fact.Draft(body: fact))
-              .execute(db)
+            try Fact.insert {
+              Fact.Draft(body: fact)
+            }
+            .execute(db)
           }
         }
       } catch {}

Examples/CaseStudies/TransactionDemo.swift

@@ -46,8 +46,10 @@ struct TransactionDemo: SwiftUICaseStudy {
             as: UTF8.self
           )
           try await database.write { db in
-            try Fact.insert(Fact.Draft(body: fact))
-              .execute(db)
+            try Fact.insert {
+              Fact.Draft(body: fact)
+            }
+            .execute(db)
           }
         }
       } catch {}

Examples/CaseStudies/UIKitDemo.swift

@@ -7,7 +7,7 @@ import UIKitNavigation
 final class UIKitCaseStudyViewController: UICollectionViewController, UIKitCaseStudy {
   let caseStudyTitle = "UIKit"
   let readMe = """
-    This case study demonstrates how to use the 'fetchAll' tool in a UIKit app. The view \
+    This case study demonstrates how to use the `@FetchAll` tool in a UIKit app. The view \
     controller observes changes to the database and updates a collection view when data is added \
     or removed.
     """
@@ -96,8 +96,10 @@ final class UIKitCaseStudyViewController: UICollectionViewController, UIKitCaseS
         if let fact {
           await withErrorReporting {
             try await database.write { db in
-              try Fact.insert(Fact.Draft(body: fact))
-                .execute(db)
+              try Fact.insert {
+                Fact.Draft(body: fact)
+              }
+              .execute(db)
             }
           }
         }

Examples/Examples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -56,8 +56,8 @@ struct Reminder: Hashable, Identifiable {
 extension Updates<Reminder> {
   mutating func toggleStatus() {
     self.status = Case(self.status)
-      .when(Reminder.Status.incomplete, then: Reminder.Status.completing)
-      .else(Reminder.Status.incomplete)
+      .when(#bind(.incomplete), then: #bind(.completing))
+      .else(#bind(.incomplete))
   }
 }
 
@@ -101,13 +101,13 @@ extension Tag {
 }
 
 @Table("remindersTags")
-struct ReminderTag: Hashable, Identifiable {
+struct ReminderTag: Identifiable {
   let id: UUID
-  var reminderID: Reminder.ID
-  var tagID: Tag.ID
+  let reminderID: Reminder.ID
+  let tagID: Tag.ID
 }
 
-@Table @Selection
+@Table
 struct ReminderText: FTS5 {
   let rowid: Int
   let title: String
@@ -335,7 +335,7 @@ func appDatabase() throws -> any DatabaseWriter {
       } forEachRow: { _, _ in
         Values($handleReminderStatusUpdate())
       } when: { _, new in
-        new.status.eq(Reminder.Status.completing)
+        new.status.eq(#bind(.completing))
       }
     )
     .execute(db)
@@ -359,7 +359,7 @@ func handleReminderStatusUpdate() {
       try await clock.sleep(for: .seconds(5))
       try await database.write { db in
         try Reminder
-          .where { $0.status.eq(Reminder.Status.completing) }
+          .where { $0.status.eq(#bind(.completing)) }
           .update { $0.status = .completed }
           .execute(db)
       }

Examples/Reminders/Schema.swift

@@ -124,9 +124,9 @@ final class RecordMeetingModel: HashableObject {
     try? await clock.sleep(for: .seconds(0.4))
     await withErrorReporting {
       try await database.write { [now, syncUp, transcript] db in
-        try Meeting.insert(
+        try Meeting.insert {
           Meeting.Draft(date: now, syncUpID: syncUp.id, transcript: transcript)
-        )
+        }
         .execute(db)
       }
     }

Examples/SyncUps/RecordMeeting.swift

@@ -42,9 +42,11 @@ final class SyncUpsListModel {
   #endif
 
   @Selection
-  struct Row {
+  struct Row: Identifiable {
     let attendeeCount: Int
     let syncUp: SyncUp
+
+    var id: SyncUp.ID { syncUp.id }
   }
 }
 
@@ -54,7 +56,7 @@ struct SyncUpsList: View {
 
   var body: some View {
     List {
-      ForEach(model.syncUps, id: \.syncUp.id) { state in
+      ForEach(model.syncUps) { state in
         NavigationLink(value: AppModel.Path.detail(SyncUpDetailModel(syncUp: state.syncUp))) {
           CardView(syncUp: state.syncUp, attendeeCount: state.attendeeCount)
         }