Xcode 26.4 support (#403)

stephencelis · web-flow · commit 65502acdb033 · 2026-02-19T16:35:43.000-08:00
* Xcode 26.4 support

* wip

* bump
diff --git a/Examples/CaseStudies/DynamicQuery.swift b/Examples/CaseStudies/DynamicQuery.swift
@@ -53,7 +53,7 @@ struct DynamicQueryDemo: SwiftUICaseStudy {
     .searchable(text: $query)
     .task(id: query) {
       await withErrorReporting {
-        try await $facts.load(Facts(query: query), animation: .default)
+        try await $facts.load(Facts(query: query), animation: .default).task
       }
     }
     .task {
diff --git a/Examples/Examples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/Examples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Examples/Reminders/Schema.swift b/Examples/Reminders/Schema.swift
@@ -381,7 +381,7 @@ nonisolated func handleReminderStatusUpdate() {
       try await database.write { db in
         try Reminder
           .where { $0.status.eq(#bind(.completing)) }
-          .update { $0.status = .completed }
+          .update { $0.status = #bind(.completed) }
           .execute(db)
       }
     }
diff --git a/Examples/SyncUps/SyncUpForm.swift b/Examples/SyncUps/SyncUpForm.swift
@@ -77,7 +77,7 @@ final class SyncUpFormModel: Identifiable {
     withErrorReporting {
       try database.write { db in
         let syncUpID = try SyncUp.upsert { syncUp }.returning(\.id).fetchOne(db)!
-        try Attendee.where { $0.syncUpID == syncUpID }.delete().execute(db)
+        try Attendee.where { $0.syncUpID.eq(syncUpID) }.delete().execute(db)
         try Attendee.insert {
           for attendee in attendees {
             Attendee.Draft(name: attendee.name, syncUpID: syncUpID)
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -37,7 +37,7 @@ let package = Package(
     .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"),
     .package(
       url: "https://github.com/pointfreeco/swift-structured-queries",
-      from: "0.29.0",
+      from: "0.31.0",
       traits: [
         .trait(name: "StructuredQueriesTagged", condition: .when(traits: ["SQLiteDataTagged"]))
       ]
diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift
@@ -28,7 +28,7 @@ let package = Package(
     .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.9.0"),
     .package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.3.0"),
     .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"),
-    .package(url: "https://github.com/pointfreeco/swift-structured-queries", from: "0.29.0"),
+    .package(url: "https://github.com/pointfreeco/swift-structured-queries", from: "0.31.0"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.5.0"),
   ],
   targets: [
diff --git a/Sources/SQLiteData/CloudKit/CloudKitSharing.swift b/Sources/SQLiteData/CloudKit/CloudKitSharing.swift
@@ -206,7 +206,7 @@
           .where { $0.recordName.eq(recordName) }
           .update {
             $0.setLastKnownServerRecord(savedRootRecord)
-            $0.share = savedShare
+            $0.share = #bind(savedShare)
           }
           .execute(db)
       }
diff --git a/Sources/SQLiteData/CloudKit/Internal/Triggers.swift b/Sources/SQLiteData/CloudKit/Internal/Triggers.swift
@@ -288,8 +288,8 @@
             .update {
               $0.zoneName = new.zoneName
               $0.ownerName = new.ownerName
-              $0.lastKnownServerRecord = nil
-              $0._lastKnownServerRecordAllFields = nil
+              $0.lastKnownServerRecord = #bind(nil)
+              $0._lastKnownServerRecordAllFields = #bind(nil)
             }
         } when: { old, new in
           new.zoneName.neq(old.zoneName) || new.ownerName.neq(old.ownerName)
diff --git a/Sources/SQLiteData/CloudKit/SyncEngine.swift b/Sources/SQLiteData/CloudKit/SyncEngine.swift
@@ -509,7 +509,7 @@
         if context == .preview {
           previewTimerTask.withValue {
             $0?.cancel()
-            $0 = Task { [weak self] in
+            $0 = Task { @Sendable [weak self] in
               await withErrorReporting {
                 while true {
                   guard let self else { break }
@@ -1179,7 +1179,8 @@
               // NB: Fake 'sending' result.
               nonisolated(unsafe) var result: T.QueryOutput?
               try await userDatabase.read { db in
-                result = try T
+                result =
+                  try T
                   .where {
                     #sql("\($0.primaryKey) = \(bind: metadata.recordPrimaryKey)")
                   }
@@ -1850,7 +1851,7 @@
       try await userDatabase.write { db in
         try SyncMetadata
           .find(rootRecordID)
-          .update { $0.share = share }
+          .update { $0.share = #bind(share) }
           .execute(db)
       }
     }
@@ -1880,7 +1881,7 @@
           )
           .update {
             $0.setLastKnownServerRecord(rootRecord)
-            $0.share = nil
+            $0.share = #bind(nil)
           }
           .execute(db)
       }
@@ -2062,7 +2063,8 @@
               if data == nil {
                 reportIssue("Asset data not found on disk")
               }
-              return "\(quote: columnName) = \(data?.queryFragment ?? #""excluded".\#(quote: columnName)"#)"
+              return
+                "\(quote: columnName) = \(data?.queryFragment ?? #""excluded".\#(quote: columnName)"#)"
             } else {
               return """
                 \(quote: columnName) = \
@@ -2330,7 +2332,7 @@
         for table in tables {
           func open<T>(_: some SynchronizableTable<T>) throws {
             let columnsWithUniqueConstraints = try PragmaIndexList<T>
-              .where { $0.isUnique && $0.origin != "pk" }
+              .where { $0.isUnique && $0.origin.neq("pk") }
               .select(\.name)
               .fetchAll(db)
             if !columnsWithUniqueConstraints.isEmpty {
@@ -2442,12 +2444,14 @@
     mutating func setLastKnownServerRecord(_ lastKnownServerRecord: CKRecord?) {
       self.zoneName = lastKnownServerRecord?.recordID.zoneID.zoneName ?? self.zoneName
       self.ownerName = lastKnownServerRecord?.recordID.zoneID.ownerName ?? self.ownerName
-      self.lastKnownServerRecord = lastKnownServerRecord
-      self._lastKnownServerRecordAllFields = lastKnownServerRecord
+      self.lastKnownServerRecord = #bind(lastKnownServerRecord)
+      self._lastKnownServerRecordAllFields = #bind(lastKnownServerRecord)
       if let lastKnownServerRecord {
-        self.userModificationTime = #sql("""
+        self.userModificationTime = #sql(
+          """
           max(\(self.userModificationTime), \(lastKnownServerRecord.userModificationTime))
-          """)
+          """
+        )
       }
     }
   }
diff --git a/Tests/SQLiteDataTests/AssertQueryTests.swift b/Tests/SQLiteDataTests/AssertQueryTests.swift
@@ -29,7 +29,7 @@ struct AssertQueryTests {
   @available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
   @Test func assertQueryRecord() throws {
     assertQuery(
-      Record.where { $0.id == 1 }
+      Record.find(1)
     ) {
       """
       ┌────────────────────────────────────────┐
@@ -46,7 +46,7 @@ struct AssertQueryTests {
   @Test func assertQueryBasicUpdate() throws {
     assertQuery(
       Record.all
-        .update { $0.date = Date(timeIntervalSince1970: 45) }
+        .update { $0.date = #bind(Date(timeIntervalSince1970: 45)) }
         .returning { ($0.id, $0.date) }
     ) {
       """
@@ -63,8 +63,8 @@ struct AssertQueryTests {
   @Test func assertQueryRecordUpdate() throws {
     assertQuery(
       Record
-        .where { $0.id == 1 }
-        .update { $0.date = Date(timeIntervalSince1970: 45) }
+        .where { $0.id.eq(1) }
+        .update { $0.date = #bind(Date(timeIntervalSince1970: 45)) }
         .returning(\.self)
     ) {
       """
@@ -81,7 +81,7 @@ struct AssertQueryTests {
   @available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
   @Test func assertQueryEmpty() throws {
     assertQuery(
-      Record.all.where { $0.id == -1 }.select(\.id)
+      Record.all.where { $0.id.eq(-1) }.select(\.id)
     ) {
       """
       (No results)
@@ -131,7 +131,7 @@ struct AssertQueryTests {
     @Test func assertQueryRecordIncludeSQL() throws {
       assertQuery(
         includeSQL: true,
-        Record.where { $0.id == 1 }
+        Record.where { $0.id.eq(1) }
       ) {
         """
         SELECT "records"."id", "records"."date"
diff --git a/Tests/SQLiteDataTests/CloudKitTests/AssetsTests.swift b/Tests/SQLiteDataTests/CloudKitTests/AssetsTests.swift
@@ -72,7 +72,7 @@
           try await userDatabase.userWrite { db in
             try RemindersListAsset
               .find(1)
-              .update { $0.coverImage = Data("new-image".utf8) }
+              .update { $0.coverImage = #bind(Data("new-image".utf8)) }
               .execute(db)
           }
         }
diff --git a/Tests/SQLiteDataTests/CloudKitTests/MergeConflictTests.swift b/Tests/SQLiteDataTests/CloudKitTests/MergeConflictTests.swift
@@ -666,7 +666,7 @@
             $0.currentTime.now += 1
           } operation: {
             try await userDatabase.userWrite { db in
-              try Reminder.find(1).update { $0.priority = 3 }.execute(db)
+              try Reminder.find(1).update { $0.priority = #bind(3) }.execute(db)
             }
             await modificationsFinished.notify()
             try await syncEngine.processPendingRecordZoneChanges(scope: .private)
diff --git a/Tests/SQLiteDataTests/CloudKitTests/ReferenceViolationTests.swift b/Tests/SQLiteDataTests/CloudKitTests/ReferenceViolationTests.swift
@@ -266,7 +266,7 @@
           $0.currentTime.now += 1
         } operation: {
           try await userDatabase.userWrite { db in
-            try ChildWithOnDeleteSetNull.find(1).update { $0.parentID = 2 }.execute(db)
+            try ChildWithOnDeleteSetNull.find(1).update { $0.parentID = #bind(2) }.execute(db)
           }
         }
         try await withDependencies {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ struct DynamicQueryDemo: SwiftUICaseStudy {`
`53`	`53`	`.searchable(text: $query)`
`54`	`54`	`.task(id: query) {`
`55`	`55`	`await withErrorReporting {`
`56`		`- try await $facts.load(Facts(query: query), animation: .default)`
	`56`	`+ try await $facts.load(Facts(query: query), animation: .default).task`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`.task {`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ nonisolated func handleReminderStatusUpdate() {`
`381`	`381`	`try await database.write { db in`
`382`	`382`	`try Reminder`
`383`	`383`	`.where { $0.status.eq(#bind(.completing)) }`
`384`		`- .update { $0.status = .completed }`
	`384`	`+ .update { $0.status = #bind(.completed) }`
`385`	`385`	`.execute(db)`
`386`	`386`	`}`
`387`	`387`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ let package = Package(`
`37`	`37`	`.package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"),`
`38`	`38`	`.package(`
`39`	`39`	`url: "https://github.com/pointfreeco/swift-structured-queries",`
`40`		`- from: "0.29.0",`
	`40`	`+ from: "0.31.0",`
`41`	`41`	`traits: [`
`42`	`42`	`.trait(name: "StructuredQueriesTagged", condition: .when(traits: ["SQLiteDataTagged"]))`
`43`	`43`	`]`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@`
`206`	`206`	`.where { $0.recordName.eq(recordName) }`
`207`	`207`	`.update {`
`208`	`208`	`$0.setLastKnownServerRecord(savedRootRecord)`
`209`		`- $0.share = savedShare`
	`209`	`+ $0.share = #bind(savedShare)`
`210`	`210`	`}`
`211`	`211`	`.execute(db)`
`212`	`212`	`}`