Skip to content

Backport PR #3334 to 19.x #3356

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
bbakerman merged 1 commit into from
Oct 23, 2023
Merged

Backport PR #3334 to 19.x #3356

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
2 changes: 1 addition & 1 deletion src/main/java/graphql/validation/rules/OverlappingFieldsCanBeMerged.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private void collectFieldsForField(Map<String, Set<FieldAndType>> fieldMap, Grap
GraphQLFieldDefinition fieldDefinition = getVisibleFieldDefinition(fieldsContainer, field);
fieldType = fieldDefinition != null ? fieldDefinition.getType() : null;
}
fieldMap.get(responseName).add(new FieldAndType(field, fieldType, parentType));
fieldMap.get(responseName).add(new FieldAndType(field, fieldType, unwrappedParent));
}

private GraphQLFieldDefinition getVisibleFieldDefinition(GraphQLFieldsContainer fieldsContainer, Field field) {
Expand Down
53 changes: 53 additions & 0 deletions src/test/groovy/graphql/validation/rules/OverlappingFieldsCanBeMergedTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ class OverlappingFieldsCanBeMergedTest extends Specification {
def schema = schema('''
type Dog {
nickname: String
name : String
}
type Query { dog: Dog }
''')
Expand All @@ -351,6 +352,58 @@ class OverlappingFieldsCanBeMergedTest extends Specification {
errorCollector.getErrors()[0].locations == [new SourceLocation(3, 13), new SourceLocation(4, 13)]
}

def 'issue 3332 - Alias masking direct field access non fragment'() {
given:
def query = """
{ dog {
name: nickname
name
}}
"""
def schema = schema('''
type Dog {
name : String
nickname: String
}
type Query { dog: Dog }
''')
when:
traverse(query, schema)

then:
errorCollector.getErrors().size() == 1
errorCollector.getErrors()[0].message == "Validation error (FieldsConflict@[dog]) : 'name' : 'nickname' and 'name' are different fields"
errorCollector.getErrors()[0].locations == [new SourceLocation(3, 13), new SourceLocation(4, 13)]
}

def 'issue 3332 -Alias masking direct field access non fragment with non null parent type'() {
given:
def query = """
query GetCat {
cat {
foo1
foo1: foo2
}
}
"""
def schema = schema('''
type Query {
cat: Cat! # non null parent type
}
type Cat {
foo1: String!
foo2: String!
}
''')
when:
traverse(query, schema)

then:
errorCollector.getErrors().size() == 1
errorCollector.getErrors()[0].message == "Validation error (FieldsConflict@[cat]) : 'foo1' : 'foo1' and 'foo2' are different fields"
errorCollector.getErrors()[0].locations == [new SourceLocation(4, 17), new SourceLocation(5, 17)]
}

def 'conflicting args'() {
given:
def query = """
Expand Down