From fa686f230be4902f119e35f7b72938b79487d20a Mon Sep 17 00:00:00 2001 From: George <44733329+GiorgioPorgio@users.noreply.github.com> Date: Thu, 27 Mar 2025 15:17:23 +0100 Subject: [PATCH 1/2] maxi speichers changes adapted to new structure --- sqlmodel/sql/_expression_select_gen.py | 15 +++++++++++++++ sqlmodel/sql/_expression_select_gen.py.jinja2 | 12 ++++++++++++ 2 files changed, 27 insertions(+) diff --git a/sqlmodel/sql/_expression_select_gen.py b/sqlmodel/sql/_expression_select_gen.py index 08aa59ad61..de67d1e911 100644 --- a/sqlmodel/sql/_expression_select_gen.py +++ b/sqlmodel/sql/_expression_select_gen.py @@ -15,6 +15,7 @@ from sqlalchemy import ( Column, + Label, ) from sqlalchemy.sql.elements import ( SQLCoreOperations, @@ -40,6 +41,7 @@ Column, # type: ignore Sequence, # type: ignore Mapping, # type: ignore + Label, # type: ignore UUID, datetime, float, @@ -58,6 +60,7 @@ Column, # type: ignore Sequence, # type: ignore Mapping, # type: ignore + Label, # type: ignore UUID, datetime, float, @@ -76,6 +79,7 @@ Column, # type: ignore Sequence, # type: ignore Mapping, # type: ignore + Label, # type: ignore UUID, datetime, float, @@ -94,6 +98,7 @@ Column, # type: ignore Sequence, # type: ignore Mapping, # type: ignore + Label, # type: ignore UUID, datetime, float, @@ -119,6 +124,16 @@ def select(__ent0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore ... +@overload +def select(*entities: _TCCA[_T0]) -> Select[Tuple[_T0, ...]]: # type: ignore + ... + + +@overload +def select(*entities: _TScalar_0) -> Select[Tuple[_TScalar_0, ...]]: # type: ignore + ... + + # Generated overloads start diff --git a/sqlmodel/sql/_expression_select_gen.py.jinja2 b/sqlmodel/sql/_expression_select_gen.py.jinja2 index ef838e4168..6c60bd487b 100644 --- a/sqlmodel/sql/_expression_select_gen.py.jinja2 +++ b/sqlmodel/sql/_expression_select_gen.py.jinja2 @@ -13,6 +13,7 @@ from uuid import UUID from sqlalchemy import ( Column, + Label, ) from sqlalchemy.sql.elements import ( SQLCoreOperations, @@ -39,6 +40,7 @@ _TScalar_{{ i }} = TypeVar( Column, # type: ignore Sequence, # type: ignore Mapping, # type: ignore + Label, # type: ignore UUID, datetime, float, @@ -64,6 +66,16 @@ def select(__ent0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore ... +@overload +def select(*entities: _TCCA[_T0]) -> Select[Tuple[_T0, ...]]: # type: ignore + ... + + +@overload +def select(*entities: _TScalar_0) -> Select[Tuple[_TScalar_0, ...]]: # type: ignore + ... + + # Generated overloads start {% for signature in signatures %} From f1c07f633669267705624b36cddd8fdcc857e06f Mon Sep 17 00:00:00 2001 From: George <44733329+GiorgioPorgio@users.noreply.github.com> Date: Thu, 27 Mar 2025 15:23:41 +0100 Subject: [PATCH 2/2] mypy --- sqlmodel/sql/_expression_select_gen.py | 3 ++- sqlmodel/sql/_expression_select_gen.py.jinja2 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sqlmodel/sql/_expression_select_gen.py b/sqlmodel/sql/_expression_select_gen.py index de67d1e911..625df4e971 100644 --- a/sqlmodel/sql/_expression_select_gen.py +++ b/sqlmodel/sql/_expression_select_gen.py @@ -116,7 +116,8 @@ @overload -def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: ... +def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: # type: ignore + ... @overload diff --git a/sqlmodel/sql/_expression_select_gen.py.jinja2 b/sqlmodel/sql/_expression_select_gen.py.jinja2 index 6c60bd487b..319ec642c9 100644 --- a/sqlmodel/sql/_expression_select_gen.py.jinja2 +++ b/sqlmodel/sql/_expression_select_gen.py.jinja2 @@ -58,7 +58,8 @@ _T{{ i }} = TypeVar("_T{{ i }}") # Generated TypeVars end @overload -def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: ... +def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: # type: ignore + ... @overload