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

update docs, fix for ellipsis for whole model, some more tests

Browse Source
This commit is contained in:
collerek
2020-11-12 11:08:27 +01:00
parent d8391851fa
commit 381995250d
12 changed files with 148 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ormar/queryset/join.py
View File

@ -67,7 +67,7 @@ class SqlJoin:
nested_name: str,
) -> Tuple[Optional[Union[Dict, Set]], Optional[Union[Dict, Set]]]:
fields = model_cls.get_included(fields, nested_name)
exclude_fields = model_cls.get_included(exclude_fields, nested_name)
exclude_fields = model_cls.get_excluded(exclude_fields, nested_name)
return fields, exclude_fields
def build_join( # noqa: CCR001

2
ormar/queryset/queryset.py
View File

@ -196,7 +196,7 @@ class QuerySet:
if isinstance(columns, str):
columns = [columns]
current_included = self._exclude_columns
current_included = self._columns
if not isinstance(columns, dict):
current_included = update_dict_from_list(current_included, columns)
else: