Merge remote-tracking branch 'origin/main' into schema-change-test-failure

Author: mbrandonw

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     name: macOS
     strategy:
       matrix:
-        xcode: ['26.1']
+        xcode: ['26.2']
         config: ['debug', 'release']
     runs-on: macos-26
     steps:
@@ -28,7 +28,7 @@ jobs:
     name: Examples
     strategy:
       matrix:
-        xcode: ['26.1']
+        xcode: ['26.2']
         config: ['debug']
         scheme: ['Reminders', 'CaseStudies', 'SyncUps']
     runs-on: macos-26

Examples/CloudKitDemo/CloudKitDemoApp.swift

@@ -5,17 +5,22 @@ import SwiftUI
 @main
 struct CloudKitDemoApp: App {
   @UIApplicationDelegateAdaptor private var appDelegate: AppDelegate
+  @Dependency(\.context) var context
 
   init() {
-    try! prepareDependencies {
-      try $0.bootstrapDatabase()
+    if context == .live {
+      try! prepareDependencies {
+        try $0.bootstrapDatabase()
+      }
     }
   }
 
   var body: some Scene {
     WindowGroup {
-      NavigationStack {
-        CountersListView()
+      if context == .live {
+        NavigationStack {
+          CountersListView()
+        }
       }
     }
   }

Examples/CloudKitDemo/CountersListFeature.swift

@@ -1,18 +1,29 @@
 import CloudKit
 import SQLiteData
 import SwiftUI
-import SwiftUINavigation
 
 struct CountersListView: View {
-  @FetchAll var counters: [Counter]
+  @FetchAll(
+    Counter
+      .leftJoin(SyncMetadata.all) { $0.syncMetadataID.eq($1.id) }
+      .select {
+        Row.Columns(counter: $0, isShared: $1.isShared.ifnull(false))
+      }
+  ) var rows
   @Dependency(\.defaultDatabase) var database
+  @Dependency(\.defaultSyncEngine) var syncEngine
+
+  @Selection struct Row {
+    let counter: Counter
+    let isShared: Bool
+  }
 
   var body: some View {
     List {
-      if !counters.isEmpty {
+      if !rows.isEmpty {
         Section {
-          ForEach(counters) { counter in
-            CounterRow(counter: counter)
+          ForEach(rows, id: \.counter.id) { row in
+            CounterRow(row: row)
               .buttonStyle(.borderless)
           }
           .onDelete { indexSet in
@@ -25,10 +36,14 @@ struct CountersListView: View {
     .toolbar {
       ToolbarItem(placement: .primaryAction) {
         Button("Add") {
-          withErrorReporting {
-            try database.write { db in
-              try Counter.insert { Counter.Draft() }
+          Task {
+            withErrorReporting {
+              try database.write { db in
+                try Counter.insert {
+                  Counter.Draft()
+                }
                 .execute(db)
+              }
             }
           }
         }
@@ -40,7 +55,7 @@ struct CountersListView: View {
     withErrorReporting {
       try database.write { db in
         for index in indexSet {
-          try Counter.find(counters[index].id).delete()
+          try Counter.find(rows[index].counter.id).delete()
             .execute(db)
         }
       }
@@ -49,15 +64,18 @@ struct CountersListView: View {
 }
 
 struct CounterRow: View {
-  let counter: Counter
+  let row: CountersListView.Row
   @State var sharedRecord: SharedRecord?
   @Dependency(\.defaultDatabase) var database
   @Dependency(\.defaultSyncEngine) var syncEngine
 
   var body: some View {
     VStack {
       HStack {
-        Text("\(counter.count)")
+        if row.isShared {
+          Image(systemName: "network")
+        }
+        Text("\(row.counter.count)")
         Button("-") {
           decrementButtonTapped()
         }
@@ -79,7 +97,7 @@ struct CounterRow: View {
 
   func shareButtonTapped() {
     Task {
-      sharedRecord = try await syncEngine.share(record: counter) { share in
+      sharedRecord = try await syncEngine.share(record: row.counter) { share in
         share[CKShare.SystemFieldKey.title] = "Join my counter!"
       }
     }
@@ -88,7 +106,7 @@ struct CounterRow: View {
   func decrementButtonTapped() {
     withErrorReporting {
       try database.write { db in
-        try Counter.find(counter.id).update {
+        try Counter.find(row.counter.id).update {
           $0.count -= 1
         }
         .execute(db)
@@ -99,11 +117,21 @@ struct CounterRow: View {
   func incrementButtonTapped() {
     withErrorReporting {
       try database.write { db in
-        try Counter.find(counter.id).update {
+        try Counter.find(row.counter.id).update {
           $0.count += 1
         }
         .execute(db)
       }
     }
   }
 }
+
+#Preview {
+  let _ = try! prepareDependencies {
+    try $0.bootstrapDatabase()
+    try? $0.defaultDatabase.seedSampleData()
+  }
+  NavigationStack {
+    CountersListView()
+  }
+}

Examples/CloudKitDemo/Schema.swift

@@ -10,8 +10,11 @@ nonisolated struct Counter: Identifiable {
 
 extension DependencyValues {
   mutating func bootstrapDatabase() throws {
-    @Dependency(\.context) var context
-    let database = try SQLiteData.defaultDatabase()
+    var configuration = Configuration()
+    configuration.prepareDatabase { db in
+      try db.attachMetadatabase()
+    }
+    let database = try SQLiteData.defaultDatabase(configuration: configuration)
     logger.debug(
       """
       App database
@@ -44,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/Examples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -84,7 +84,7 @@ class RemindersDetailModel: HashableObject {
 
   private func updateQuery() async {
     await withErrorReporting {
-      try await $reminderRows.load(remindersQuery, animation: .default)
+      _ = try await $reminderRows.load(remindersQuery, animation: .default)
     }
   }
 

Examples/Reminders/RemindersDetail.swift

@@ -144,9 +144,7 @@ class RemindersListsModel {
   #if DEBUG
     func seedDatabaseButtonTapped() {
       withErrorReporting {
-        try database.write { db in
-          try db.seedSampleData()
-        }
+        try database.seedSampleData()
       }
     }
   #endif
@@ -437,7 +435,8 @@ private struct ReminderGridCell: View {
 
 #Preview {
   let _ = try! prepareDependencies {
-    $0.defaultDatabase = try Reminders.appDatabase()
+    try $0.bootstrapDatabase()
+    try? $0.defaultDatabase.seedSampleData()
   }
   NavigationStack {
     RemindersListsView(model: RemindersListsModel())