PaiGramTeam/sqlmodel
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/sqlmodel.git synced 2024-11-25 09:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get all tests except for openapi working

Browse Source
This commit is contained in:
Anton De Meester 2023-08-01 09:33:55 +00:00
parent 82888160ac
commit 40bcdfecff
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sqlmodel/main.py
View File

@ -273,7 +273,9 @@ class SQLModelMetaclass(ModelMetaclass, DeclarativeMeta):
key: pydantic_kwargs.pop(key) key: pydantic_kwargs.pop(key)
for key in pydantic_kwargs.keys() & allowed_config_kwargs for key in pydantic_kwargs.keys() & allowed_config_kwargs
} }
config_table = getattr(class_dict.get("Config", object()), "table", False) or kwargs.get("table", False) config_table = getattr(
class_dict.get("Config", object()), "table", False
) or kwargs.get("table", False)
# If we have a table, we need to have defaults for all fields # If we have a table, we need to have defaults for all fields
# Pydantic v2 sets a __pydantic_core_schema__ which is very hard to change. Changing the fields does not do anything # Pydantic v2 sets a __pydantic_core_schema__ which is very hard to change. Changing the fields does not do anything
if config_table is True: if config_table is True:
@ -282,7 +284,12 @@ class SQLModelMetaclass(ModelMetaclass, DeclarativeMeta):
if value is PydanticUndefined: if value is PydanticUndefined:
dict_used[key] = None dict_used[key] = None
elif isinstance(value, FieldInfo): elif isinstance(value, FieldInfo):
if value.default is PydanticUndefined and value.default_factory is None: if (
value.default in (PydanticUndefined, Ellipsis)
) and value.default_factory is None:
value.original_default = (
value.default
) # So we can check for nullable
value.default = None value.default = None
new_cls: Type["SQLModelMetaclass"] = super().__new__( new_cls: Type["SQLModelMetaclass"] = super().__new__(
@ -496,6 +503,7 @@ def get_column_from_field(field: FieldInfo) -> Column: # type: ignore
class_registry = weakref.WeakValueDictionary() # type: ignore class_registry = weakref.WeakValueDictionary() # type: ignore
default_registry = registry() default_registry = registry()
_TSQLModel = TypeVar("_TSQLModel", bound="SQLModel")
class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry): class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry):
@ -549,12 +557,28 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
return cls.__name__.lower() return cls.__name__.lower()
@classmethod @classmethod
def model_validate(cls, *args, **kwargs): def model_validate(
return super().model_validate(*args, **kwargs) cls: type[_TSQLModel],
obj: Any,
*,
strict: bool | None = None,
from_attributes: bool | None = None,
context: dict[str, Any] | None = None,
) -> _TSQLModel:
# Somehow model validate doesn't call __init__ so it would remove our init logic
validated = super().model_validate(
obj, strict=strict, from_attributes=from_attributes, context=context
)
return cls(**{key: value for key, value in validated})
def _is_field_noneable(field: FieldInfo) -> bool: def _is_field_noneable(field: FieldInfo) -> bool:
if getattr(field, "nullable", PydanticUndefined) is not PydanticUndefined:
return field.nullable
if not field.is_required(): if not field.is_required():
default = getattr(field, "original_default", field.default)
if default is PydanticUndefined:
return False
if field.annotation is None or field.annotation is NoneType: if field.annotation is None or field.annotation is NoneType:
return True return True
if get_origin(field.annotation) is Union: if get_origin(field.annotation) is Union: