Skip to content

Commit 205567c

Browse files
authored
fix sub-variables are not correctly recovered from sub-fields (#325)
* fix sub-variables are not correctly recovered from sub-fields * Fixing tests * fixing formatting --------- Co-authored-by: Florian Nouviale <your_donotreply_email_id>
1 parent a13d74d commit 205567c

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

ariadne_codegen/client_generators/dependencies/base_operation.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,10 @@ def get_formatted_variables(self) -> Dict[str, Dict[str, Any]]:
145145

146146
# Collect variables from subfields
147147
for subfield in self._subfields:
148-
subfield.get_formatted_variables()
149-
formatted_variables.update(subfield.formatted_variables)
148+
formatted_variables.update(subfield.get_formatted_variables())
150149

151150
# Collect variables from inline fragments
152151
for subfields in self._inline_fragments.values():
153152
for subfield in subfields:
154-
subfield.get_formatted_variables()
155-
formatted_variables.update(subfield.formatted_variables)
153+
formatted_variables.update(subfield.get_formatted_variables())
156154
return formatted_variables

tests/main/clients/custom_query_builder/expected_client/base_operation.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,10 @@ def get_formatted_variables(self) -> Dict[str, Dict[str, Any]]:
145145

146146
# Collect variables from subfields
147147
for subfield in self._subfields:
148-
subfield.get_formatted_variables()
149-
formatted_variables.update(subfield.formatted_variables)
148+
formatted_variables.update(subfield.get_formatted_variables())
150149

151150
# Collect variables from inline fragments
152151
for subfields in self._inline_fragments.values():
153152
for subfield in subfields:
154-
subfield.get_formatted_variables()
155-
formatted_variables.update(subfield.formatted_variables)
153+
formatted_variables.update(subfield.get_formatted_variables())
156154
return formatted_variables

tests/main/clients/custom_sync_query_builder/expected_client/base_operation.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,10 @@ def get_formatted_variables(self) -> Dict[str, Dict[str, Any]]:
145145

146146
# Collect variables from subfields
147147
for subfield in self._subfields:
148-
subfield.get_formatted_variables()
149-
formatted_variables.update(subfield.formatted_variables)
148+
formatted_variables.update(subfield.get_formatted_variables())
150149

151150
# Collect variables from inline fragments
152151
for subfields in self._inline_fragments.values():
153152
for subfield in subfields:
154-
subfield.get_formatted_variables()
155-
formatted_variables.update(subfield.formatted_variables)
153+
formatted_variables.update(subfield.get_formatted_variables())
156154
return formatted_variables

tests/test_schema.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,9 @@ def test_read_graphql_file_with_invalid_file_raises_invalid_graphql_syntax_excep
183183
):
184184
with pytest.raises(InvalidGraphqlSyntax) as exc:
185185
read_graphql_file(invalid_syntax_schema_file)
186-
assert str(invalid_syntax_schema_file) in str(exc)
186+
# Use the actual exception value's message to avoid backslash escaping
187+
# that can appear in the ExceptionInfo string on Windows.
188+
assert str(invalid_syntax_schema_file) in str(exc.value)
187189

188190

189191
def test_walk_graphql_files_returns_graphql_files_from_directory(schemas_directory):

0 commit comments

Comments
 (0)