Исправлены ошибки в ходе раскатки

codebase/backend/bitrix-sync/alembic/env.py

@@ -2,10 +2,14 @@ import asyncio
 import os
 
 from alembic import context
-from sqlalchemy.ext.asyncio import async_engine_from_config
+from app.postgres import create_postgres_engine
 
 config = context.config
-config.set_main_option("sqlalchemy.url", os.environ["BITRIX_SYNC_DATABASE_URL"])
+database_url = os.environ["BITRIX_SYNC_DATABASE_URL"]
+config.set_main_option(
+    "sqlalchemy.url",
+    database_url.replace("%", "%%"),
+)
 target_metadata = None
 
 
@@ -16,7 +20,7 @@ def run_offline() -> None:
 
 
 async def run_online() -> None:
-    engine = async_engine_from_config(config.get_section(config.config_ini_section) or {})
+    engine = create_postgres_engine(database_url)
     async with engine.connect() as connection:
         await connection.run_sync(do_run)
     await engine.dispose()

codebase/backend/bitrix-sync/app/main.py

@@ -16,7 +16,9 @@ from fastapi.responses import JSONResponse
 from pydantic import Field, model_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from sqlalchemy import text
-from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
+from sqlalchemy.ext.asyncio import AsyncEngine
+
+from app.postgres import create_postgres_engine
 
 
 def utcnow() -> datetime:
@@ -79,12 +81,6 @@ class DatabaseProbe:
         await self.engine.dispose()
 
 
-def database_url(value: str) -> str:
-    if value.startswith("postgresql://"):
-        return value.replace("postgresql://", "postgresql+asyncpg://", 1)
-    return value
-
-
 def classify_error(exc: Exception) -> str:
     name = type(exc).__name__.lower()
     text_value = str(exc).lower()
@@ -119,13 +115,13 @@ def create_app(settings: Settings | None = None, probe: Probe | None = None) ->
         app.state.loop_task = None
         if cfg.bitrix_sync_enabled:
             if app.state.probe is None:
-                engine = create_async_engine(
-                    database_url(cfg.bitrix_sync_database_url or ""),
+                engine = create_postgres_engine(
+                    cfg.bitrix_sync_database_url or "",
                     pool_size=cfg.bitrix_sync_db_pool_size,
                     max_overflow=0,
                     pool_pre_ping=True,
                     pool_recycle=cfg.bitrix_sync_db_pool_recycle_sec,
-                    connect_args={"server_settings": {"application_name": "han-bitrix-sync"}},
+                    server_settings={"application_name": "han-bitrix-sync"},
                 )
                 app.state.probe = DatabaseProbe(engine)
             await run_probe(app)

codebase/backend/bitrix-sync/app/postgres.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from typing import Any
+
+import asyncpg
+from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
+
+
+def asyncpg_dsn(url: str) -> str:
+    if url.startswith("postgresql+asyncpg://"):
+        return url.replace("postgresql+asyncpg://", "postgresql://", 1)
+    return url
+
+
+def create_postgres_engine(
+    url: str,
+    *,
+    server_settings: dict[str, str] | None = None,
+    **engine_options: Any,
+) -> AsyncEngine:
+    dsn = asyncpg_dsn(url)
+
+    async def connect():
+        return await asyncpg.connect(dsn=dsn, server_settings=server_settings)
+
+    return create_async_engine(
+        "postgresql+asyncpg://",
+        async_creator=connect,
+        **engine_options,
+    )