Skip to content

🏷️ Adjust type annotation for Field.sa_type to support instantiated SQLAlchemy types #1345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
diachkow wants to merge 14 commits into
base: main
Choose a base branch
from
+9 −5
Open

🏷️ Adjust type annotation for Field.sa_type to support instantiated SQLAlchemy types #1345

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
af23ba8
🏷️ Adjust type annotation for Field.sa_type to support instantiated S…
diachkow Apr 21, 2025
cef7ec8
Merge branch 'main' into main
svlandeg Apr 28, 2025
9893fb2
Merge branch 'main' into main
YuriiMotov Aug 21, 2025
f5b5781
Merge branch 'main' into main
diachkow Sep 1, 2025
e76daeb
feat: rename SaType to SaTypeOrInstance
diachkow Sep 1, 2025
96199fa
🎨 [pre-commit.ci] Auto format from pre-commit.com hooks
pre-commit-ci[bot] Sep 1, 2025
8b629d6
apply formatting
diachkow Sep 1, 2025
20aa991
Merge branch 'main' into main
diachkow Dec 27, 2025
d8741bf
Merge branch 'main' into main
YuriiMotov Jan 8, 2026
07c11ba
Merge branch 'main' into main
svlandeg Jan 13, 2026
3ce918a
Merge branch 'main' into main_diachkow
svlandeg Mar 3, 2026
6c95e05
🎨 Auto format
pre-commit-ci-lite[bot] Mar 3, 2026
afbed47
also fix the type in the dataclass
svlandeg Mar 3, 2026
98eabdf
Merge branch 'main' into main
YuriiMotov Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions sqlmodel/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@
from sqlalchemy.orm.attributes import set_attribute
from sqlalchemy.orm.decl_api import DeclarativeMeta
from sqlalchemy.orm.instrumentation import is_instrumented
from sqlalchemy.sql.schema import MetaData
from sqlalchemy.sql.schema import MetaData, SchemaEventTarget
from sqlalchemy.sql.sqltypes import LargeBinary, Time, Uuid
from sqlalchemy.types import TypeEngine
from typing_extensions import deprecated

from ._compat import (
Expand Down Expand Up @@ -87,6 +88,9 @@
| Mapping[int, Union["IncEx", bool]]
| Mapping[str, Union["IncEx", bool]]
)
SaTypeOrInstance: TypeAlias = (
TypeEngine[Any] | type[TypeEngine[Any]] | SchemaEventTarget
)
OnDeleteType = Literal["CASCADE", "SET NULL", "RESTRICT"]


Expand Down Expand Up @@ -208,7 +212,7 @@ class FieldInfoMetadata:
ondelete: OnDeleteType | UndefinedType = Undefined
unique: bool | UndefinedType = Undefined
index: bool | UndefinedType = Undefined
sa_type: type[Any] | UndefinedType = Undefined
sa_type: SaTypeOrInstance | UndefinedType = Undefined
sa_column: Column[Any] | UndefinedType = Undefined
sa_column_args: Sequence[Any] | UndefinedType = Undefined
sa_column_kwargs: Mapping[str, Any] | UndefinedType = Undefined
Expand Down Expand Up @@ -267,7 +271,7 @@ def Field(
unique: bool | UndefinedType = Undefined,
nullable: bool | UndefinedType = Undefined,
index: bool | UndefinedType = Undefined,
sa_type: type[Any] | UndefinedType = Undefined,
sa_type: SaTypeOrInstance | UndefinedType = Undefined,
sa_column_args: Sequence[Any] | UndefinedType = Undefined,
sa_column_kwargs: Mapping[str, Any] | UndefinedType = Undefined,
schema_extra: dict[str, Any] | None = None,
Expand Down Expand Up @@ -311,7 +315,7 @@ def Field(
unique: bool | UndefinedType = Undefined,
nullable: bool | UndefinedType = Undefined,
index: bool | UndefinedType = Undefined,
sa_type: type[Any] | UndefinedType = Undefined,
sa_type: SaTypeOrInstance | UndefinedType = Undefined,
sa_column_args: Sequence[Any] | UndefinedType = Undefined,
sa_column_kwargs: Mapping[str, Any] | UndefinedType = Undefined,
schema_extra: dict[str, Any] | None = None,
Expand Down Expand Up @@ -396,7 +400,7 @@ def Field(
unique: bool | UndefinedType = Undefined,
nullable: bool | UndefinedType = Undefined,
index: bool | UndefinedType = Undefined,
sa_type: type[Any] | UndefinedType = Undefined,
sa_type: SaTypeOrInstance | UndefinedType = Undefined,
sa_column: Column | UndefinedType = Undefined,
sa_column_args: Sequence[Any] | UndefinedType = Undefined,
sa_column_kwargs: Mapping[str, Any] | UndefinedType = Undefined,
Expand Down
Loading