From 4e91b3837bb731c7e811c7212262b07e043e08ae Mon Sep 17 00:00:00 2001 From: collerek Date: Tue, 11 Aug 2020 17:58:34 +0200 Subject: [PATCH] some cleanup --- .coverage | Bin 53248 -> 53248 bytes .flake8 | 1 + orm/__init__.py | 1 + orm/fields/__init__.py | 12 ++++++------ orm/fields/base.py | 7 +++++-- orm/fields/foreign_key.py | 22 ++++++++++------------ orm/fields/model_fields.py | 2 +- orm/models.py | 14 ++++++-------- orm/queryset.py | 7 +++---- orm/relations.py | 15 ++++++--------- 10 files changed, 39 insertions(+), 42 deletions(-) diff --git a/.coverage b/.coverage index 80aea2e33e0baceb6a02d43b32739a4bda7b4474..52c345a480d2a4921903b810f9d261a68e88c907 100644 GIT binary patch delta 491 zcmYk0KS(1%7{zCIW@oe6nfWG06cm(Lh>5a#aKXdM!qSb6po0I!2m$dp5z)d6SKc-1 zR5=7~1Z_lFut=leU87>5*s9oB+G(TCC{ zul$s+@kyR$FYGc($Q@>966!8&B@&|{b)2hH=^S%90iy*a!<2gJt+s^XVLqPK}32!oT9#N~&a*W$|3a(1VDd z#sk`@kNQXVQ%wK`1kdmY4{!t5Z~}X<4I8iyzu^}w!w)FveLe7#0Kpo_vAAYc+`bd8r{!Ipj3a~qO3Gbr)H~-PDs9emya5)d Bb>sj5 delta 816 zcmYk3ZAep59LDe6y_??co^$Tam&%MXqEt+KalU3k-*rNQgrOKYDb$6VjIlTSEJS!C zh-I@6krG%maJZ@SLt-F0$U<~(7XlsS%Oug8O?Nv+3qSoIp7T8a{|`>j0M#=L`O0wY}Ifi5XjnMMLsLk=}zKpDqw6ineKPC9oF+SeKmQ?Ts1{B z;7*pOzV;(|3~JC`RRJ!J@Lmc)94lBra@@Y*T)qo49JoQcQb1v|(kwAOs2a2G1^a+ii zSLiXSM>O1kD{ui0!>6zdHe$jn(3!#0BvZiqT&1xwOVD~lb{n>A{jswgwr_HqtFu-| z;=1UK+00RIIAn7Lg9gXmiYrE*Ksa#~`DWyx{OiTGxVl_Hvw@ZZV8!V z@wVZEx0Ta@M3pFg*@=CSz5amxVA(At_DB78Y3S$7baoko&p5jnhrMB9W!kV;>X40= z691^-)?H%ao!w*?+g-~6zvvqmBWvDJ^=)gYSu#mtd?U`M;_CU-r78Ei(`>HXJY7Ym zrC=*JCEpy-%S%RoG%U#i;8fT=ry5yqFLBN4J&Wy~j1oKPO2uTt$ "Model": class ForeignKey(BaseField): def __init__( - self, - to: Type["Model"], - name: str = None, - related_name: str = None, - nullable: bool = True, - virtual: bool = False, + self, + to: Type["Model"], + name: str = None, + related_name: str = None, + nullable: bool = True, + virtual: bool = False, ) -> None: super().__init__(nullable=nullable, name=name) self.virtual = virtual @@ -50,7 +50,7 @@ class ForeignKey(BaseField): return to_column.get_column_type() def expand_relationship( - self, value: Any, child: "Model" + self, value: Any, child: "Model" ) -> Optional[Union["Model", List["Model"]]]: if value is None: @@ -80,9 +80,7 @@ class ForeignKey(BaseField): model = create_dummy_instance(fk=self.to, pk=value) model._orm_relationship_manager.add_relation( - model, - child, - virtual=self.virtual, + model, child, virtual=self.virtual, ) return model diff --git a/orm/fields/model_fields.py b/orm/fields/model_fields.py index 3ddae06..813f190 100644 --- a/orm/fields/model_fields.py +++ b/orm/fields/model_fields.py @@ -4,7 +4,7 @@ import decimal import sqlalchemy from pydantic import Json -from orm.fields.base import BaseField, RequiredParams +from orm.fields.base import BaseField, RequiredParams # noqa I101 @RequiredParams("length") diff --git a/orm/models.py b/orm/models.py index 9fde6e7..22750eb 100644 --- a/orm/models.py +++ b/orm/models.py @@ -6,18 +6,16 @@ from typing import Any, List, Optional, TYPE_CHECKING, Tuple, Type, TypeVar from typing import Callable, Dict, Set import databases - -import orm.queryset as qry -from orm.exceptions import ModelDefinitionError -from orm import ForeignKey -from orm.fields.base import BaseField -from orm.relations import RelationshipManager - import pydantic +import sqlalchemy from pydantic import BaseConfig, BaseModel, create_model from pydantic.fields import ModelField -import sqlalchemy +import orm.queryset as qry # noqa I100 +from orm import ForeignKey +from orm.exceptions import ModelDefinitionError +from orm.fields.base import BaseField +from orm.relations import RelationshipManager relationship_manager = RelationshipManager() diff --git a/orm/queryset.py b/orm/queryset.py index ea6c264..5033f13 100644 --- a/orm/queryset.py +++ b/orm/queryset.py @@ -11,16 +11,15 @@ from typing import ( ) import databases +import sqlalchemy +from sqlalchemy import text -import orm +import orm # noqa I100 import orm.fields.foreign_key from orm import ForeignKey from orm.exceptions import MultipleMatches, NoMatch, QueryDefinitionError from orm.fields.base import BaseField -import sqlalchemy -from sqlalchemy import text - if TYPE_CHECKING: # pragma no cover from orm.models import Model diff --git a/orm/relations.py b/orm/relations.py index fa0dbcf..7cf5ecf 100644 --- a/orm/relations.py +++ b/orm/relations.py @@ -16,7 +16,7 @@ def get_table_alias() -> str: def get_relation_config( - relation_type: str, table_name: str, field: ForeignKey + relation_type: str, table_name: str, field: ForeignKey ) -> Dict[str, str]: alias = get_table_alias() config = { @@ -37,7 +37,7 @@ class RelationshipManager: self._relations = dict() def add_relation_type( - self, relations_key: str, reverse_key: str, field: ForeignKey, table_name: str + self, relations_key: str, reverse_key: str, field: ForeignKey, table_name: str ) -> None: if relations_key not in self._relations: self._relations[relations_key] = get_relation_config( @@ -56,10 +56,7 @@ class RelationshipManager: del self._relations[rel_type][model._orm_id] def add_relation( - self, - parent: "FakePydantic", - child: "FakePydantic", - virtual: bool = False, + self, parent: "FakePydantic", child: "FakePydantic", virtual: bool = False, ) -> None: parent_id = parent._orm_id child_id = child._orm_id @@ -97,7 +94,7 @@ class RelationshipManager: return False def get( - self, relations_key: str, instance: "FakePydantic" + self, relations_key: str, instance: "FakePydantic" ) -> Union["Model", List["Model"]]: if relations_key in self._relations: if instance._orm_id in self._relations[relations_key]: @@ -108,8 +105,8 @@ class RelationshipManager: def resolve_relation_join(self, from_table: str, to_table: str) -> str: for relation_name, relation in self._relations.items(): if ( - relation["source_table"] == from_table - and relation["target_table"] == to_table + relation["source_table"] == from_table + and relation["target_table"] == to_table ): return self._relations[relation_name]["table_alias"] return ""