test: add missing async test update

SLLau · SLLau · commit bca1a7b99f88 · 2022-10-18T11:57:37.000+13:00
refactor: mypy issues with annotations refactor: simplify async session using SQLmodel to pass mypy use typdef Annotation see https://pydantic-docs.helpmanual.io/usage/schema/#typingannotated-fields
diff --git a/docs_src/tutorial_async/connect_async/update_async/tutorial001_async.py b/docs_src/tutorial_async/connect_async/update_async/tutorial001_async.py
diff --git a/docs_src/tutorial_async/select_async/tutorial001_async.py b/docs_src/tutorial_async/select_async/tutorial001_async.py
@@ -1,14 +1,14 @@
 import asyncio
-from typing import Optional
+from typing import Annotated, Optional
 
 from sqlalchemy.ext.asyncio import create_async_engine
-from sqlalchemy.orm import sessionmaker
-from sqlmodel import Field, Session, SQLModel, select
+
+from sqlmodel import Field, SQLModel, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 
 class Hero(SQLModel, table=True):
-    id: Optional[int] = Field(default=None, primary_key=True)
+    id: Annotated[int, Field(primary_key=True)]
     name: str
     secret_name: str
     age: Optional[int] = None
@@ -34,8 +34,7 @@ async def create_heroes():
     hero_2 = Hero(name="Spider-Boy", secret_name="Pedro Parqueador")
     hero_3 = Hero(name="Rusty-Man", secret_name="Tommy Sharp", age=48)
 
-    async_session = sessionmaker(engine, expire_on_commit=False, class_=AsyncSession)
-    async with async_session() as session:
+    async with AsyncSession(engine) as session:
         session.add(hero_1)
         session.add(hero_2)
         session.add(hero_3)
@@ -44,8 +43,7 @@ async def create_heroes():
 
 
 async def select_heroes():
-    async_session = sessionmaker(engine, expire_on_commit=False, class_=AsyncSession)
-    async with async_session() as session:
+    async with AsyncSession(engine) as session:
         statement = select(Hero)
         results = await session.exec(statement)
         for hero in results:
@@ -59,4 +57,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    asyncio.run(main)
+    asyncio.run(main())
diff --git a/docs_src/tutorial_async/select_async/tutorial002_async.py b/docs_src/tutorial_async/select_async/tutorial002_async.py
@@ -1,14 +1,14 @@
 import asyncio
-from typing import Optional
+from typing import Annotated, Optional
 
 from sqlalchemy.ext.asyncio import create_async_engine
-from sqlalchemy.orm import sessionmaker
-from sqlmodel import Field, Session, SQLModel, select
+
+from sqlmodel import Field, SQLModel, select
 from sqlmodel.ext.asyncio.session import AsyncSession  # (1)
 
 
 class Hero(SQLModel, table=True):  # (2)
-    id: Optional[int] = Field(default=None, primary_key=True)
+    id: Annotated[int, Field(primary_key=True)]
     name: str
     secret_name: str
     age: Optional[int] = None
@@ -33,8 +33,7 @@ async def create_heroes():
     hero_2 = Hero(name="Spider-Boy", secret_name="Pedro Parqueador")
     hero_3 = Hero(name="Rusty-Man", secret_name="Tommy Sharp", age=48)
 
-    async_session = sessionmaker(engine, expire_on_commit=False, class_=AsyncSession)
-    async with async_session() as session:  # (6)
+    async with AsyncSession(engine) as session:  # (6)
         session.add(hero_1)
         session.add(hero_2)
         session.add(hero_3)
@@ -43,8 +42,7 @@ async def create_heroes():
 
 
 async def select_heroes():
-    async_session = sessionmaker(engine, expire_on_commit=False, class_=AsyncSession)
-    async with async_session() as session:  # (7)
+    async with AsyncSession(engine) as session:  # (7)
         statement = select(Hero)  # (8)
         results = await session.exec(statement)  # (9)
         for hero in results:  # (10)
@@ -59,4 +57,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    asyncio.run(main)
+    asyncio.run(main())
diff --git a/docs_src/tutorial_async/select_async/tutorial003_async.py b/docs_src/tutorial_async/select_async/tutorial003_async.py
@@ -1,14 +1,14 @@
 import asyncio
-from typing import Optional
+from typing import Annotated, Optional
 
 from sqlalchemy.ext.asyncio import create_async_engine
-from sqlalchemy.orm import sessionmaker
-from sqlmodel import Field, Session, SQLModel, select
+
+from sqlmodel import Field, SQLModel, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 
 class Hero(SQLModel, table=True):
-    id: Optional[int] = Field(default=None, primary_key=True)
+    id: Annotated[int, Field(primary_key=True)]
     name: str
     secret_name: str
     age: Optional[int] = None
