Specify identifying columns on nested mutation upserts by GavG · Pull Request #2426 · nuwave/lighthouse

GavG · 2023-07-28T08:22:49Z

Resolves #2214

Added or updated tests
Documented user facing changes
Updated CHANGELOG.md

Changes

Adds optional identifyingColumns arg to upsert directive

Breaking changes

None

…into upsert_fields_directive

spawnia

Implementation and test make sense so far, after some tweaks I am fine with adding this.

src/Schema/Directives/UpsertDirective.php

CHANGELOG.md

src/Execution/Arguments/UpsertModel.php

tests/Integration/Schema/Directives/UpsertDirectiveTest.php

GavG · 2023-08-26T19:19:03Z

Thanks for the review @spawnia. Sorry I've been a bit quiet on this, recently had our first child so haven't had any free time 🙃

I've been giving the solution a bit more thought, I think supporting nested relationship upsert logic is a must, so I'll try and tackle that when I come to making the suggest changes.

I've also been considering my own use case again, where more complex upsert logic was required, and I think a cleaner solution to this might be to permit the specifying of a custom query class that would receive the input params in place of the package's query logic. I may have a go at this in a new fork later.

…tive # Conflicts: # CHANGELOG.md # src/Execution/Arguments/UpsertModel.php

Copilot

Pull request overview

This PR extends Lighthouse’s @upsert / @upsertMany directives with an optional identifyingColumns argument and tightens nested upsert behavior by scoping lookups to the parent relation (preventing updates to unrelated models during nested mutations).

Changes:

Add identifyingColumns to @upsert and @upsertMany and plumb it into UpsertModel lookup logic.
Scope nested upsert lookups to the parent relation and error when attempting to upsert a model that exists but is not related to the parent.
Add/adjust integration tests, update docs, and update the changelog.

Reviewed changes

