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

finish of refactor

Browse Source
This commit is contained in:
collerek
2020-08-27 19:00:06 +02:00
parent 22b42ff6fc
commit 8da4c192f3
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.coverage
View File

Binary file not shown.

20
ormar/models/metaclass.py
View File

@ -87,19 +87,25 @@ def sqlalchemy_columns_from_model_fields(
return pkname, columns return pkname, columns
def populate_default
def populate_default_field_value(
type_: Type[BaseField], field: str, attrs: dict
) -> dict:
def_value = type_.default_value()
curr_def_value = attrs.get(field, "NONE")
if curr_def_value == "NONE" and isinstance(def_value, FieldInfo):
attrs[field] = def_value
elif curr_def_value == "NONE" and type_.nullable:
attrs[field] = FieldInfo(default=None)
return attrs
def populate_pydantic_default_values(attrs: Dict) -> Dict: def populate_pydantic_default_values(attrs: Dict) -> Dict:
for field, type_ in attrs["__annotations__"].items(): for field, type_ in attrs["__annotations__"].items():
if issubclass(type_, BaseField): if issubclass(type_, BaseField):
if type_.name is None: if type_.name is None:
type_.name = field type_.name = field
def_value = type_.default_value() attrs = populate_default_field_value(type_, field, attrs)
curr_def_value = attrs.get(field, "NONE")
if curr_def_value == "NONE" and isinstance(def_value, FieldInfo):
attrs[field] = def_value
elif curr_def_value == "NONE" and type_.nullable:
attrs[field] = FieldInfo(default=None)
return attrs return attrs