Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow merge:true to merge references with non-normalized objects, and vice-versa. #7778

Merged
merged 5 commits into from
Mar 3, 2021
Merged

Allow merge:true to merge references with non-normalized objects, and vice-versa. #7778

merged 5 commits into from
Mar 3, 2021

Commits on Mar 3, 2021

  1. Allow merging existing references with incoming non-normalized objects.

    @benjamn
    benjamn committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    ed17774 View commit details
    Browse the repository at this point in the history

  2. Allow reversing argument types passed to store.merge. 

    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
    benjamn committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    287a43f View commit details
    Browse the repository at this point in the history

  3. Allow merging existing non-normalized objects with incoming references.

    @benjamn
    benjamn committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    bf11965 View commit details
    Browse the repository at this point in the history

  4. Test merging non-normalized objects with references.

    @benjamn
    benjamn committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    08451e8 View commit details
    Browse the repository at this point in the history

  5. Mention PR #7778 in CHANGELOG.md.

    @benjamn
    benjamn committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    2553695 View commit details
    Browse the repository at this point in the history