Merge branch 'main' into dependabot/pip/mypy-1.18.1

svlandeg · svlandeg · commit 94a7d1a61dbe · 2025-09-26T15:41:48.000+02:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,17 +25,30 @@ jobs:
   test:
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
-        python-version:
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-          - "3.12"
-          - "3.13"
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        python-version: [ "3.13" ]
         pydantic-version:
           - pydantic-v1
           - pydantic-v2
+        include:
+          - os: macos-latest
+            python-version: "3.8"
+            pydantic-version: pydantic-v1
+          - os: windows-latest
+            python-version: "3.9"
+            pydantic-version: pydantic-v2
+          - os: ubuntu-latest
+            python-version: "3.10"
+            pydantic-version: pydantic-v1
+          - os: macos-latest
+            python-version: "3.11"
+            pydantic-version: pydantic-v2
+          - os: windows-latest
+            python-version: "3.12"
+            pydantic-version: pydantic-v1
+          - os: ubuntu-latest
+            python-version: "3.12"
+            pydantic-version: pydantic-v2
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -78,7 +91,7 @@ jobs:
       - name: Store coverage files
         uses: actions/upload-artifact@v4
         with:
-          name: coverage-${{ matrix.python-version }}-${{ matrix.pydantic-version }}
+          name: coverage-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pydantic-version }}
           path: coverage
           include-hidden-files: true
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -14,7 +14,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.0
+    rev: v0.13.1
     hooks:
     -   id: ruff
         args:
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -2,6 +2,20 @@
 
 ## Latest Changes
 
