Skip to content
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

Jump to bottom

Add support for generic unions #3515

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Add support for generic unions #3515

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5cfac3c
Merge unions
enoua5 May 26, 2024
747b2ea
Use extend instead of +=
enoua5 May 26, 2024
674b0bb
Sourcery suggestion
enoua5 May 26, 2024
b2c7fc1
Sourcery suggestion
enoua5 May 26, 2024
0f31c05
Add RELEASE.md
enoua5 May 26, 2024
b83d078
Merge branch 'fix-3393' of https://github.com/enoua5/strawberry-3393 …
enoua5 May 26, 2024
e63fed0
Fix check on older python versions
patrick91 May 26, 2024
318b47b
Add test that was already passing
patrick91 May 26, 2024
42a5827
Add missing test
patrick91 May 26, 2024
ac29523
Add support for generic unions
patrick91 May 26, 2024
576593b
Lint
patrick91 May 26, 2024
280d841
Lint
patrick91 May 26, 2024
99cc745
Add test for annotated union with two generics
enoua5 May 31, 2024
d6c58ed
Rewrite test to support python <= 3.9
enoua5 May 31, 2024
b34106e
Remove unused function bodies from tests
enoua5 May 31, 2024
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: 6 additions & 2 deletions strawberry/schema/schema_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,9 +856,13 @@

if isinstance(graphql_type, GraphQLInputObjectType):
raise InvalidTypeInputForUnion(graphql_type)
assert isinstance(graphql_type, GraphQLObjectType)
assert isinstance(graphql_type, GraphQLObjectType | GraphQLUnionType)

graphql_types.append(graphql_type)
if isinstance(graphql_type, GraphQLUnionType):
enoua5 marked this conversation as resolved.
Show resolved Hide resolved
# merge child types
enoua5 marked this conversation as resolved.
Show resolved Hide resolved
graphql_types += list(graphql_type.types)

Check warning on line 863 in strawberry/schema/schema_converter.py

View check run for this annotation

Codecov / codecov/patch

strawberry/schema/schema_converter.py#L863 

Added line #L863 was not covered by tests
enoua5 marked this conversation as resolved.
Show resolved Hide resolved
else:
graphql_types.append(graphql_type)

graphql_union = GraphQLUnionType(
name=union_name,
Expand Down
Loading