Copilot reviewed 19 out of 19 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
src/Schema/Directives/UpsertDirective.php	Adds `identifyingColumns` directive arg; validates it isn’t an empty list; passes it into `UpsertModel`.
src/Schema/Directives/UpsertManyDirective.php	Same as `@upsert`, but for multi-upsert.
src/Execution/Arguments/UpsertModel.php	Implements identifying-columns lookup; scopes nested lookups via `parentRelation`; introduces explicit GraphQL error messages.
src/Execution/Arguments/NestedOneToOne.php	Passes relation into `UpsertModel` to enforce scoped nested lookups.
src/Execution/Arguments/NestedOneToMany.php	Same scoping change for one-to-many nested upserts.
src/Execution/Arguments/NestedManyToMany.php	Same scoping change for many-to-many nested upserts.
src/Execution/Arguments/NestedBelongsTo.php	Same scoping change for belongs-to nested upserts.
tests/Integration/Schema/Directives/UpsertDirectiveTest.php	Adds coverage for `identifyingColumns`, empty-list validation, and unrelated nested upsert protection.
tests/Integration/Schema/Directives/UpsertManyDirectiveTest.php	Adds coverage for `identifyingColumns` for `@upsertMany`, including validation and nested protections.
tests/Integration/Execution/MutationExecutor/*Test.php	Expands coverage across relation types to ensure nested upserts cannot modify unrelated models.
docs/master/eloquent/getting-started.md	Documents `identifyingColumns` usage for `@upsert`.
docs/master/api-reference/directives.md	Documents `identifyingColumns` for both `@upsert` and `@upsertMany`, including lookup precedence.
CHANGELOG.md	Adds entries for identifying columns and scoped nested upsert lookups.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

tests/Integration/Execution/MutationExecutor/MorphOneTest.php

src/Execution/Arguments/UpsertModel.php

src/Schema/Directives/UpsertDirective.php

This reverts commit 0b8eb5a8c767040e3d99b7d7dd3df0490a7d2769.

This reverts commit 6e6aa17.

…overage"" This reverts commit 7e1d342afb107f3d490c6f56c8d142e993e75915.

This reverts commit 879f638805c467214ccb077466e470a1cdb9c58e.

tests/Integration/Schema/Directives/UpsertDirectiveTest.php

tests/Integration/Schema/Directives/UpsertManyDirectiveTest.php

…rt_fields_directive # Conflicts: # tests/Integration/Schema/Directives/UpsertDirectiveTest.php # tests/Integration/Schema/Directives/UpsertManyDirectiveTest.php

Removed the 'Changed' section from the CHANGELOG.

Copilot

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

docs/master/api-reference/directives.md

docs/master/eloquent/getting-started.md

tests/Integration/Schema/Directives/UpsertDirectiveTest.php

tests/Integration/Schema/Directives/UpsertManyDirectiveTest.php

spawnia · 2026-02-11T15:30:18Z

@copilot open a new pull request to apply changes based on the comments in this thread

…rt_fields_directive

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 431f6ef770

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

src/Execution/Arguments/UpsertModel.php

spawnia · 2026-02-14T15:43:25Z

Released with https://github.com/nuwave/lighthouse/releases/tag/v6.65.0, please consider sponsoring.

gavg-vaioni and others added 4 commits July 27, 2023 17:42

WIP: adding identifyingColumns directive to upserts

f7a82a9

Apply php-cs-fixer changes

0e63ba6

update changelog

0472f03

Merge branch 'upsert_fields_directive' of github.com:GavG/lighthouse …

0a753b9

…into upsert_fields_directive

GavG mentioned this pull request Jul 28, 2023

updateOrCreate functionality #2214

Closed

spawnia changed the title ~~Upsert fields directive~~ Specify identifying columns on nested mutation upserts Aug 8, 2023

spawnia requested changes Aug 8, 2023

View reviewed changes

spawnia added the enhancement A feature or improvement label Aug 8, 2023

spawnia and others added 7 commits February 10, 2026 13:05

Merge remote-tracking branch 'origin/master' into upsert_fields_direc…

a842692

…tive # Conflicts: # CHANGELOG.md # src/Execution/Arguments/UpsertModel.php

Normalize GraphQL test literals to nuwave#2748 after merging master

faa6323

Continue work

f0eaca6

Scope nested upserts to parent relations and expand coverage

6e6aa17

Address review feedback on nested upsert identifying columns

4d96407

Address remaining upsert review threads

223315d

Apply php-cs-fixer changes

e9c0e5c

spawnia requested a review from Copilot February 11, 2026 14:00

Copilot started reviewing on behalf of spawnia February 11, 2026 14:01 View session

Copilot AI reviewed Feb 11, 2026

View reviewed changes

tests/Integration/Execution/MutationExecutor/MorphOneTest.php Outdated Show resolved Hide resolved

src/Execution/Arguments/UpsertModel.php Outdated Show resolved Hide resolved

src/Schema/Directives/UpsertDirective.php Outdated Show resolved Hide resolved

spawnia and others added 7 commits February 11, 2026 15:34

review

403b081

Revert "review"

c239147

This reverts commit 0b8eb5a8c767040e3d99b7d7dd3df0490a7d2769.

Revert "Scope nested upserts to parent relations and expand coverage"

37f2fc7

This reverts commit 6e6aa17.

Revert "Revert "Scope nested upserts to parent relations and expand c…

0d741c4

…overage"" This reverts commit 7e1d342afb107f3d490c6f56c8d142e993e75915.

Revert "Revert "review""

61932b4

This reverts commit 879f638805c467214ccb077466e470a1cdb9c58e.

Move nested relation-scope changes out of PR nuwave#2426

e333344

Apply php-cs-fixer changes

9f2d6a8

spawnia reviewed Feb 11, 2026

View reviewed changes

tests/Integration/Schema/Directives/UpsertDirectiveTest.php Outdated Show resolved Hide resolved

tests/Integration/Schema/Directives/UpsertManyDirectiveTest.php Outdated Show resolved Hide resolved

spawnia added 3 commits February 11, 2026 16:01

fix

4178afb

Merge remote-tracking branch 'GavG/upsert_fields_directive' into upse…

0455025

…rt_fields_directive # Conflicts: # tests/Integration/Schema/Directives/UpsertDirectiveTest.php # tests/Integration/Schema/Directives/UpsertManyDirectiveTest.php

fix

f3ff39e

spawnia added 3 commits February 11, 2026 16:09

Validate empty identifyingColumns during schema build

d41c134

Remove unrelated-model upsert guard and tests

d4bd086

Simplify empty identifyingColumns checks in upsert directives

820dae7

spawnia requested a review from Copilot February 11, 2026 15:16

Copilot started reviewing on behalf of spawnia February 11, 2026 15:17 View session

spawnia added 4 commits February 11, 2026 16:17

@var

db59215

Clarify why Eloquent native upsert is not used

61c8318

avoid double save

233998e

Update CHANGELOG to remove 'Changed' section

1cb73aa

Removed the 'Changed' section from the CHANGELOG.

Copilot AI reviewed Feb 11, 2026

View reviewed changes

spawnia and others added 3 commits February 11, 2026 18:22

Merge branch 'master' into upsert_fields_directive

641c313

review

432622d

Apply php-cs-fixer changes

431f6ef

spawnia marked this pull request as ready for review February 11, 2026 17:31

spawnia added 2 commits February 11, 2026 18:31

Merge branch 'master' into upsert_fields_directive

2574d49

Merge remote-tracking branch 'GavG/upsert_fields_directive' into upse…

f54a7c4

…rt_fields_directive

chatgpt-codex-connector bot reviewed Feb 11, 2026

View reviewed changes

src/Execution/Arguments/UpsertModel.php Outdated Show resolved Hide resolved

spawnia and others added 4 commits February 11, 2026 20:41

Fix nuwave#2426 (comment)

238258e

Use safe array_flip in UpsertModel

da3378a

Apply php-cs-fixer changes

d486410

Remove remaining nested relation-scope upsert wiring

4661ada

spawnia merged commit 96dc24a into nuwave:master Feb 14, 2026
62 checks passed

Uh oh!

Conversation

GavG commented Jul 28, 2023 • edited by spawnia Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

spawnia left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

GavG commented Aug 26, 2023

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

spawnia commented Feb 11, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

spawnia commented Feb 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

GavG commented Jul 28, 2023 •

edited by spawnia

Loading