Merge branch 'main' into main

Author: svlandeg

docs/release-notes.md

@@ -2,12 +2,17 @@
 
 ## Latest Changes
 
+### Fixes
+
+* 🐛 Fix attribute handling in `model_dump` for compatibility with the latest Pydantic versions. PR [#1595](https://github.com/fastapi/sqlmodel/pull/1595) by [@spazm](https://github.com/spazm).
+
 ### Docs
 
 * 📝 Fix typo in `docs/tutorial/fastapi/simple-hero-api.md`. PR [#1583](https://github.com/fastapi/sqlmodel/pull/1583) by [@kofi-kusi](https://github.com/kofi-kusi).
 
 ### Internal
 
+* ✅ Add test that runs select with 3 or 4 arguments. PR [#1590](https://github.com/fastapi/sqlmodel/pull/1590) by [@svlandeg](https://github.com/svlandeg).
 * ⬆ Bump mkdocs-macros-plugin from 1.3.9 to 1.4.0. PR [#1581](https://github.com/fastapi/sqlmodel/pull/1581) by [@dependabot[bot]](https://github.com/apps/dependabot).
 * ⬆ Bump mkdocs-material from 9.6.20 to 9.6.21. PR [#1588](https://github.com/fastapi/sqlmodel/pull/1588) by [@dependabot[bot]](https://github.com/apps/dependabot).
 * ⬆ [pre-commit.ci] pre-commit autoupdate. PR [#1584](https://github.com/fastapi/sqlmodel/pull/1584) by [@pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci).

scripts/lint.sh

@@ -4,5 +4,6 @@ set -e
 set -x
 
 mypy sqlmodel
+mypy tests/test_select_typing.py
 ruff check sqlmodel tests docs_src scripts
 ruff format sqlmodel tests docs_src scripts --check

sqlmodel/main.py

@@ -109,7 +109,8 @@ def __dataclass_transform__(
     return lambda a: a
 
 
-class FieldInfo(PydanticFieldInfo):
+class FieldInfo(PydanticFieldInfo):  # type: ignore[misc]
+    # mypy - ignore that PydanticFieldInfo is @final
     def __init__(self, default: Any = Undefined, **kwargs: Any) -> None:
         primary_key = kwargs.pop("primary_key", False)
         nullable = kwargs.pop("nullable", Undefined)
@@ -876,27 +877,27 @@ def model_dump(
         mode: Union[Literal["json", "python"], str] = "python",
         include: Union[IncEx, None] = None,
         exclude: Union[IncEx, None] = None,
-        context: Union[Any, None] = None,
+        context: Union[Any, None] = None,  # v2.7
         by_alias: Union[bool, None] = None,
         exclude_unset: bool = False,
         exclude_defaults: bool = False,
         exclude_none: bool = False,
+        exclude_computed_fields: bool = False,  # v2.12
         round_trip: bool = False,
         warnings: Union[bool, Literal["none", "warn", "error"]] = True,
-        fallback: Union[Callable[[Any], Any], None] = None,
-        serialize_as_any: bool = False,
+        fallback: Union[Callable[[Any], Any], None] = None,  # v2.11
+        serialize_as_any: bool = False,  # v2.7
     ) -> Dict[str, Any]:
         if PYDANTIC_MINOR_VERSION < (2, 11):
             by_alias = by_alias or False
+        extra_kwargs: Dict[str, Any] = {}
         if PYDANTIC_MINOR_VERSION >= (2, 7):
-            extra_kwargs: Dict[str, Any] = {
-                "context": context,
-                "serialize_as_any": serialize_as_any,
-            }
+            extra_kwargs["context"] = context
+            extra_kwargs["serialize_as_any"] = serialize_as_any
         if PYDANTIC_MINOR_VERSION >= (2, 11):
             extra_kwargs["fallback"] = fallback
-        else:
-            extra_kwargs = {}
+        if PYDANTIC_MINOR_VERSION >= (2, 12):
+            extra_kwargs["exclude_computed_fields"] = exclude_computed_fields
         if IS_PYDANTIC_V2:
             return super().model_dump(
                 mode=mode,

tests/test_select_typing.py

@@ -0,0 +1,64 @@
+from typing import Optional
+
+from sqlmodel import Field, Session, SQLModel, create_engine, select
+from sqlmodel.pool import StaticPool
+
+
+def test_fields() -> None:
+    class Hero(SQLModel, table=True):
+        id: Optional[int] = Field(default=None, primary_key=True)
+        name: str
+        secret_name: str
+        age: Optional[int] = None
+        food: Optional[str] = None
+
+    engine = create_engine(
+        "sqlite://", connect_args={"check_same_thread": False}, poolclass=StaticPool
+    )
+
+    SQLModel.metadata.create_all(engine)
+
+    with Session(engine) as session:
+        session.add(Hero(name="Deadpond", secret_name="Dive Wilson"))
+        session.add(
+            Hero(name="Spider-Boy", secret_name="Pedro Parqueador", food="pizza")
+        )
+        session.add(Hero(name="Rusty-Man", secret_name="Tommy Sharp", age=48))
+
+        session.commit()
+
+    # check typing of select with 3 fields
+    with Session(engine) as session:
+        statement_3 = select(Hero.id, Hero.name, Hero.secret_name)
+        results_3 = session.exec(statement_3)
+        for hero_3 in results_3:
+            assert len(hero_3) == 3
+            name_3: str = hero_3[1]
+            assert type(name_3) is str
+            assert type(hero_3[0]) is int
+            assert type(hero_3[2]) is str
+
+    # check typing of select with 4 fields
+    with Session(engine) as session:
+        statement_4 = select(Hero.id, Hero.name, Hero.secret_name, Hero.age)
+        results_4 = session.exec(statement_4)
+        for hero_4 in results_4:
+            assert len(hero_4) == 4
+            name_4: str = hero_4[1]
+            assert type(name_4) is str
+            assert type(hero_4[0]) is int
+            assert type(hero_4[2]) is str
+            assert type(hero_4[3]) in [int, type(None)]
+
+    # check typing of select with 5 fields: currently runs but doesn't pass mypy
+    # with Session(engine) as session:
+    #     statement_5 = select(Hero.id, Hero.name, Hero.secret_name, Hero.age, Hero.food)
+    #     results_5 = session.exec(statement_5)
+    #     for hero_5 in results_5:
+    #         assert len(hero_5) == 5
+    #         name_5: str = hero_5[1]
+    #         assert type(name_5) is str
+    #         assert type(hero_5[0]) is int
+    #         assert type(hero_5[2]) is str
+    #         assert type(hero_5[3]) in [int, type(None)]
+    #         assert type(hero_5[4]) in [str, type(None)]