rename newbasemodel
This commit is contained in:
@ -7,7 +7,7 @@ from ormar import ModelDefinitionError # noqa I101
|
|||||||
|
|
||||||
if TYPE_CHECKING: # pragma no cover
|
if TYPE_CHECKING: # pragma no cover
|
||||||
from ormar.models import Model
|
from ormar.models import Model
|
||||||
from ormar.models import FakePydantic
|
from ormar.models import NewBaseModel
|
||||||
|
|
||||||
|
|
||||||
class BaseField:
|
class BaseField:
|
||||||
@ -64,6 +64,6 @@ class BaseField:
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def expand_relationship(
|
def expand_relationship(
|
||||||
cls, value: Any, child: Union["Model", "FakePydantic"]
|
cls, value: Any, child: Union["Model", "NewBaseModel"]
|
||||||
) -> Any:
|
) -> Any:
|
||||||
return value
|
return value
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
from ormar.models.fakepydantic import FakePydantic
|
from ormar.models.newbasemodel import NewBaseModel
|
||||||
from ormar.models.model import Model
|
from ormar.models.model import Model
|
||||||
|
|
||||||
__all__ = ["FakePydantic", "Model"]
|
__all__ = ["NewBaseModel", "Model"]
|
||||||
|
|||||||
@ -3,10 +3,10 @@ from typing import Any, List
|
|||||||
import sqlalchemy
|
import sqlalchemy
|
||||||
|
|
||||||
import ormar.queryset # noqa I100
|
import ormar.queryset # noqa I100
|
||||||
from ormar.models import FakePydantic # noqa I100
|
from ormar.models import NewBaseModel # noqa I100
|
||||||
|
|
||||||
|
|
||||||
class Model(FakePydantic):
|
class Model(NewBaseModel):
|
||||||
__abstract__ = False
|
__abstract__ = False
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|||||||
@ -33,7 +33,7 @@ if TYPE_CHECKING: # pragma no cover
|
|||||||
MappingIntStrAny = Mapping[IntStr, Any]
|
MappingIntStrAny = Mapping[IntStr, Any]
|
||||||
|
|
||||||
|
|
||||||
class FakePydantic(pydantic.BaseModel, ModelTableProxy, metaclass=ModelMetaclass):
|
class NewBaseModel(pydantic.BaseModel, ModelTableProxy, metaclass=ModelMetaclass):
|
||||||
__slots__ = ("_orm_id", "_orm_saved")
|
__slots__ = ("_orm_id", "_orm_saved")
|
||||||
|
|
||||||
if TYPE_CHECKING: # pragma no cover
|
if TYPE_CHECKING: # pragma no cover
|
||||||
@ -11,7 +11,7 @@ from sqlalchemy import text
|
|||||||
from ormar.fields.foreign_key import ForeignKeyField # noqa I100
|
from ormar.fields.foreign_key import ForeignKeyField # noqa I100
|
||||||
|
|
||||||
if TYPE_CHECKING: # pragma no cover
|
if TYPE_CHECKING: # pragma no cover
|
||||||
from ormar.models import FakePydantic, Model
|
from ormar.models import NewBaseModel, Model
|
||||||
|
|
||||||
|
|
||||||
def get_table_alias() -> str:
|
def get_table_alias() -> str:
|
||||||
@ -48,7 +48,7 @@ class RelationshipManager:
|
|||||||
self._relations[reverse_key] = {"type": "reverse"}
|
self._relations[reverse_key] = {"type": "reverse"}
|
||||||
self._aliases[f"{field.to.Meta.tablename}_{table_name}"] = get_table_alias()
|
self._aliases[f"{field.to.Meta.tablename}_{table_name}"] = get_table_alias()
|
||||||
|
|
||||||
def deregister(self, model: "FakePydantic") -> None:
|
def deregister(self, model: "NewBaseModel") -> None:
|
||||||
for rel_type in self._relations.keys():
|
for rel_type in self._relations.keys():
|
||||||
if model.get_name() in rel_type.lower():
|
if model.get_name() in rel_type.lower():
|
||||||
if model._orm_id in self._relations[rel_type]:
|
if model._orm_id in self._relations[rel_type]:
|
||||||
@ -56,8 +56,8 @@ class RelationshipManager:
|
|||||||
|
|
||||||
def add_relation(
|
def add_relation(
|
||||||
self,
|
self,
|
||||||
parent: "FakePydantic",
|
parent: "NewBaseModel",
|
||||||
child: "FakePydantic",
|
child: "NewBaseModel",
|
||||||
child_model_name: str,
|
child_model_name: str,
|
||||||
virtual: bool = False,
|
virtual: bool = False,
|
||||||
) -> None:
|
) -> None:
|
||||||
@ -95,13 +95,13 @@ class RelationshipManager:
|
|||||||
|
|
||||||
relations_list.append(model)
|
relations_list.append(model)
|
||||||
|
|
||||||
def contains(self, relations_key: str, instance: "FakePydantic") -> bool:
|
def contains(self, relations_key: str, instance: "NewBaseModel") -> bool:
|
||||||
if relations_key in self._relations:
|
if relations_key in self._relations:
|
||||||
return instance._orm_id in self._relations[relations_key]
|
return instance._orm_id in self._relations[relations_key]
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def get(
|
def get(
|
||||||
self, relations_key: str, instance: "FakePydantic"
|
self, relations_key: str, instance: "NewBaseModel"
|
||||||
) -> Union["Model", List["Model"]]:
|
) -> Union["Model", List["Model"]]:
|
||||||
if relations_key in self._relations:
|
if relations_key in self._relations:
|
||||||
if instance._orm_id in self._relations[relations_key]:
|
if instance._orm_id in self._relations[relations_key]:
|
||||||
|
|||||||
Reference in New Issue
Block a user