Skip to content

Commit

Permalink
fix: replace use of dict_merge with basic implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
pgammans committed Jul 26, 2023
1 parent b807bcc commit cab1ee3
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions polymorphic/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -365,13 +365,13 @@ def apply_select_related(self, qs, relations):
select_related = {}
if isinstance(v, dict):
if model_name in v:
select_related = dict_merge(select_related, v[model_name])
select_related = merge_dicts(select_related, v[model_name])
else:
for field in qs.model._meta.fields:
if field.name in v:
select_related = dict_merge(select_related, v[field.name])
select_related = merge_dicts(select_related, v[field.name])
else:
select_related = dict_merge(select_related, v)
select_related = merge_dicts(select_related, v)
qs.query.select_related = select_related
return qs

Expand Down Expand Up @@ -942,13 +942,13 @@ def apply_select_related(self, qs, relation, filtered):
if k == relation:
if isinstance(v, dict):
if model_name in v:
select_related = dict_merge(select_related, v[model_name])
select_related = merge_dicts(select_related, v[model_name])
else:
for field in qs.model._meta.fields:
if field.name in v:
select_related = dict_merge(select_related, v[field.name])
select_related = merge_dicts(select_related, v[field.name])
else:
select_related = dict_merge(select_related, v)
select_related = merge_dicts(select_related, v)
else:
select_related[k] = v

Expand Down

0 comments on commit cab1ee3

Please sign in to comment.