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

feat(upsert): add conflictFields option #13723

Merged
merged 7 commits into from
Dec 11, 2021
Merged

feat(upsert): add conflictFields option #13723

merged 7 commits into from
Dec 11, 2021

Commits on Nov 29, 2021

  1. feat(upsert): add conflictFields option 

    Adds support for the `conflictFields` option to `Model.upsert`.
This is used for `options.upsertKeys` in `QueryInterface.prototype.upsert` if provided for specifying the fields
used at `ON CONFLICT({fields})` rather than relying on the default logic.
    @wbourne0
    wbourne0 committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    cda4a46 View commit details
    Browse the repository at this point in the history

  2. add conflictFields to the right type

    @wbourne0
    wbourne0 committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    104538c View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2021

  1. Merge branch 'main' into add-upsert-conflictFields

    @wbourne0
    wbourne0 committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    bceb8e2 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2021

  1. Merge branch 'main' into add-upsert-conflictFields

    @sdepold
    sdepold committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    b3f2232 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into add-upsert-conflictFields

    @sdepold
    sdepold committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    eaa2356 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2021

  1. Merge branch 'main' into add-upsert-conflictFields

    @sdepold
    sdepold committed Dec 11, 2021
    Configuration menu
    Copy the full SHA
    46d7fee View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into add-upsert-conflictFields

    @sdepold
    sdepold committed Dec 11, 2021
    Configuration menu
    Copy the full SHA
    b475c52 View commit details
    Browse the repository at this point in the history