alex/headquarter
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use sync engine for alembic migration operations

Browse Source 
SQLAlchemy 2.0 async engines don't support the sync context manager
protocol needed by alembic. Create a separate sync engine (using
psycopg2) for migration operations while keeping async engine for
application queries.

- Add psycopg2-binary dependency
- Rename async connection variable to avoid mypy confusion
- Use sync engine for MigrationContext and alembic commands
This commit is contained in:
Fusion
2026-05-18 23:09:44 +02:00
parent b9684b0107
commit 1e70462c2b
2 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/src/database.py
+42 -30
View File
@@ -4,6 +4,7 @@ import logging
from alembic import command
from alembic.config import Config
from alembic.runtime.migration import MigrationContext
from sqlalchemy import create_engine
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
from sqlalchemy.pool import NullPool
@@ -28,6 +29,15 @@ engine = create_async_engine(
SessionLocal = async_sessionmaker(engine, class_=AsyncSession, expire_on_commit=False)
def _get_sync_database_url() -> str:
"""Convert async database URL to sync URL for alembic."""
sync_url = database_url
# Replace asyncpg with psycopg2 for sync operations
if "+asyncpg" in sync_url:
sync_url = sync_url.replace("+asyncpg", "+psycopg2")
return sync_url
async def init_database(
max_retries: int = 5,
retry_delay: float = 2.0,
@@ -42,44 +52,46 @@ async def init_database(
"""
for attempt in range(1, max_retries + 1):
try:
# Test basic connectivity
# Test basic connectivity (async)
from sqlalchemy import text
conn = await engine.connect()
test_conn = await engine.connect()
try:
await conn.execute(text("SELECT 1"))
await test_conn.execute(text("SELECT 1"))
finally:
await conn.close()
await test_conn.close()
logger.info("Database connection established.")
# Check if migrations are already complete
def _check_migrations():
alembic_cfg = Config(alembic_ini_path)
script = command.ScriptDirectory.from_config(alembic_cfg)
with engine.connect() as conn:
context = MigrationContext.configure(conn)
# Use sync engine for alembic operations
sync_url = _get_sync_database_url()
sync_engine = create_engine(sync_url, poolclass=NullPool)
try:
# Check if migrations are already complete
with sync_engine.connect() as sync_conn:
context = MigrationContext.configure(sync_conn)
current_rev = context.get_current_revision()
alembic_cfg = Config(alembic_ini_path)
script = command.ScriptDirectory.from_config(alembic_cfg)
head_rev = script.get_current_head()
return current_rev == head_rev, current_rev, head_rev
is_current, current_rev, head_rev = await asyncio.get_event_loop().run_in_executor(
None, _check_migrations
)
if is_current:
logger.info("Database is already at the latest migration (%s).", head_rev)
return True
logger.info("Current revision: %s, Head revision: %s. Running migrations...", current_rev, head_rev)
# Run alembic migrations (sync call in executor)
def _run_migrations():
alembic_cfg = Config(alembic_ini_path)
command.upgrade(alembic_cfg, "head")
await asyncio.get_event_loop().run_in_executor(None, _run_migrations)
logger.info("Database migrations completed successfully.")
return True
if current_rev == head_rev:
logger.info("Database is already at the latest migration (%s).", head_rev)
return True
logger.info(
"Current revision: %s, Head revision: %s. Running migrations...",
current_rev,
head_rev,
)
# Run alembic migrations
command.upgrade(alembic_cfg, "head")
logger.info("Database migrations completed successfully.")
return True
finally:
sync_engine.dispose()
except Exception as exc:
error_msg = str(exc).lower()