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

Merge branch 'master' of https://github.com/collerek/ormar into prefetch_related

Browse Source
This commit is contained in:
collerek
2020-11-25 21:22:01 +01:00
parent 3438928608 c6146193b6
commit 6893aa5095
2 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ormar/models/modelproxy.py
View File

@ -71,7 +71,12 @@ class ModelTableProxy:
)
model_dict[field] = pk_value
elif field_value: # nested dict
model_dict[field] = field_value.get(target_pkname)
if isinstance(field_value, list):
model_dict[field] = [
target.get(target_pkname) for target in field_value
]
else:
model_dict[field] = field_value.get(target_pkname)
else:
model_dict.pop(field, None)
return model_dict
@ -231,7 +236,9 @@ class ModelTableProxy:
@staticmethod
def _populate_pk_column(
model: Type["Model"], columns: List[str], use_alias: bool = False,
model: Type["Model"],
columns: List[str],
use_alias: bool = False,
) -> List[str]:
pk_alias = (
model.get_column_alias(model.Meta.pkname)