Prodream/ormar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix translating to dict lists with same name of relation but different target models

Browse Source
This commit is contained in:
collerek
2021-04-01 17:40:38 +02:00
parent 749975d665
commit 9fcd7b8eef
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/releases.md
View File

@ -24,6 +24,7 @@
* Fix improper relation field resolution in `QuerysetProxy` if fk column has different database alias. * Fix improper relation field resolution in `QuerysetProxy` if fk column has different database alias.
* Fix hitting recursion error with very complicated models structure with loops when calling `dict()`. * Fix hitting recursion error with very complicated models structure with loops when calling `dict()`.
* Fix bug when two non-relation fields were merged (appended) in query result when they were not relation fields (i.e. JSON) * Fix bug when two non-relation fields were merged (appended) in query result when they were not relation fields (i.e. JSON)
* Fix bug when during translation to dict from list the same relation name is used in chain but leads to different models
## Other ## Other

9
ormar/queryset/utils.py
View File

@ -18,7 +18,7 @@ if TYPE_CHECKING: # pragma no cover
def check_node_not_dict_or_not_last_node( def check_node_not_dict_or_not_last_node(
part: str, parts: List, current_level: Any part: str, is_last: bool, current_level: Any
) -> bool: ) -> bool:
""" """
Checks if given name is not present in the current level of the structure. Checks if given name is not present in the current level of the structure.
@ -36,7 +36,7 @@ def check_node_not_dict_or_not_last_node(
:return: result of the check :return: result of the check
:rtype: bool :rtype: bool
""" """
return (part not in current_level and part != parts[-1]) or ( return (part not in current_level and not is_last) or (
part in current_level and not isinstance(current_level[part], dict) part in current_level and not isinstance(current_level[part], dict)
) )
@ -71,9 +71,10 @@ def translate_list_to_dict( # noqa: CCR001
else: else:
def_val = "asc" def_val = "asc"
for part in parts: for ind, part in enumerate(parts):
is_last = ind == len(parts) - 1
if check_node_not_dict_or_not_last_node( if check_node_not_dict_or_not_last_node(
part=part, parts=parts, current_level=current_level part=part, is_last=is_last, current_level=current_level
): ):
current_level[part] = dict() current_level[part] = dict()
elif part not in current_level: elif part not in current_level: