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

linting etc.

Browse Source
This commit is contained in:
collerek
2020-09-17 13:14:36 +02:00
parent 1451ec8671
commit 63a9aa1d5d
2 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
ormar/models/model.py
View File

@ -1,18 +1,13 @@
import itertools import itertools
from typing import Any, List, Tuple, Union from typing import Any, List, Tuple, Union
from databases.backends.postgres import Record
import sqlalchemy import sqlalchemy
from databases.backends.postgres import Record
import ormar.queryset # noqa I100 import ormar.queryset # noqa I100
from ormar.fields.many_to_many import ManyToManyField from ormar.fields.many_to_many import ManyToManyField
from ormar.models import NewBaseModel # noqa I100 from ormar.models import NewBaseModel # noqa I100
import logging
import sys
logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
def group_related_list(list_: List) -> dict: def group_related_list(list_: List) -> dict:
test_dict = dict() test_dict = dict()
@ -34,11 +29,11 @@ class Model(NewBaseModel):
@classmethod @classmethod
def from_row( def from_row(
cls, cls,
row: sqlalchemy.engine.ResultProxy, row: sqlalchemy.engine.ResultProxy,
select_related: List = None, select_related: List = None,
related_models: Any = None, related_models: Any = None,
previous_table: str = None, previous_table: str = None,
) -> Union["Model", Tuple["Model", dict]]: ) -> Union["Model", Tuple["Model", dict]]:
item = {} item = {}
@ -49,9 +44,9 @@ class Model(NewBaseModel):
# breakpoint() # breakpoint()
if ( if (
previous_table previous_table
and previous_table in cls.Meta.model_fields and previous_table in cls.Meta.model_fields
and issubclass(cls.Meta.model_fields[previous_table], ManyToManyField) and issubclass(cls.Meta.model_fields[previous_table], ManyToManyField)
): ):
previous_table = cls.Meta.model_fields[ previous_table = cls.Meta.model_fields[
previous_table previous_table
@ -72,11 +67,11 @@ class Model(NewBaseModel):
@classmethod @classmethod
def populate_nested_models_from_row( def populate_nested_models_from_row(
cls, cls,
item: dict, item: dict,
row: sqlalchemy.engine.ResultProxy, row: sqlalchemy.engine.ResultProxy,
related_models: Any, related_models: Any,
previous_table: sqlalchemy.Table, previous_table: sqlalchemy.Table,
) -> dict: ) -> dict:
for related in related_models: for related in related_models:
if isinstance(related_models, dict) and related_models[related]: if isinstance(related_models, dict) and related_models[related]:
@ -94,14 +89,14 @@ class Model(NewBaseModel):
return item return item
@classmethod @classmethod
def extract_prefixed_table_columns( def extract_prefixed_table_columns( # noqa CCR001
cls, item: dict, row: sqlalchemy.engine.result.ResultProxy, table_prefix: str cls, item: dict, row: sqlalchemy.engine.result.ResultProxy, table_prefix: str
) -> dict: ) -> dict:
for column in cls.Meta.table.columns: for column in cls.Meta.table.columns:
logging.debug('column to extract:' + column.name)
logging.debug(f'{row.keys()}')
if column.name not in item: if column.name not in item:
prefixed_name = f'{table_prefix + "_" if table_prefix else ""}{column.name}' prefixed_name = (
f'{table_prefix + "_" if table_prefix else ""}{column.name}'
)
# databases does not keep aliases in Record for postgres # databases does not keep aliases in Record for postgres
source = row._row if isinstance(row, Record) else row source = row._row if isinstance(row, Record) else row
item[column.name] = source[prefixed_name] item[column.name] = source[prefixed_name]

4
ormar/queryset/queryset.py
View File

@ -9,10 +9,6 @@ from ormar.queryset import FilterQuery
from ormar.queryset.clause import QueryClause from ormar.queryset.clause import QueryClause
from ormar.queryset.query import Query from ormar.queryset.query import Query
import logging
import sys
logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
if TYPE_CHECKING: # pragma no cover if TYPE_CHECKING: # pragma no cover
from ormar import Model from ormar import Model