Data backing

.gitignore

@@ -8,3 +8,4 @@ DerivedData/
 *.orig
 *.sqlite
 *.xcresult
+Package.resolved

Package.swift

@@ -105,6 +105,10 @@ let package = Package(
         .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
         .product(name: "SnapshotTestingCustomDump", package: "swift-snapshot-testing"),
         .product(name: "StructuredQueries", package: "swift-structured-queries"),
+      ],
+      resources: [
+        .copy("Resources/test-black.svg"),
+        .copy("Resources/test-red.svg")
       ]
     ),
     .target(

Package@swift-6.0.swift

@@ -64,6 +64,10 @@ let package = Package(
         .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
         .product(name: "SnapshotTestingCustomDump", package: "swift-snapshot-testing"),
         .product(name: "StructuredQueries", package: "swift-structured-queries"),
+      ],
+      resources: [
+        .copy("Resources/test-black.svg"),
+        .copy("Resources/test-red.svg")
       ]
     ),
   ],

Sources/SQLiteData/CloudKit/CloudKit+StructuredQueries.swift

@@ -144,6 +144,10 @@
       get { self["\(key)_hash"] as? Data }
       set { self["\(key)_hash"] = newValue }
     }
+    package subscript(data key: String) -> Data? {
+      get { self["\(key)_data"] as? Data }
+      set { self["\(key)_data"] = newValue }
+    }
   }
 
   @available(macOS 13, iOS 16, tvOS 16, watchOS 9, *)
@@ -184,6 +188,9 @@
         encryptedValues[hash: key] != hash
       else { return false }
 
+      if encryptedValues[data: key] != nil {
+        encryptedValues[data: key] = nil
+      }
       self[key] = newValue
       encryptedValues[hash: key] = hash
       encryptedValues[at: key] = userModificationTime
@@ -200,6 +207,22 @@
       guard encryptedValues[at: key] <= userModificationTime
       else { return false }
 
+      if newValue.isSmall {
+        let newData = Data(newValue)
+        guard
+          encryptedValues[at: key] <= userModificationTime,
+          encryptedValues[data: key] != newData
+        else { return false }
+        if self[key] != nil {
+          self[key] = nil
+          encryptedValues[hash: key] = nil
+        }
+        encryptedValues[data: key] = newData
+        encryptedValues[at: key] = userModificationTime
+        self.userModificationTime = userModificationTime
+        return true
+      }
+
       @Dependency(\.dataManager) var dataManager
       let hash = newValue.sha256
       let fileURL = dataManager.temporaryDirectory.appending(
@@ -231,6 +254,12 @@
       }
       if encryptedValues[key] != nil {
         encryptedValues[key] = nil
+        encryptedValues[hash: key] = nil
+        encryptedValues[at: key] = userModificationTime
+        self.userModificationTime = userModificationTime
+        return true
+      } else if encryptedValues[data: key] != nil {
+        encryptedValues[data: key] = nil
         encryptedValues[at: key] = userModificationTime
         self.userModificationTime = userModificationTime
         return true
@@ -301,7 +330,9 @@
             didSet = setAsset(value, forKey: key, at: other.encryptedValues[at: key])
           } else if let value = other.encryptedValues[key] as? any EquatableCKRecordValueProtocol {
             didSet = setValue(value, forKey: key, at: other.encryptedValues[at: key])
-          } else if other.encryptedValues[key] == nil {
+          } else if let data = other.encryptedValues[data: key] {
+            didSet = setValue(Array(data), forKey: key, at: other.encryptedValues[at: key])
+          } else if other.encryptedValues[key] == nil, other.encryptedValues[data: key] == nil {
             didSet = removeValue(forKey: key, at: other.encryptedValues[at: key])
           } else {
             didSet = false
@@ -310,7 +341,16 @@
           var isRowValueModified: Bool {
             switch Value(queryOutput: row[keyPath: keyPath]).queryBinding {
             case .blob(let value):
-              return other.encryptedValues[hash: key] != value.sha256
+              if value.isSmall,
+                let serverData =
+                  other.encryptedValues[key] as? Data ?? other.encryptedValues[data: key]
+              {
+                return serverData != Data(value)
+              } else if let otherHash = other.encryptedValues[hash: key] {
+                return otherHash != value.sha256
+              } else {
+                return true
+              }
             case .bool(let value):
               return other.encryptedValues[key] != value
             case .double(let value):
@@ -366,6 +406,8 @@
         return value.queryFragment
       } else if let value = self as? Date {
         return value.queryFragment
+      } else if let value = self as? [UInt8] {
+        return value.queryFragment
       } else {
         return "\(.invalid(Unbindable()))"
       }
@@ -385,5 +427,10 @@
     fileprivate var sha256: Data {
       Data(SHA256.hash(data: self))
     }
+
+    fileprivate var isSmall: Bool {
+      count <= 16_384
+    }
   }
+
 #endif

Sources/SQLiteData/CloudKit/SyncEngine.swift

@@ -2058,7 +2058,9 @@
               }
               return data?.queryFragment ?? "NULL"
             } else {
-              return record.encryptedValues[columnName]?.queryFragment ?? "NULL"
+              return record.encryptedValues[columnName]?.queryFragment
+                ?? record.encryptedValues[data: columnName]?.queryFragment
+                ?? "NULL"
             }
           }
           .joined(separator: ", ")
@@ -2073,12 +2075,15 @@
               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 if let queryFragment = record.encryptedValues[columnName]?.queryFragment
+              ?? record.encryptedValues[data: columnName]?.queryFragment
+            {
+              return "\(quote: columnName) = \(queryFragment)"
             } else {
               return """
                 \(quote: columnName) = \
-                \(record.encryptedValues[columnName]?.queryFragment ?? #""excluded".\#(quote: columnName)"#)
+                \(#""excluded".\#(quote: columnName)"#)
                 """
             }
           }
@@ -2487,7 +2492,9 @@
             return (try? asset.fileURL.map { try dataManager.load($0) })?
               .queryFragment ?? "NULL"
           } else {
-            return record.encryptedValues[columnName]?.queryFragment ?? "NULL"
+            return record.encryptedValues[columnName]?.queryFragment
+              ?? record.encryptedValues[data: columnName]?.queryFragment
+              ?? "NULL"
           }
         }
         .joined(separator: ", ")