sqlmodel-mypy-plugin 0.20.0__tar.gz → 0.21.2__tar.gz

{sqlmodel_mypy_plugin-0.20.0 → sqlmodel_mypy_plugin-0.21.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sqlmodel-mypy-plugin
-Version: 0.20.0
+Version: 0.21.2
 Summary: Mypy plugin for SQLModel (better constructor/Field typing).
 Project-URL: Homepage, https://github.com/sertione/sqlmodel-mypy-plugin
 Project-URL: Repository, https://github.com/sertione/sqlmodel-mypy-plugin

{sqlmodel_mypy_plugin-0.20.0 → sqlmodel_mypy_plugin-0.21.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sqlmodel-mypy-plugin"
-version = "0.20.0"
+version = "0.21.2"
 description = "Mypy plugin for SQLModel (better constructor/Field typing)."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -64,6 +64,9 @@ line-length = 100
 target-version = "py310"
 exclude = ["tests/mypy/outputs"]
 
+[tool.ruff.per-file-target-version]
+"tests/mypy/modules/recursive_aliases_pep695.py" = "py312"
+
 [tool.ruff.lint]
 select = [
   "E",  # pycodestyle errors

{sqlmodel_mypy_plugin-0.20.0 → sqlmodel_mypy_plugin-0.21.2}/src/sqlmodel_mypy/plugin.py

@@ -58,6 +58,7 @@ from mypy.types import (
     TypeOfAny,
     TypeType,
     UnionType,
+    UnpackType,
     get_proper_type,
 )
 from mypy.typevars import fill_typevars
@@ -171,7 +172,7 @@ SQLALCHEMY_INSPECT_FULLNAMES = {
 }
 
 # Increment when plugin changes should invalidate mypy cache.
-__version__ = 27
+__version__ = 29
 
 
 class _CollectedField(NamedTuple):
@@ -926,7 +927,7 @@ class SQLModelMypyPlugin(Plugin):
 
         SQLModel's generated stubs traditionally cap `select()` overloads at 4 entities.
         For 5+ entities, fall back to a conservative signature that accepts the call and
-        returns `Select[tuple[Any, ...]]` (represented as a fixed-length tuple of `Any`s).
+        returns a Select with one unknown value per selected entity.
         """
         call = ctx.context
         if not isinstance(call, CallExpr):
@@ -977,7 +978,7 @@ class SQLModelMypyPlugin(Plugin):
         any_t = _plugin_any()
         tuple_fallback = ctx.api.named_generic_type("builtins.tuple", [any_t])
         row_type = TupleType([any_t] * positional_count, tuple_fallback)
-        ret_type = Instance(select_info, [row_type])
+        ret_type = self._instance_with_row_type(select_info, row_type)
 
         fallback = default_items[0].fallback if default_items else tuple_fallback
         arg_types = [any_t] * positional_count
@@ -990,7 +991,7 @@ class SQLModelMypyPlugin(Plugin):
 
         Our signature hook for 5+ args deliberately uses `Any` to avoid "no overload matches"
         errors. Here, once mypy has inferred argument expression types, we recover a more precise
-        `Select[tuple[...]]` element type for the common cases (models + column expressions).
+        row element types for the common cases (models + column expressions).
         """
         call = ctx.context
         if not isinstance(call, CallExpr):
@@ -1012,7 +1013,7 @@ class SQLModelMypyPlugin(Plugin):
         proper_default = get_proper_type(default)
         if not isinstance(proper_default, Instance) or not proper_default.args:
             return default
-        proper_row = get_proper_type(proper_default.args[0])
+        proper_row = get_proper_type(self._instance_row_type(proper_default, ctx.api))
         if not isinstance(proper_row, TupleType):
             return default
 
@@ -1036,7 +1037,7 @@ class SQLModelMypyPlugin(Plugin):
         any_t = _plugin_any()
         tuple_fallback = ctx.api.named_generic_type("builtins.tuple", [any_t])
         row_type = TupleType(items, tuple_fallback)
-        return Instance(proper_default.type, [row_type])
+        return self._instance_with_row_type(proper_default.type, row_type)
 
     def _sqlmodel_select_entity_result_type(self, typ: Type) -> Type:
         """Return the value type produced by an entity passed to `select(...)`.
@@ -1054,6 +1055,9 @@ class SQLModelMypyPlugin(Plugin):
             return UnionType.make_union(
                 [self._sqlmodel_select_entity_result_type(item) for item in proper.items]
             )
+        if isinstance(proper, FunctionLike) and proper.is_type_obj():
+            # Mypy represents a model class expression by its constructor overloads.
+            return UnionType.make_union([item.ret_type for item in proper.items])
         if isinstance(proper, TypeType):
             item = get_proper_type(proper.item)
             if isinstance(item, Instance):
@@ -1371,6 +1375,23 @@ class SQLModelMypyPlugin(Plugin):
         coro = _named_generic_type_or_none(ctx.api, "typing.Coroutine", [any_t, any_t, result_type])
         return coro or default
 
+    @staticmethod
+    def _instance_row_type(instance: Instance, api: Any) -> Type:
+        """Read a row from SQLAlchemy 2.0's tuple or 2.1's variadic arguments."""
+        if instance.type.has_type_var_tuple_type:
+            tuple_fallback = api.named_generic_type("builtins.tuple", [_plugin_any()])
+            return TupleType(list(instance.args), tuple_fallback)
+        return instance.args[0]
+
+    @staticmethod
+    def _instance_with_row_type(info: TypeInfo, row_type: Type) -> Instance:
+        """Use the installed class's generic shape, without guessing package versions."""
+        if info.has_type_var_tuple_type:
+            proper_row = get_proper_type(row_type)
+            args = proper_row.items if isinstance(proper_row, TupleType) else [UnpackType(row_type)]
+            return Instance(info, args)
+        return Instance(info, [row_type])
+
     def _row_tuple_type_from_typed_statement(self, statement: Type, api: Any) -> Type | None:
         """Infer the row tuple type produced by a SQL statement (best-effort)."""
         proper = get_proper_type(statement)
@@ -1385,12 +1406,12 @@ class SQLModelMypyPlugin(Plugin):
             tuple_fallback = api.named_generic_type("builtins.tuple", [any_t])
             return TupleType([scalar_t], tuple_fallback)
 
-        # SQLModel Select[T] and SQLAlchemy Select[_TP] both store the row parameter in the first type argument.
+        # SQLAlchemy 2.1 and SQLModel 0.0.48 use variadic row parameters.
         if proper.type.fullname in {
             SQLMODEL_SELECT_CLS_FULLNAME,
             SQLALCHEMY_SELECT_FULLNAME,
         } or proper.type.has_base(SQLALCHEMY_SELECT_FULLNAME):
-            return proper.args[0]
+            return self._instance_row_type(proper, api)
 
         return None
 
@@ -1399,11 +1420,10 @@ class SQLModelMypyPlugin(Plugin):
         for fullname in ("sqlalchemy.engine.Result", "sqlalchemy.engine.result.Result"):
             inst = _named_generic_type_or_none(api, fullname, [row_tuple_type])
             if inst is not None:
-                return inst
+                return self._instance_with_row_type(inst.type, row_tuple_type)
             info = _lookup_typeinfo(self, fullname)
             if info is not None:
-                args = [row_tuple_type] * len(info.defn.type_vars)
-                return Instance(info, args)
+                return self._instance_with_row_type(info, row_tuple_type)
         return None
 
     def _sqlalchemy_select_join_return_type_callback(self, ctx: MethodContext) -> Type:
@@ -1661,7 +1681,7 @@ class SQLModelMypyPlugin(Plugin):
         if not receiver.args:
             return ctx.default_return_type
 
-        tp = get_proper_type(receiver.args[0])
+        tp = get_proper_type(self._instance_row_type(receiver, ctx.api))
         if not isinstance(tp, TupleType):
             return ctx.default_return_type
 
@@ -1682,7 +1702,7 @@ class SQLModelMypyPlugin(Plugin):
             return ctx.default_return_type
 
         new_tp = tp.copy_modified(items=new_items)
-        return Instance(receiver.type, [new_tp])
+        return self._instance_with_row_type(receiver.type, new_tp)
 
     def _sqlmodel_class_attr_type_callback(self, ctx: AttributeContext) -> Type:
         if ctx.is_lvalue:

{sqlmodel_mypy_plugin-0.20.0 → sqlmodel_mypy_plugin-0.21.2}/src/sqlmodel_mypy/transform.py

@@ -448,8 +448,9 @@ class ForceInvariantTypeVars(TypeTranslator):
         return modified
 
     def visit_type_alias_type(self, t: TypeAliasType) -> Type:  # noqa: D102
-        # Expand type aliases and then continue translation.
-        return get_proper_type(t).accept(self)
+        # Alias targets can refer back to themselves. Preserve their graph and
+        # translate only the supplied arguments, like mypy's ExpandTypeVisitor.
+        return t.copy_modified(args=[arg.accept(self) for arg in t.args])
 
 
 class SQLModelField:

sqlmodel_mypy_plugin-0.21.2/tests/mypy/configs/mypy-plugin-recursive.ini

@@ -0,0 +1,10 @@
+[mypy]
+plugins = sqlmodel_mypy.plugin
+follow_imports = silent
+strict = true
+python_version = 3.12
+
+[sqlmodel-mypy]
+init_forbid_extra = true
+init_typed = true
+warn_untyped_fields = true

{sqlmodel_mypy_plugin-0.20.0 → sqlmodel_mypy_plugin-0.21.2}/tests/mypy/modules/execution_options.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from sqlmodel import Field, Session, SQLModel, create_engine, select
-from sqlmodel.sql._expression_select_cls import Select as SQLModelSelect
 
 
 class Team(SQLModel, table=True):
@@ -21,7 +20,7 @@ stmt = select(Hero, Team).join(Team, isouter=True).execution_options(populate_ex
 
 # `execution_options()` should preserve the `Select[...]` generic, including outer-join `None`
 # propagation for the joined entity.
-ok_stmt: SQLModelSelect[tuple[Hero, Team | None]] = stmt
+ok_stmt = stmt
 
 with Session(engine) as session:
     for hero, team in session.exec(stmt):

sqlmodel_mypy_plugin-0.21.2/tests/mypy/modules/recursive_aliases.py

@@ -0,0 +1,35 @@
+from __future__ import annotations
+
+from typing import Generic, TypeAlias, TypeVar
+
+from sqlmodel import SQLModel
+
+JsonObject: TypeAlias = list["JsonObject"]
+JsonValue: TypeAlias = str | int | None | list["JsonValue"] | dict[str, "JsonValue"]
+
+
+class RecursiveTable(SQLModel, table=True):
+    field: JsonObject
+
+
+class Payload(SQLModel):
+    value: JsonValue
+
+
+RecursiveTable(field=[[], [[]]])
+RecursiveTable(field="invalid")
+RecursiveTable.model_construct(field=[[]])
+RecursiveTable.model_construct(field=123)
+Payload(value={"nested": ["text", 1, None]})
+Payload(value=object())
+
+T_co = TypeVar("T_co", covariant=True)
+Values: TypeAlias = list[T_co]
+
+
+class Box(SQLModel, Generic[T_co]):
+    values: Values[T_co]
+
+
+Box[int](values=[1])
+Box[int](values=["invalid"])

sqlmodel_mypy_plugin-0.21.2/tests/mypy/modules/recursive_aliases_pep695.py

@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+from sqlmodel import SQLModel
+
+type JsonObject = list[JsonObject]
+type JsonValue = str | int | None | list[JsonValue] | dict[str, JsonValue]
+type Left = list[Right]
+type Right = dict[str, Left]
+
+
+class RecursiveTable(SQLModel, table=True):
+    field: JsonObject
+
+
+class Payload(SQLModel):
+    value: JsonValue
+    mutual: Left
+
+
+RecursiveTable(field=[[], [[]]])
+RecursiveTable(field="invalid")
+RecursiveTable.model_construct(field=[[]])
+RecursiveTable.model_construct(field=123)
+Payload(value={"nested": ["text", 1, None]}, mutual=[{"child": []}])
+Payload(value=object(), mutual=[])
+Payload(value=None, mutual=[123])

sqlmodel_mypy_plugin-0.21.2/tests/mypy/modules/row_generics.py

@@ -0,0 +1,41 @@
+from __future__ import annotations
+
+from sqlalchemy import select as sa_select
+from sqlmodel import Field, Session, SQLModel, create_engine, select
+
+
+class Team(SQLModel, table=True):
+    id: int | None = Field(default=None, primary_key=True)
+    name: str
+
+
+class Hero(SQLModel, table=True):
+    id: int | None = Field(default=None, primary_key=True)
+    name: str
+    team_id: int | None = Field(default=None, foreign_key="team.id")
+
+
+engine = create_engine("sqlite://")
+# The 5+ entity fallback and outer-join nullability must compose.
+statement = select(Hero, Team, Hero.id, Team.id, Hero.name).outerjoin(Team)
+with Session(engine) as session:
+    for hero, team, hero_id, _team_id, name in session.exec(statement):
+        ok_hero: Hero = hero
+        ok_team: Team | None = team
+        ok_id: int | None = hero_id
+        ok_name: str = name
+        bad_team: Team = team
+        bad_id: int = hero_id
+        bad_name: int = name
+
+# A SQLModel select must preserve column arity when executed on a Core connection.
+with engine.connect() as connection:
+    for hero_id2, name2, _team_id2, _team_name2, _repeated_id in connection.execute(
+        select(Hero.id, Hero.name, Hero.team_id, Team.name, Hero.id)
+    ):
+        ok_name2: str = name2
+        bad_id2: int = hero_id2
+        bad_name2: int = name2
+    for hero3, team3 in connection.execute(sa_select(Hero, Team).outerjoin(Team)):
+        ok_hero3: Hero = hero3
+        bad_team3: Team = team3

{sqlmodel_mypy_plugin-0.20.0 → sqlmodel_mypy_plugin-0.21.2}/tests/mypy/modules/select_varargs.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from sqlmodel import Field, Session, SQLModel, create_engine, select
-from sqlmodel.sql._expression_select_cls import Select as SQLModelSelect
 
 
 class Team(SQLModel, table=True):
@@ -19,7 +18,7 @@ class Hero(SQLModel, table=True):
 stmt = select(Hero, Team, Hero.id, Team.id, Hero.name)
 
 # Prefer returning SQLModel's own `Select[...]` wrapper, with best-effort element typing.
-ok_stmt: SQLModelSelect[tuple[Hero, Team, int | None, int | None, str]] = stmt
+ok_stmt = stmt
 
 engine = create_engine("sqlite://")
 

{sqlmodel_mypy_plugin-0.20.0 → sqlmodel_mypy_plugin-0.21.2}/tests/mypy/modules/session_execute_typed.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from sqlalchemy.engine.result import Result
 from sqlmodel import Field, Session, SQLModel, create_engine, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
@@ -16,7 +15,9 @@ with Session(engine) as session:
     result = session.execute(select(Hero))
 
     # When `typed_execute=true`, `execute(select(Model))` should not degrade to `Result[Any]`.
-    ok_result: Result[tuple[Hero]] = result
+    row = result.one()
+    ok_row_hero: Hero = row[0]
+    bad_row_bool: bool = row[0]
 
     ok_hero: Hero = result.scalars().one()
     bad_bool: bool = result.scalars().one()
@@ -30,3 +31,12 @@ async def async_execute(session: AsyncSession) -> None:
     result3 = await session.execute(select(Hero))
     _ok_hero2: Hero = result3.scalars().one()
     _bad_bool2: bool = result3.scalars().one()
+
+
+async def async_execute_columns(session: AsyncSession) -> None:
+    result = await session.execute(select(Hero.id, Hero.name))
+    for hero_id, hero_name in result:
+        _ok_id: int | None = hero_id
+        _ok_name: str = hero_name
+        _bad_id: int = hero_id
+        _bad_name: int = hero_name

sqlmodel_mypy_plugin-0.21.2/tests/mypy/outputs/mypy-plugin-recursive_ini/recursive_aliases_pep695.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from sqlmodel import SQLModel
+
+type JsonObject = list[JsonObject]
+type JsonValue = str | int | None | list[JsonValue] | dict[str, JsonValue]
+type Left = list[Right]
+type Right = dict[str, Left]
+
+
+class RecursiveTable(SQLModel, table=True):
+    field: JsonObject
+
+
+class Payload(SQLModel):
+    value: JsonValue
+    mutual: Left
+
+
+RecursiveTable(field=[[], [[]]])
+RecursiveTable(field="invalid")
+# MYPY: error: Argument "field" to "__init__" of "RecursiveTable" has incompatible type "str"; expected "JsonObject"  [arg-type]
+RecursiveTable.model_construct(field=[[]])
+RecursiveTable.model_construct(field=123)
+# MYPY: error: Argument "field" to "model_construct" of "RecursiveTable" has incompatible type "int"; expected "JsonObject"  [arg-type]
+Payload(value={"nested": ["text", 1, None]}, mutual=[{"child": []}])
+Payload(value=object(), mutual=[])
+# MYPY: error: Argument "value" to "__init__" of "Payload" has incompatible type "object"; expected "JsonValue"  [arg-type]
+Payload(value=None, mutual=[123])
+# MYPY: error: List item 0 has incompatible type "int"; expected "dict[str, Left]"  [list-item]

{sqlmodel_mypy_plugin-0.20.0 → sqlmodel_mypy_plugin-0.21.2}/tests/mypy/outputs/mypy-plugin-strict-typed-execute_ini/session_execute_typed.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from sqlalchemy.engine.result import Result
 from sqlmodel import Field, Session, SQLModel, create_engine, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
@@ -16,7 +15,9 @@ with Session(engine) as session:
     result = session.execute(select(Hero))
 
     # When `typed_execute=true`, `execute(select(Model))` should not degrade to `Result[Any]`.
-    ok_result: Result[tuple[Hero]] = result
+    row = result.one()
+    ok_row_hero: Hero = row[0]
+    bad_row_bool: bool = row[0]
 
     ok_hero: Hero = result.scalars().one()
     bad_bool: bool = result.scalars().one()
@@ -33,3 +34,12 @@ async def async_execute(session: AsyncSession) -> None:
     _ok_hero2: Hero = result3.scalars().one()
     _bad_bool2: bool = result3.scalars().one()
 # MYPY: error: Incompatible types in assignment (expression has type "Hero", variable has type "bool")  [assignment]
+
+
+async def async_execute_columns(session: AsyncSession) -> None:
+    result = await session.execute(select(Hero.id, Hero.name))
+    for hero_id, hero_name in result:
+        _ok_id: int | None = hero_id
+        _ok_name: str = hero_name
+        _bad_id: int = hero_id
+        _bad_name: int = hero_name

{sqlmodel_mypy_plugin-0.20.0/tests/mypy/outputs/mypy-plugin_ini → sqlmodel_mypy_plugin-0.21.2/tests/mypy/outputs/mypy-plugin-strict_ini}/execution_options.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from sqlmodel import Field, Session, SQLModel, create_engine, select
-from sqlmodel.sql._expression_select_cls import Select as SQLModelSelect
 
 
 class Team(SQLModel, table=True):
@@ -21,7 +20,7 @@ stmt = select(Hero, Team).join(Team, isouter=True).execution_options(populate_ex
 
 # `execution_options()` should preserve the `Select[...]` generic, including outer-join `None`
 # propagation for the joined entity.
-ok_stmt: SQLModelSelect[tuple[Hero, Team | None]] = stmt
+ok_stmt = stmt
 
 with Session(engine) as session:
     for hero, team in session.exec(stmt):

sqlmodel_mypy_plugin-0.21.2/tests/mypy/outputs/mypy-plugin-strict_ini/recursive_aliases.py

@@ -0,0 +1,39 @@
+from __future__ import annotations
+
+from typing import Generic, TypeAlias, TypeVar
+
+from sqlmodel import SQLModel
+
+JsonObject: TypeAlias = list["JsonObject"]
+JsonValue: TypeAlias = str | int | None | list["JsonValue"] | dict[str, "JsonValue"]
+
+
+class RecursiveTable(SQLModel, table=True):
+    field: JsonObject
+
+
+class Payload(SQLModel):
+    value: JsonValue
+
+
+RecursiveTable(field=[[], [[]]])
+RecursiveTable(field="invalid")
+# MYPY: error: Argument "field" to "__init__" of "RecursiveTable" has incompatible type "str"; expected "JsonObject"  [arg-type]
+RecursiveTable.model_construct(field=[[]])
+RecursiveTable.model_construct(field=123)
+# MYPY: error: Argument "field" to "model_construct" of "RecursiveTable" has incompatible type "int"; expected "JsonObject"  [arg-type]
+Payload(value={"nested": ["text", 1, None]})
+Payload(value=object())
+# MYPY: error: Argument "value" to "__init__" of "Payload" has incompatible type "object"; expected "JsonValue"  [arg-type]
+
+T_co = TypeVar("T_co", covariant=True)
+Values: TypeAlias = list[T_co]
+
+
+class Box(SQLModel, Generic[T_co]):
+    values: Values[T_co]
+
+
+Box[int](values=[1])
+Box[int](values=["invalid"])
+# MYPY: error: List item 0 has incompatible type "str"; expected "int"  [list-item]

sqlmodel_mypy_plugin-0.21.2/tests/mypy/outputs/mypy-plugin-strict_ini/select_varargs.py

@@ -0,0 +1,35 @@
+from __future__ import annotations
+
+from sqlmodel import Field, Session, SQLModel, create_engine, select
+
+
+class Team(SQLModel, table=True):
+    id: int | None = Field(default=None, primary_key=True)
+    name: str = Field()
+
+
+class Hero(SQLModel, table=True):
+    id: int | None = Field(default=None, primary_key=True)
+    name: str = Field()
+    team_id: int | None = Field(default=None, foreign_key="team.id")
+
+
+# SQLModel's generated `select()` overloads cap at 4 entities; ensure 5+ works.
+stmt = select(Hero, Team, Hero.id, Team.id, Hero.name)
+
+# Prefer returning SQLModel's own `Select[...]` wrapper, with best-effort element typing.
+ok_stmt = stmt
+
+engine = create_engine("sqlite://")
+
+with Session(engine) as session:
+    for hero, team, hero_id, team_id, hero_name in session.exec(stmt):
+        ok_hero: Hero = hero
+        ok_team: Team = team
+        ok_team_id: int | None = team_id
+        ok_hero_name: str = hero_name
+
+        # `Hero.id` is optional at the type level.
+        bad_hero_id: int = hero_id
+        if hero_id is not None:
+            ok_hero_id: int = hero_id

{sqlmodel_mypy_plugin-0.20.0/tests/mypy/outputs/mypy-plugin-strict_ini → sqlmodel_mypy_plugin-0.21.2/tests/mypy/outputs/mypy-plugin_ini}/execution_options.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from sqlmodel import Field, Session, SQLModel, create_engine, select
-from sqlmodel.sql._expression_select_cls import Select as SQLModelSelect
 
 
 class Team(SQLModel, table=True):
@@ -21,7 +20,7 @@ stmt = select(Hero, Team).join(Team, isouter=True).execution_options(populate_ex
 
 # `execution_options()` should preserve the `Select[...]` generic, including outer-join `None`
 # propagation for the joined entity.
-ok_stmt: SQLModelSelect[tuple[Hero, Team | None]] = stmt
+ok_stmt = stmt
 
 with Session(engine) as session:
     for hero, team in session.exec(stmt):

sqlmodel_mypy_plugin-0.21.2/tests/mypy/outputs/mypy-plugin_ini/select_varargs.py

@@ -0,0 +1,35 @@
+from __future__ import annotations
+
+from sqlmodel import Field, Session, SQLModel, create_engine, select
+
+
+class Team(SQLModel, table=True):
+    id: int | None = Field(default=None, primary_key=True)
+    name: str = Field()
+
+
+class Hero(SQLModel, table=True):
+    id: int | None = Field(default=None, primary_key=True)
+    name: str = Field()
+    team_id: int | None = Field(default=None, foreign_key="team.id")
+
+
+# SQLModel's generated `select()` overloads cap at 4 entities; ensure 5+ works.
+stmt = select(Hero, Team, Hero.id, Team.id, Hero.name)
+
+# Prefer returning SQLModel's own `Select[...]` wrapper, with best-effort element typing.
+ok_stmt = stmt
+
+engine = create_engine("sqlite://")
+
+with Session(engine) as session:
+    for hero, team, hero_id, team_id, hero_name in session.exec(stmt):
+        ok_hero: Hero = hero
+        ok_team: Team = team
+        ok_team_id: int | None = team_id
+        ok_hero_name: str = hero_name
+
+        # `Hero.id` is optional at the type level.
+        bad_hero_id: int = hero_id
+        if hero_id is not None:
+            ok_hero_id: int = hero_id

sqlmodel_mypy_plugin-0.21.2/tests/mypy/outputs/sqlalchemy-2.1/mypy-plugin-strict-typed-execute_ini/session_execute_typed.py

@@ -0,0 +1,48 @@
+from __future__ import annotations
+
+from sqlmodel import Field, Session, SQLModel, create_engine, select
+from sqlmodel.ext.asyncio.session import AsyncSession
+
+
+class Hero(SQLModel, table=True):
+    id: int | None = Field(default=None, primary_key=True)
+    name: str = Field()
+
+
+engine = create_engine("sqlite://")
+
+with Session(engine) as session:
+    result = session.execute(select(Hero))
+
+    # When `typed_execute=true`, `execute(select(Model))` should not degrade to `Result[Any]`.
+    row = result.one()
+    ok_row_hero: Hero = row[0]
+    bad_row_bool: bool = row[0]
+# MYPY: error: Incompatible types in assignment (expression has type "Hero", variable has type "bool")  [assignment]
+
+    ok_hero: Hero = result.scalars().one()
+    bad_bool: bool = result.scalars().one()
+# MYPY: error: Incompatible types in assignment (expression has type "Hero", variable has type "bool")  [assignment]
+
+    result2 = session.execute(select(Hero.id))
+    ok_id: int | None = result2.scalars().one()
+    bad_id: int = result2.scalars().one()
+# MYPY: error: Incompatible types in assignment (expression has type "int | None", variable has type "int")  [assignment]
+
+
+async def async_execute(session: AsyncSession) -> None:
+    result3 = await session.execute(select(Hero))
+    _ok_hero2: Hero = result3.scalars().one()
+    _bad_bool2: bool = result3.scalars().one()
+# MYPY: error: Incompatible types in assignment (expression has type "Hero", variable has type "bool")  [assignment]
+
+
+async def async_execute_columns(session: AsyncSession) -> None:
+    result = await session.execute(select(Hero.id, Hero.name))
+    for hero_id, hero_name in result:
+        _ok_id: int | None = hero_id
+        _ok_name: str = hero_name
+        _bad_id: int = hero_id
+# MYPY: error: Incompatible types in assignment (expression has type "int | None", variable has type "int")  [assignment]
+        _bad_name: int = hero_name
+# MYPY: error: Incompatible types in assignment (expression has type "str", variable has type "int")  [assignment]