linting etc.
This commit is contained in:
@ -1,18 +1,13 @@
|
||||
import itertools
|
||||
from typing import Any, List, Tuple, Union
|
||||
|
||||
from databases.backends.postgres import Record
|
||||
import sqlalchemy
|
||||
from databases.backends.postgres import Record
|
||||
|
||||
import ormar.queryset # noqa I100
|
||||
from ormar.fields.many_to_many import ManyToManyField
|
||||
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:
|
||||
test_dict = dict()
|
||||
@ -34,11 +29,11 @@ class Model(NewBaseModel):
|
||||
|
||||
@classmethod
|
||||
def from_row(
|
||||
cls,
|
||||
row: sqlalchemy.engine.ResultProxy,
|
||||
select_related: List = None,
|
||||
related_models: Any = None,
|
||||
previous_table: str = None,
|
||||
cls,
|
||||
row: sqlalchemy.engine.ResultProxy,
|
||||
select_related: List = None,
|
||||
related_models: Any = None,
|
||||
previous_table: str = None,
|
||||
) -> Union["Model", Tuple["Model", dict]]:
|
||||
|
||||
item = {}
|
||||
@ -49,9 +44,9 @@ class Model(NewBaseModel):
|
||||
|
||||
# breakpoint()
|
||||
if (
|
||||
previous_table
|
||||
and previous_table in cls.Meta.model_fields
|
||||
and issubclass(cls.Meta.model_fields[previous_table], ManyToManyField)
|
||||
previous_table
|
||||
and previous_table in cls.Meta.model_fields
|
||||
and issubclass(cls.Meta.model_fields[previous_table], ManyToManyField)
|
||||
):
|
||||
previous_table = cls.Meta.model_fields[
|
||||
previous_table
|
||||
@ -72,11 +67,11 @@ class Model(NewBaseModel):
|
||||
|
||||
@classmethod
|
||||
def populate_nested_models_from_row(
|
||||
cls,
|
||||
item: dict,
|
||||
row: sqlalchemy.engine.ResultProxy,
|
||||
related_models: Any,
|
||||
previous_table: sqlalchemy.Table,
|
||||
cls,
|
||||
item: dict,
|
||||
row: sqlalchemy.engine.ResultProxy,
|
||||
related_models: Any,
|
||||
previous_table: sqlalchemy.Table,
|
||||
) -> dict:
|
||||
for related in related_models:
|
||||
if isinstance(related_models, dict) and related_models[related]:
|
||||
@ -94,14 +89,14 @@ class Model(NewBaseModel):
|
||||
return item
|
||||
|
||||
@classmethod
|
||||
def extract_prefixed_table_columns(
|
||||
cls, item: dict, row: sqlalchemy.engine.result.ResultProxy, table_prefix: str
|
||||
def extract_prefixed_table_columns( # noqa CCR001
|
||||
cls, item: dict, row: sqlalchemy.engine.result.ResultProxy, table_prefix: str
|
||||
) -> dict:
|
||||
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:
|
||||
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
|
||||
source = row._row if isinstance(row, Record) else row
|
||||
item[column.name] = source[prefixed_name]
|
||||
|
||||
Reference in New Issue
Block a user