fix: handle overlapping subset queries returning same row with different values#1070
Merged
samwillis merged 4 commits intoTanStack:mainfrom Dec 30, 2025
Conversation
…ent values When multiple subset queries return the same row (e.g., different WHERE clauses that both match the same record), the server sends `insert` operations for each response. If the row's data changed between requests (e.g., timestamp field updated), this caused a DuplicateKeySyncError because TanStack DB's sync layer throws when inserting an existing key with a different value. This fix tracks synced keys in the Electric adapter and converts subsequent `insert` operations to `update` for keys that have already been synced. The tracked keys are cleared on truncate/must-refetch to stay in sync with the collection state. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
🦋 Changeset detectedLatest commit: cc2fc70 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
More templates
@tanstack/angular-db
@tanstack/db
@tanstack/db-ivm
@tanstack/electric-db-collection
@tanstack/offline-transactions
@tanstack/powersync-db-collection
@tanstack/query-db-collection
@tanstack/react-db
@tanstack/rxdb-db-collection
@tanstack/solid-db
@tanstack/svelte-db
@tanstack/trailbase-db-collection
@tanstack/vue-db
commit: |
samwillis
approved these changes
Dec 29, 2025
Collaborator
samwillis
left a comment
samwillis
left a comment
There was a problem hiding this comment.
This is great @ibarakaiev - I've added some tests that validate that the fix workes. Going to merge
samwillis
force-pushed
the
fix/subset-query-duplicate-insert-handling
branch
from
8794f7f to
70209e6
Compare
Merged
Contributor
|
🎉 This PR has been released! Thank you for your contribution! |
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
2 participants
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.
When multiple subset queries return the same row (e.g., different WHERE clauses that both match the same record), the server sends
insertoperations for each response. If there's a race condition and the row's data changed between requests (e.g., timestamp field updated), this caused a DuplicateKeySyncError because TanStack DB's sync layer throws when inserting an existing key with a different value.This fix tracks synced keys in the Electric adapter and converts subsequent
insertoperations toupdatefor keys that have already been synced. The tracked keys are cleared on truncate/must-refetch to stay in sync with the collection state.Note: this might be against the original assumptions of the codebase, so perhaps there's a more reliable way to fix this instead of converting
inserttoupdate. Making this PR as a starting point.🤖 Generated with Claude Code
🚀 Release Impact