Skip to content

Commit 3f125a7

Browse files
committed
Fix missing schema's ast_node when schema was defined inside extension
Replicates graphql/graphql-js@e2dec84
1 parent 530672a commit 3f125a7

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

graphql/utilities/extend_schema.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ def resolve_type(type_name: str) -> GraphQLNamedType:
373373
),
374374
types=list(type_map.values()),
375375
directives=get_merged_directives(),
376-
ast_node=schema.ast_node,
376+
ast_node=schema_def or schema.ast_node,
377377
extension_ast_nodes=(
378378
schema.extension_ast_nodes or cast(Tuple[SchemaExtensionNode], ())
379379
)

tests/utilities/test_extend_schema.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,16 +1082,17 @@ def adds_schema_definition_missing_in_the_original_schema():
10821082
schema = GraphQLSchema(directives=[FooDirective], types=[FooType])
10831083
assert schema.query_type is None
10841084

1085-
ast = parse(
1085+
extension_sdl = dedent(
10861086
"""
10871087
schema @foo {
10881088
query: Foo
10891089
}
10901090
"""
10911091
)
1092-
schema = extend_schema(schema, ast)
1092+
schema = extend_schema(schema, parse(extension_sdl))
10931093
query_type = schema.query_type
10941094
assert query_type.name == "Foo"
1095+
assert print_ast(schema.ast_node) == extension_sdl.rstrip()
10951096

10961097
def adds_new_root_types_via_schema_extension():
10971098
schema = extend_test_schema(

0 commit comments

Comments
 (0)