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

fix some smells

Browse Source
This commit is contained in:
collerek
2020-09-14 17:33:12 +02:00
parent ccca6ec0ff
commit 5a8fd74fac
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.coverage
View File

Binary file not shown.

3
ormar/fields/base.py
View File

@ -35,8 +35,7 @@ class BaseField:
default = cls.default if cls.default is not None else cls.server_default default = cls.default if cls.default is not None else cls.server_default
if callable(default): if callable(default):
return Field(default_factory=default) return Field(default_factory=default)
else: return Field(default=default)
return Field(default=default)
return None return None
@classmethod @classmethod

6
ormar/models/newbasemodel.py
View File

@ -119,11 +119,11 @@ class NewBaseModel(pydantic.BaseModel, ModelTableProxy, metaclass=ModelMetaclass
def __getattribute__(self, item: str) -> Any: def __getattribute__(self, item: str) -> Any:
if item in ("_orm_id", "_orm_saved", "_orm", "__fields__"): if item in ("_orm_id", "_orm_saved", "_orm", "__fields__"):
return object.__getattribute__(self, item) return object.__getattribute__(self, item)
elif item != "_extract_related_names" and item in self._extract_related_names(): if item != "_extract_related_names" and item in self._extract_related_names():
return self._extract_related_model_instead_of_field(item) return self._extract_related_model_instead_of_field(item)
elif item == "pk": if item == "pk":
return self.__dict__.get(self.Meta.pkname, None) return self.__dict__.get(self.Meta.pkname, None)
elif item != "__fields__" and item in self.__fields__: if item != "__fields__" and item in self.__fields__:
value = self.__dict__.get(item, None) value = self.__dict__.get(item, None)
value = self._convert_json(item, value, "loads") value = self._convert_json(item, value, "loads")
return value return value

8
ormar/queryset/queryset.py
View File

@ -134,11 +134,11 @@ class QuerySet:
async def get(self, **kwargs: Any) -> "Model": async def get(self, **kwargs: Any) -> "Model":
if kwargs: if kwargs:
return await self.filter(**kwargs).get() return await self.filter(**kwargs).get()
if not self.filter_clauses:
expr = self.build_select_expression().limit(2)
else: else:
if not self.filter_clauses: expr = self.build_select_expression()
expr = self.build_select_expression().limit(2)
else:
expr = self.build_select_expression()
rows = await self.database.fetch_all(expr) rows = await self.database.fetch_all(expr)