@@ -33,8 +33,7 @@ async def create_heroes():
     hero_2 = Hero(name="Spider-Boy", secret_name="Pedro Parqueador")
     hero_3 = Hero(name="Rusty-Man", secret_name="Tommy Sharp", age=48)
 
-    async_session = sessionmaker(engine, expire_on_commit=False, class_=AsyncSession)
-    async with async_session() as session:
+    async with AsyncSession(engine) as session:
         session.add(hero_1)
         session.add(hero_2)
         session.add(hero_3)
@@ -43,8 +42,7 @@ async def create_heroes():
 
 
 async def select_heroes():
-    async_session = sessionmaker(engine, expire_on_commit=False, class_=AsyncSession)
-    async with async_session() as session:
+    async with AsyncSession(engine) as session:
         statement = select(Hero)
         results = await session.exec(statement)
         heroes = results.all()
@@ -58,4 +56,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    asyncio.run(main)
+    asyncio.run(main())
diff --git a/docs_src/tutorial_async/select_async/tutorial004_async.py b/docs_src/tutorial_async/select_async/tutorial004_async.py
@@ -1,14 +1,14 @@
 import asyncio
-from typing import Optional
+from typing import Annotated, Optional
 
 from sqlalchemy.ext.asyncio import create_async_engine
-from sqlalchemy.orm import sessionmaker
-from sqlmodel import Field, Session, SQLModel, select
+
+from sqlmodel import Field, SQLModel, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 
 class Hero(SQLModel, table=True):
-    id: Optional[int] = Field(default=None, primary_key=True)
+    id: Annotated[int, Field(primary_key=True)]
     name: str
     secret_name: str
     age: Optional[int] = None
@@ -33,8 +33,7 @@ async def create_heroes():
     hero_2 = Hero(name="Spider-Boy", secret_name="Pedro Parqueador")
     hero_3 = Hero(name="Rusty-Man", secret_name="Tommy Sharp", age=48)
 
-    async_session = sessionmaker(engine, expire_on_commit=False, class_=AsyncSession)
-    async with async_session() as session:
+    async with AsyncSession(engine) as session:
         session.add(hero_1)
         session.add(hero_2)
         session.add(hero_3)
@@ -43,8 +42,7 @@ async def create_heroes():
 
 
 async def select_heroes():
-    async_session = sessionmaker(engine, expire_on_commit=False, class_=AsyncSession)
-    async with async_session() as session:
+    async with AsyncSession(engine) as session:
         # TODO: in async, this does not work `await session.exec(select(Hero)).all()`
         # heroes = await session.exec(select(Hero)).all()
         results = await session.exec(select(Hero))
@@ -59,4 +57,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    asyncio.run(main)
+    asyncio.run(main())
diff --git a/tests/test_async_tutorial/test_async_connect/test_async_update/__init__.py b/tests/test_async_tutorial/test_async_connect/test_async_update/__init__.py
diff --git a/tests/test_async_tutorial/test_async_connect/test_async_update/test_async_tutorial001.py b/tests/test_async_tutorial/test_async_connect/test_async_update/test_async_tutorial001.py
@@ -0,0 +1,69 @@
+import pytest
+from unittest.mock import patch
+
+from sqlalchemy.ext.asyncio import create_async_engine
+from sqlalchemy.orm import sessionmaker
+from sqlmodel import Session, SQLModel, select
+from sqlmodel.ext.asyncio.session import AsyncSession
+
+from tests.conftest import get_testing_print_function
+
+expected_calls = [
+    [
+        "Created hero:",
+        {
+            "age": None,
+            "id": 1,
+            "secret_name": "Dive Wilson",
+            "team_id": 2,
+            "name": "Deadpond",
+        },
+    ],
+    [
+        "Created hero:",
+        {
+            "age": 48,
+            "id": 2,
+            "secret_name": "Tommy Sharp",
+            "team_id": 1,
+            "name": "Rusty-Man",
+        },
+    ],
+    [
+        "Created hero:",
+        {
+            "age": None,
+            "id": 3,
+            "secret_name": "Pedro Parqueador",
+            "team_id": None,
+            "name": "Spider-Boy",
+        },
+    ],
+    [
+        "Updated hero:",
+        {
+            "age": None,
+            "id": 3,
+            "secret_name": "Pedro Parqueador",
+            "team_id": 1,
+            "name": "Spider-Boy",
+        },
+    ],
+]
+
+
+@pytest.mark.asyncio()
+async def test_tutorial(clear_sqlmodel):
+    from docs_src.tutorial_async.connect_async.update_async import (
+        tutorial001_async as mod,
+    )
+
+    mod.sqlite_url = "sqlite+aiosqlite://"
+    mod.engine = create_async_engine(mod.sqlite_url)
+    calls = []
+
+    new_print = get_testing_print_function(calls)
+
+    with patch("builtins.print", new=new_print):
+        await mod.main()
+    assert calls == expected_calls