+### Internal
+
+* ⬆ Bump typing-extensions from 4.13.2 to 4.15.0 for Python 3.9+. PR [#1580](https://github.com/fastapi/sqlmodel/pull/1580) by [@svlandeg](https://github.com/svlandeg).
+* ⬆ [pre-commit.ci] pre-commit autoupdate. PR [#1571](https://github.com/fastapi/sqlmodel/pull/1571) by [@pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci).
+* ⬆ Bump typer from 0.17.4 to 0.19.2. PR [#1573](https://github.com/fastapi/sqlmodel/pull/1573) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump ruff from 0.13.0 to 0.13.2. PR [#1576](https://github.com/fastapi/sqlmodel/pull/1576) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* 💚 Fix CI test suite for Windows and MacOS. PR [#1307](https://github.com/fastapi/sqlmodel/pull/1307) by [@svlandeg](https://github.com/svlandeg).
+
+## 0.0.25
+
+### Features
+
+* ✨ Add overload for `exec` method to support `insert`, `update`, `delete` statements. PR [#1342](https://github.com/fastapi/sqlmodel/pull/1342) by [@seriaati](https://github.com/seriaati).
+
 ### Upgrades
 
 * ⬆️ Drop support for Python 3.7, require Python 3.8 or above. PR [#1316](https://github.com/fastapi/sqlmodel/pull/1316) by [@svlandeg](https://github.com/svlandeg).
diff --git a/pyproject.toml b/pyproject.toml
@@ -81,6 +81,7 @@ source = [
 ]
 context = '${CONTEXT}'
 dynamic_context = "test_function"
+relative_files = true
 
 [tool.coverage.report]
 show_missing = true
diff --git a/requirements-docs.txt b/requirements-docs.txt
@@ -13,6 +13,6 @@ cairosvg==2.8.2
 # mkdocstrings[python]==0.25.1
 griffe-typingdoc==0.2.9
 # For griffe, it formats with black
-typer == 0.17.4
+typer == 0.19.2
 mkdocs-macros-plugin==1.3.9
 markdown-include-variants==0.0.4
diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -3,10 +3,12 @@
 pytest >=7.0.1,<9.0.0
 coverage[toml] >=6.2,<8.0
 mypy ==1.14.1
-ruff ==0.13.0
+ruff ==0.13.2
 # For FastAPI tests
 fastapi >=0.103.2
 httpx ==0.28.1
 dirty-equals ==0.9.0
 jinja2 ==3.1.6
-typing-extensions ==4.13.2
+# Remove when support for Python 3.8 is dropped
+typing-extensions ==4.13.2; python_version < "3.9"
+typing-extensions ==4.15.0; python_version >= "3.9"
diff --git a/sqlmodel/__init__.py b/sqlmodel/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.0.24"
+__version__ = "0.0.25"
 
 # Re-export from SQLAlchemy
 from sqlalchemy.engine import create_engine as create_engine
diff --git a/sqlmodel/ext/asyncio/session.py b/sqlmodel/ext/asyncio/session.py
@@ -12,13 +12,15 @@
 )
 
 from sqlalchemy import util
+from sqlalchemy.engine.cursor import CursorResult
 from sqlalchemy.engine.interfaces import _CoreAnyExecuteParams
 from sqlalchemy.engine.result import Result, ScalarResult, TupleResult
 from sqlalchemy.ext.asyncio import AsyncSession as _AsyncSession
 from sqlalchemy.ext.asyncio.result import _ensure_sync_result
 from sqlalchemy.ext.asyncio.session import _EXECUTE_OPTIONS
 from sqlalchemy.orm._typing import OrmExecuteOptionsParameter
 from sqlalchemy.sql.base import Executable as _Executable
+from sqlalchemy.sql.dml import UpdateBase
 from sqlalchemy.util.concurrency import greenlet_spawn
 from typing_extensions import deprecated
 
@@ -57,20 +59,35 @@ async def exec(
         _add_event: Optional[Any] = None,
     ) -> ScalarResult[_TSelectParam]: ...
 
+    @overload
+    async def exec(
+        self,
+        statement: UpdateBase,
+        *,
+        params: Optional[Union[Mapping[str, Any], Sequence[Mapping[str, Any]]]] = None,
+        execution_options: Mapping[str, Any] = util.EMPTY_DICT,
+        bind_arguments: Optional[Dict[str, Any]] = None,
+        _parent_execute_state: Optional[Any] = None,
+        _add_event: Optional[Any] = None,
+    ) -> CursorResult[Any]: ...
+
     async def exec(
         self,
         statement: Union[
             Select[_TSelectParam],
             SelectOfScalar[_TSelectParam],
             Executable[_TSelectParam],
+            UpdateBase,
         ],
         *,
         params: Optional[Union[Mapping[str, Any], Sequence[Mapping[str, Any]]]] = None,
         execution_options: Mapping[str, Any] = util.EMPTY_DICT,
         bind_arguments: Optional[Dict[str, Any]] = None,
         _parent_execute_state: Optional[Any] = None,
         _add_event: Optional[Any] = None,
-    ) -> Union[TupleResult[_TSelectParam], ScalarResult[_TSelectParam]]:
+    ) -> Union[
+        TupleResult[_TSelectParam], ScalarResult[_TSelectParam], CursorResult[Any]
+    ]:
         if execution_options:
             execution_options = util.immutabledict(execution_options).union(
                 _EXECUTE_OPTIONS
diff --git a/sqlmodel/orm/session.py b/sqlmodel/orm/session.py
@@ -10,13 +10,15 @@
 )
 
 from sqlalchemy import util
+from sqlalchemy.engine.cursor import CursorResult
 from sqlalchemy.engine.interfaces import _CoreAnyExecuteParams
 from sqlalchemy.engine.result import Result, ScalarResult, TupleResult
 from sqlalchemy.orm import Query as _Query
 from sqlalchemy.orm import Session as _Session
 from sqlalchemy.orm._typing import OrmExecuteOptionsParameter
 from sqlalchemy.sql._typing import _ColumnsClauseArgument
 from sqlalchemy.sql.base import Executable as _Executable
+from sqlalchemy.sql.dml import UpdateBase
 from sqlmodel.sql.base import Executable
 from sqlmodel.sql.expression import Select, SelectOfScalar
 from typing_extensions import deprecated
@@ -49,20 +51,35 @@ def exec(
         _add_event: Optional[Any] = None,
     ) -> ScalarResult[_TSelectParam]: ...
 
+    @overload
+    def exec(
+        self,
+        statement: UpdateBase,
+        *,
+        params: Optional[Union[Mapping[str, Any], Sequence[Mapping[str, Any]]]] = None,
+        execution_options: Mapping[str, Any] = util.EMPTY_DICT,
+        bind_arguments: Optional[Dict[str, Any]] = None,
+        _parent_execute_state: Optional[Any] = None,
+        _add_event: Optional[Any] = None,
+    ) -> CursorResult[Any]: ...
+
     def exec(
         self,
         statement: Union[
             Select[_TSelectParam],
             SelectOfScalar[_TSelectParam],
             Executable[_TSelectParam],
+            UpdateBase,
         ],
         *,
         params: Optional[Union[Mapping[str, Any], Sequence[Mapping[str, Any]]]] = None,
         execution_options: Mapping[str, Any] = util.EMPTY_DICT,
         bind_arguments: Optional[Dict[str, Any]] = None,
         _parent_execute_state: Optional[Any] = None,
         _add_event: Optional[Any] = None,
-    ) -> Union[TupleResult[_TSelectParam], ScalarResult[_TSelectParam]]:
+    ) -> Union[
+        TupleResult[_TSelectParam], ScalarResult[_TSelectParam], CursorResult[Any]
+    ]:
         results = super().execute(
             statement,
             params=params,
diff --git a/tests/test_select_gen.py b/tests/test_select_gen.py
@@ -13,7 +13,7 @@ def test_select_gen() -> None:
     env = os.environ.copy()
     env["CHECK_JINJA"] = "1"
     result = subprocess.run(
-        [sys.executable, "scripts/generate_select.py"],
+        [sys.executable, Path("scripts") / "generate_select.py"],
         env=env,
         check=True,
         cwd=root_path,

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ source = [`
`81`	`81`	`]`
`82`	`82`	`context = '${CONTEXT}'`
`83`	`83`	`dynamic_context = "test_function"`
	`84`	`+relative_files = true`
`84`	`85`
`85`	`86`	`[tool.coverage.report]`
`86`	`87`	`show_missing = true`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = "0.0.24"`
	`1`	`+__version__ = "0.0.25"`
`2`	`2`
`3`	`3`	`# Re-export from SQLAlchemy`
`4`	`4`	`from sqlalchemy.engine import create_engine as create_engine`