graphql-python/graphene-django
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene-django.git synced 2025-07-04 12:23:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: revert PR-1380

Browse Source
This commit is contained in:
Laurent Riviere 2023-07-26 10:00:23 +00:00
parent 34cef2bccd
commit 047810fe9a
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphene_django/tests/test_query.py
View File

@ -1073,6 +1073,9 @@ def test_proxy_model_support():
assert result.data == expected assert result.data == expected
@pytest.mark.xfail(
reason="Until https://github.com/graphql-python/graphene-django/pull/1380#issuecomment-1646331317 is fixed."
)
def test_model_inheritance_support_reverse_relationships(): def test_model_inheritance_support_reverse_relationships():
""" """
This test asserts that we can query reverse relationships for all Reporters and proxied Reporters and multi table Reporters. This test asserts that we can query reverse relationships for all Reporters and proxied Reporters and multi table Reporters.

3
graphene_django/tests/test_utils.py
View File

@ -19,6 +19,9 @@ def test_get_model_fields_no_duplication():
assert len(film_fields) == len(film_name_set) assert len(film_fields) == len(film_name_set)
@pytest.mark.xfail(
reason="Until https://github.com/graphql-python/graphene-django/pull/1380#issuecomment-1646331317 is fixed."
)
def test_get_reverse_fields_includes_proxied_models(): def test_get_reverse_fields_includes_proxied_models():
reporter_fields = get_reverse_fields(Reporter, []) reporter_fields = get_reverse_fields(Reporter, [])
cnn_reporter_fields = get_reverse_fields(CNNReporter, []) cnn_reporter_fields = get_reverse_fields(CNNReporter, [])

27
graphene_django/utils/utils.py
View File

@ -47,24 +47,17 @@ def _get_model_ancestry(model):
def get_reverse_fields(model, local_field_names): def get_reverse_fields(model, local_field_names):
""" for name, attr in model.__dict__.items():
Searches through the model's ancestry and gets reverse relationships the models # Don't duplicate any local fields
Yields a tuple of (field.name, field) if name in local_field_names:
""" continue
model_ancestry = _get_model_ancestry(model)
for _model in model_ancestry: # "rel" for FK and M2M relations and "related" for O2O Relations
for name, attr in _model.__dict__.items(): related = getattr(attr, "rel", None) or getattr(attr, "related", None)
# Don't duplicate any local fields if isinstance(related, models.ManyToOneRel):
if name in local_field_names: yield (name, related)
continue elif isinstance(related, models.ManyToManyRel) and not related.symmetrical:
yield (name, related)
# "rel" for FK and M2M relations and "related" for O2O Relations
related = getattr(attr, "rel", None) or getattr(attr, "related", None)
if isinstance(related, models.ManyToOneRel):
yield (name, related)
elif isinstance(related, models.ManyToManyRel) and not related.symmetrical:
yield (name, related)
def get_local_fields(model): def get_local_fields(model):