GitHub-Proxy/sqlmodel-fix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

♻️ Refactor checking for sa_type

Browse Source
This commit is contained in:
Sebastián Ramírez 2023-10-29 12:00:37 +04:00
parent a1833901f5
commit 9509313eaf
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sqlmodel/main.py
View File

@ -105,11 +105,15 @@ class FieldInfo(PydanticFieldInfo):
) )
if unique is not Undefined: if unique is not Undefined:
raise RuntimeError( raise RuntimeError(
"Passing unique is not supported when " "also passing a sa_column" "Passing unique is not supported when also passing a sa_column"
) )
if index is not Undefined: if index is not Undefined:
raise RuntimeError( raise RuntimeError(
"Passing index is not supported when " "also passing a sa_column" "Passing index is not supported when also passing a sa_column"
)
if sa_type is not Undefined:
raise RuntimeError(
"Passing sa_type is not supported when also passing a sa_column"
) )
super().__init__(default=default, **kwargs) super().__init__(default=default, **kwargs)
self.primary_key = primary_key self.primary_key = primary_key
@ -187,6 +191,7 @@ def Field(
unique: Union[bool, UndefinedType] = Undefined, unique: Union[bool, UndefinedType] = Undefined,
nullable: Union[bool, UndefinedType] = Undefined, nullable: Union[bool, UndefinedType] = Undefined,
index: Union[bool, UndefinedType] = Undefined, index: Union[bool, UndefinedType] = Undefined,
sa_type: Union[Type[Any], UndefinedType] = Undefined,
sa_column_args: Union[Sequence[Any], UndefinedType] = Undefined, sa_column_args: Union[Sequence[Any], UndefinedType] = Undefined,
sa_column_kwargs: Union[Mapping[str, Any], UndefinedType] = Undefined, sa_column_kwargs: Union[Mapping[str, Any], UndefinedType] = Undefined,
schema_extra: Optional[Dict[str, Any]] = None, schema_extra: Optional[Dict[str, Any]] = None,
@ -266,7 +271,7 @@ def Field(
unique: Union[bool, UndefinedType] = Undefined, unique: Union[bool, UndefinedType] = Undefined,
nullable: Union[bool, UndefinedType] = Undefined, nullable: Union[bool, UndefinedType] = Undefined,
index: Union[bool, UndefinedType] = Undefined, index: Union[bool, UndefinedType] = Undefined,
sa_type: Type[Any] = Undefined, sa_type: Union[Type[Any], UndefinedType] = Undefined,
sa_column: Union[Column, UndefinedType] = Undefined, # type: ignore sa_column: Union[Column, UndefinedType] = Undefined, # type: ignore
sa_column_args: Union[Sequence[Any], UndefinedType] = Undefined, sa_column_args: Union[Sequence[Any], UndefinedType] = Undefined,
sa_column_kwargs: Union[Mapping[str, Any], UndefinedType] = Undefined, sa_column_kwargs: Union[Mapping[str, Any], UndefinedType] = Undefined,
@ -519,9 +524,9 @@ class SQLModelMetaclass(ModelMetaclass, DeclarativeMeta):
def get_sqlalchemy_type(field: ModelField) -> Any: def get_sqlalchemy_type(field: ModelField) -> Any:
if hasattr(field.field_info, "sa_type"): sa_type = getattr(field.field_info, "sa_type") # noqa: B009
if not issubclass(type(field.field_info.sa_type), type(Undefined)): if sa_type is not Undefined:
return field.field_info.sa_type return sa_type
if isinstance(field.type_, type) and field.shape == SHAPE_SINGLETON: if isinstance(field.type_, type) and field.shape == SHAPE_SINGLETON:
# Check enums first as an enum can also be a str, needed by Pydantic/FastAPI # Check enums first as an enum can also be a str, needed by Pydantic/FastAPI
if issubclass(field.type_, Enum): if issubclass(field.type_, Enum):