https://github.com/krylosov-aa/context-async-sqlalchemy/issues/11

Author: krylosov-aa

context_async_sqlalchemy/session.py

@@ -41,6 +41,8 @@ async def atomic_db_session(
             await session.execute(...)
     """
     session = await db_session(connect)
+    if session.in_transaction():
+        await session.commit()
     async with session.begin():
         yield session
 

examples/fastapi_example/routes/atomic_usage_2.py

@@ -0,0 +1,29 @@
+from context_async_sqlalchemy import atomic_db_session, db_session
+from sqlalchemy import insert
+
+from ..database import connection
+from ..models import ExampleTable
+
+
+async def handler_with_db_session_and_atomic_2() -> None:
+    """
+    Let's imagine you already have a function that works with a contextual
+    session, and its use case calls autocommit at the end of the request.
+    You want to reuse this function, but you need to commit immediately,
+        rather than wait for the request to complete.
+    """
+    # This is a new transaction in a new connection
+    await _insert_1()
+
+    # If you want to wrap an operation in a new
+    # transaction, the current transaction will be committed automatically.
+    async with atomic_db_session(connection):
+        await _insert_1()
+
+
+async def _insert_1() -> None:
+    session = await db_session(connection)
+    stmt = insert(ExampleTable).values(
+        text="example_with_db_session_and_atomic"
+    )
+    await session.execute(stmt)

examples/fastapi_example/setup_app.py

@@ -10,6 +10,7 @@
 
 from .database import connection
 from .routes.atomic_usage import handler_with_db_session_and_atomic
+from .routes.atomic_usage_2 import handler_with_db_session_and_atomic_2
 from .routes.manual_commit import handler_with_db_session_and_manual_close
 from .routes.manual_rollback import handler_with_db_session_and_manual_rollback
 from .routes.multiple_session_usage import handler_multiple_sessions
@@ -59,6 +60,11 @@ def setup_routes(app: FastAPI) -> None:
         handler_with_db_session_and_atomic,
         methods=["POST"],
     )
+    app.add_api_route(
+        "/example_with_db_session_and_atomic_2",
+        handler_with_db_session_and_atomic_2,
+        methods=["POST"],
+    )
     app.add_api_route(
         "/example_with_db_session_and_manual_close",
         handler_with_db_session_and_manual_close,

examples/fastapi_example/tests/non_transactional/test_routes.py

@@ -57,6 +57,30 @@ async def test_example_with_db_session_and_atomic(
         assert row.text == "example_with_db_session_and_atomic"
 
 
+@pytest.mark.asyncio
+async def test_example_with_db_session_and_atomic_2(
+    client: AsyncClient,
+    db_session_test: AsyncSession,
+) -> None:
+    """
+    Since the handler involves manual session management,
+        such a handler should only be tested in non-transactional tests.
+    """
+    # Act
+    response = await client.post(
+        "/example_with_db_session_and_atomic_2",
+    )
+
+    # Assert
+    assert response.status_code == HTTPStatus.OK
+
+    result = await db_session_test.execute(select(ExampleTable))
+    rows = result.scalars().all()
+    assert len(rows) == 2
+    for row in rows:
+        assert row.text == "example_with_db_session_and_atomic"
+
+
 @pytest.mark.asyncio
 async def test_example_with_db_session_and_manual_close(
     client: AsyncClient,

setup.cfg

@@ -4,4 +4,4 @@ ignore=WPS476, WPS300, WPS410, WPS412, WPS501, WPS229, WPS202, WPS110, WPS473
     WPS217, WPS430, WPS420
 
 per-file-ignores =
-    examples/*: WPS110, WPS432, WPS204, WPS114, WPS226, WPS201
+    examples/*: WPS110, WPS432, WPS204, WPS114, WPS226, WPS201, WPS213