Skip to content

[Fusion] Fix data loss when selections have differing conditions #10234

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

Merged
michaelstaib merged 1 commit into from
Aug 13, 2026
Merged

[Fusion] Fix data loss when selections have differing conditions #10234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
325 changes: 204 additions & 121 deletions src/HotChocolate/Fusion/src/Fusion.Execution/Planning/OperationPlanner.BuildExecutionTree.cs
View file
Open in desktop

Large diffs are not rendered by default.

389 changes: 389 additions & 0 deletions src/HotChocolate/Fusion/test/Fusion.AspNetCore.Tests/ConditionalTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

139 changes: 139 additions & 0 deletions ...s/__snapshots__/ConditionalTests.Lookup_Fields_With_Differing_Conditions_Are_Fetched.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
title: Lookup_Fields_With_Differing_Conditions_Are_Fetched
request:
document: |
query testQuery($f: Boolean!) {
thing {
delta @skip(if: $f)
epsilon @include(if: $f)
}
}
variables: |
{
"f": false
}
response:
body: |
{
"data": {
"thing": {
"delta": 123
}
}
}
sourceSchemas:
- name: A
schema: |
schema {
query: Query
}

type Query {
thing: Thing
}

type Thing @key(fields: "id") {
id: Int!
}
interactions:
- request:
accept: application/graphql-response+json; charset=utf-8, application/json; charset=utf-8, application/jsonl; charset=utf-8, text/event-stream; charset=utf-8
document: |
query testQuery_ae99f7ef_1 {
thing {
id
}
}
response:
results:
- |
{
"data": {
"thing": {
"id": 123
}
}
}
- name: B
schema: |
schema {
query: Query
}

type Query {
thingById(id: Int!): Thing @lookup
}

type Thing {
id: Int!
delta: Int!
epsilon: Int!
}
interactions:
- request:
accept: application/graphql-response+json; charset=utf-8, application/json; charset=utf-8, application/jsonl; charset=utf-8, text/event-stream; charset=utf-8
document: |
query testQuery_ae99f7ef_2($f: Boolean!, $__fusion_1_id: Int!) {
thingById(id: $__fusion_1_id) {
delta @skip(if: $f)
epsilon @include(if: $f)
}
}
variables: |
{
"f": false,
"__fusion_1_id": 123
}
response:
results:
- |
{
"data": {
"thingById": {
"delta": 123
}
}
}
operationPlan:
operation:
- document: |
query testQuery($f: Boolean!) {
thing {
id @fusion__requirement
delta @skip(if: $f)
epsilon @include(if: $f)
}
}
name: testQuery
hash: ae99f7ef761c5b175b58e506800b87a9
searchSpace: 1
expandedNodes: 2
nodes:
- id: 1
type: Operation
schema: A
operation: |
query testQuery_ae99f7ef_1 {
thing {
id
}
}
- id: 2
type: Operation
schema: B
operation: |
query testQuery_ae99f7ef_2($f: Boolean!, $__fusion_1_id: Int!) {
thingById(id: $__fusion_1_id) {
delta @skip(if: $f)
epsilon @include(if: $f)
}
}
source: $.thingById
target: $.thing
requirements:
- name: __fusion_1_id
selectionMap: >-
id
forwardedVariables:
- f
dependencies:
- id: 1
155 changes: 155 additions & 0 deletions ...ests/__snapshots__/ConditionalTests.Lookup_With_Path_And_Common_Condition_Is_Hoisted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
title: Lookup_With_Path_And_Common_Condition_Is_Hoisted
request:
document: |
query testQuery($s: Boolean!, $x: Boolean!) {
thing {
delta @skip(if: $s) @include(if: $x)
epsilon @skip(if: $s)
}
}
variables: |
{
"s": false,
"x": true
}
response:
body: |
{
"data": {
"thing": {
"delta": 123,
"epsilon": 123
}
}
}
sourceSchemas:
- name: A
schema: |
schema {
query: Query
}

type Query {
thing: Thing
}

type Thing @key(fields: "id") {
id: Int!
}
interactions:
- request:
accept: application/graphql-response+json; charset=utf-8, application/json; charset=utf-8, application/jsonl; charset=utf-8, text/event-stream; charset=utf-8
document: |
query testQuery_212bedf2_1 {
thing {
id
}
}
response:
results:
- |
{
"data": {
"thing": {
"id": 123
}
}
}
- name: B
schema: |
schema {
query: Query
}

type Query {
lookups: Lookups!
}

type Lookups {
thingById(id: Int!): Thing @lookup
}

type Thing {
id: Int!
delta: Int!
epsilon: Int!
}
interactions:
- request:
accept: application/graphql-response+json; charset=utf-8, application/json; charset=utf-8, application/jsonl; charset=utf-8, text/event-stream; charset=utf-8
document: |
query testQuery_212bedf2_2($x: Boolean!, $__fusion_1_id: Int!) {
lookups {
thingById(id: $__fusion_1_id) {
delta @include(if: $x)
epsilon
}
}
}
variables: |
{
"x": true,
"__fusion_1_id": 123
}
response:
results:
- |
{
"data": {
"lookups": {
"thingById": {
"delta": 123,
"epsilon": 123
}
}
}
}
operationPlan:
operation:
- document: |
query testQuery($s: Boolean!, $x: Boolean!) {
thing {
id @fusion__requirement
delta @skip(if: $s) @include(if: $x)
epsilon @skip(if: $s)
}
}
name: testQuery
hash: 212bedf21941cc055230edb80daca132
searchSpace: 1
expandedNodes: 2
nodes:
- id: 1
type: Operation
schema: A
operation: |
query testQuery_212bedf2_1 {
thing {
id
}
}
- id: 2
type: Operation
schema: B
operation: |
query testQuery_212bedf2_2($x: Boolean!, $__fusion_1_id: Int!) {
lookups {
thingById(id: $__fusion_1_id) {
delta @include(if: $x)
epsilon
}
}
}
source: $.lookups.thingById
target: $.thing
requirements:
- name: __fusion_1_id
selectionMap: >-
id
conditions:
- variable: $s
passingValue: false
forwardedVariables:
- x
dependencies:
- id: 1
Loading
Loading