Skip to content

fix case when a fragment is deferred and non deferred at the same time for overlapping fields #3953

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
andimarek merged 2 commits into from
May 13, 2025
Merged

fix case when a fragment is deferred and non deferred at the same time for overlapping fields #3953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79f3aa5
fix case when a fragment is deferred and non deferred at the same time
andimarek May 9, 2025
804e423
cleaner assertion
andimarek May 13, 2025
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
8 changes: 4 additions & 4 deletions src/main/java/graphql/execution/incremental/DeferredExecutionSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ public DeferredExecutionSupportImpl(
ImmutableList.Builder<String> nonDeferredFieldNamesBuilder = ImmutableList.builder();

mergedSelectionSet.getSubFields().values().forEach(mergedField -> {
if (mergedField.getFields().size() > mergedField.getDeferredExecutions().size()) {
nonDeferredFieldNamesBuilder.add(mergedField.getSingleField().getResultKey());
return;
}
mergedField.getDeferredExecutions().forEach(de -> {
deferredExecutionToFieldsBuilder.put(de, mergedField);
deferredFieldsBuilder.add(mergedField);
});

if (mergedField.getDeferredExecutions().isEmpty()) {
nonDeferredFieldNamesBuilder.add(mergedField.getSingleField().getResultKey());
}
});

this.deferredExecutionToFields = deferredExecutionToFieldsBuilder.build();
Expand Down
32 changes: 32 additions & 0 deletions src/test/groovy/graphql/execution/incremental/DeferExecutionSupportIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1604,6 +1604,38 @@ class DeferExecutionSupportIntegrationTest extends Specification {
incrementalResults.any { it.incremental[0].path == ["posts", 2] }
}


def "two fragments one with defer and one without"() {
given:
def query = '''
query {
post {
text
...f1 @defer
...f2
}
}

fragment f1 on Post {
summary
}
fragment f2 on Post {
summary
}
'''
when:
def result = executeQuery(query)

then:
result.toSpecification() == [
data: [post: [summary: "A summary", text: "The full text"]]
]
!(result instanceof IncrementalExecutionResult)


}


private ExecutionResult executeQuery(String query) {
return this.executeQuery(query, true, [:])
}
Expand Down
Loading