From 2e8fbb5ab853f7da73af055986ad554af57f5f36 Mon Sep 17 00:00:00 2001 From: Jakub Miazek Date: Fri, 4 Nov 2022 18:58:13 +0100 Subject: [PATCH] drop experimental async scoped db conn --- app/database.py | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/app/database.py b/app/database.py index d14f8ea..33bff22 100644 --- a/app/database.py +++ b/app/database.py @@ -1,11 +1,7 @@ -from asyncio import current_task - from typing import AsyncGenerator -from fastapi import HTTPException from fastapi.encoders import jsonable_encoder -from sqlalchemy.exc import SQLAlchemyError -from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_scoped_session +from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine from sqlalchemy.orm import sessionmaker from app import config @@ -23,21 +19,9 @@ engine = create_async_engine( # expire_on_commit=False will prevent attributes from being expired # after commit. async_session_factory = sessionmaker(engine, expire_on_commit=False, class_=AsyncSession) -AsyncScopedSession = async_scoped_session(async_session_factory, scopefunc=current_task) # Dependency async def get_db() -> AsyncGenerator: async with async_session_factory() as session: - try: - yield session - await session.commit() - except SQLAlchemyError as sql_ex: - await session.rollback() - raise sql_ex - except HTTPException as http_ex: - await session.rollback() - raise http_ex - finally: - await session.close() - + yield session