Allow merge:true to merge references with non-normalized objects, and vice-versa. #7778
Conversation
This file contains 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
Until now, we have only supported store.merge(id, object), which updates the existing entity identified by id, letting new fields from the provided object take precedence when fields overlap. This commit makes it possible to call store.merge(object, id), which also updates the object identified by id using fields from the provided object, but preserves fields already in the store when there is overlap.
benjamn
force-pushed
the
7642-allow-merging-into-existing-refs
branch
from
268c594 to
2553695
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Previously, you could allow
InMemoryCacheto merge non-normalized data using themerge: trueconfiguration (see #6714 and #7070), but the merged objects had to be consistently non-normalized, since attempting to merge a normalizedReferencewith a non-normalized object would give preference to the reference, ignoring the object.This PR fixes #7642 in both directions:
Referencenow updates the normalized data behind the reference, leaving the field holding theReference, andReferencewith an existing non-normalized object updates the normalized data behind the reference (as above), but, for any fields that overlap, the normalized field data takes precedence over the non-normalized field data.In both directions, the new behavior matches what would happen if the normalized
Referencewas a non-normalized object instead.