Repository navigation
Conversation
The sync queries now fetch raw storage values alongside the typed row and capture BLOB bytes by column name. Record uploads and merge comparisons prefer those bytes, preserving JSONB asset storage and hash comparisons. Added regression coverage for round trips, optional JSONB removal, and merges involving remote and local edits. Fixes pointfreeco#561
4 of 5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Background
CloudKit sync can fail to save records containing JSONB values because SQLite receives text for a BLOB column. In strict tables, this produces a storage-type error and prevents the record from being applied.
The sync code used query bindings reconstructed from typed row values, which represent JSONB values as JSON text rather than their stored bytes. Conflict detection used the same bindings, so it also missed the BLOB hash comparison used for assets.
Summary of the fix
The sync queries now fetch raw storage values alongside the typed row and capture BLOB bytes by column name. Record uploads and merge comparisons prefer those bytes, preserving JSONB asset storage and hash comparisons. Added regression coverage for round trips, optional JSONB removal, and merges involving remote and local edits.
Verification
swift test --filter SQLiteDataTeststimed out during compilation, so it provides no test result. The xcresult failure-message check produced no output in the supplied transcript; this does not establish that tests passed. The tests inTests/SQLiteDataTests/CloudKitTests/JSONBTests.swiftfail without the fix in the sqlite-data change (checked by reverting the source changes).Fixes #561