fix(datastore): prevent version cross-contamination between different model types #14570
+77
−0
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.
Fixes issue where DataStore.save() operations on different model types with the same ID would incorrectly share _version values, causing subsequent mutations to fail with version conflicts.
Resolves #13412
Description
The syncOutboxVersionsOnDequeue method was querying mutations by modelId only, without filtering by model type. This caused version synchronization to occur across different model types that happened to share the same primary key value.
This is a minimal fix with 1 line of actual code change that solves a critical production issue affecting multi-model applications.
Problem
When saving different model types consecutively that have the same ID:
Root Cause
The predicate in syncOutboxVersionsOnDequeue only filtered by modelId without considering model type, causing version contamination between different models.
Solution
Added model type filter to the predicate to ensure version synchronization only occurs within the same model type:
Testing
Added test case "Should NOT sync the _version across different model types with the same ID" to verify the fix prevents version cross-contamination while preserving legitimate version synchronization within the same model type.
Changes
Fixes #13412