update tests

Author: krylosov-aa

Makefile

@@ -5,7 +5,7 @@ lint:
 	flake8 .
 
 test:
-	pytest --cov context_async_sqlalchemy examples/fastapi_example/tests examples/starlette_example/tests --cov-report=term-missing
+	pytest --cov context_async_sqlalchemy examples/fastapi_example/tests examples/starlette_example/tests examples/fastapi_with_pure_asgi_example/tests --cov-report=term-missing
 
 test_fastapi:
 	pytest examples/fastapi_example/tests

context_async_sqlalchemy/starlette_utils/http_middleware.py

@@ -17,9 +17,7 @@
 
 def add_starlette_http_db_session_middleware(app: Starlette) -> None:
     """Adds middleware to the application"""
-    app.add_middleware(
-        BaseHTTPMiddleware, dispatch=starlette_http_db_session_middleware
-    )
+    app.add_middleware(StarletteHTTPDBSessionMiddleware)
 
 
 class StarletteHTTPDBSessionMiddleware(BaseHTTPMiddleware):

examples/fastapi_example/routes/atomic_prev_transaction.py

@@ -36,6 +36,17 @@ async def atomic_and_previous_transaction() -> None:
     # Open transaction
     await _insert_1()
 
+    # use current transaction and rollback
+    try:
+        async with atomic_db_session(connection, "append"):
+            await _insert_1()
+            raise Exception()
+    except Exception:
+        ...
+
+    # Open transaction
+    await _insert_1()
+
     # raise InvalidRequestError error
     async with atomic_db_session(connection, "raise"):
         await _insert_1()

examples/fastapi_example/tests/conftest.py

@@ -12,8 +12,8 @@
 
 from context_async_sqlalchemy.test_utils import rollback_session
 from examples.database import connection
-from examples.fastapi_example.setup_app import lifespan, setup_app
 from examples.models import ExampleTable
+from ..setup_app import lifespan, setup_app
 
 
 @pytest_asyncio.fixture

examples/fastapi_example/tests/non_transactional/test_straight.py

@@ -0,0 +1,21 @@
+"""
+With set_test_context you can call funcs straight
+"""
+
+import pytest
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from context_async_sqlalchemy.test_utils import set_test_context
+
+from examples.fastapi_example.routes.atomic import atomic_base_example
+from ..conftest import count_rows_example_table
+
+
+@pytest.mark.asyncio
+async def test_atomic_base_example(
+    db_session_test: AsyncSession,
+) -> None:
+    async with set_test_context(auto_close=True):
+        await atomic_base_example()
+
+    assert await count_rows_example_table(db_session_test) == 2

examples/fastapi_with_pure_asgi_example/README.md

@@ -0,0 +1,3 @@
+# FastAPI example
+
+An example of how to use the library with FastAPI

examples/fastapi_with_pure_asgi_example/__init__.py

@@ -0,0 +1,3 @@
+"""
+An example of how to use the library with FastAPI
+"""

examples/fastapi_with_pure_asgi_example/main.py

@@ -0,0 +1,6 @@
+"""Application entry point"""
+
+from .setup_app import setup_app
+
+
+app = setup_app()

examples/fastapi_with_pure_asgi_example/pyproject.toml

@@ -0,0 +1,20 @@
+[project]
+name = "fastapi-example"
+version = "0.1.0"
+description = "fastapi-example"
+requires-python = ">=3.9"
+dependencies = [
+    "context-async-sqlalchemy>=1.0.1",
+]
+
+[dependency-groups]
+dev = [
+    "asyncpg>=0.30.0",
+    "fastapi>=0.121.1",
+    "greenlet>=3.2.4",
+    "httpx>=0.28.1",
+    "psycopg2-binary>=2.9.11",
+    "pydantic>=2.12.4",
+    "pytest>=8.4.2",
+    "pytest-asyncio>=1.2.0",
+]