fixed setup of db

Author: sanderegg

packages/service-library/src/servicelib/db_async_engine.py

@@ -7,7 +7,7 @@
     get_pg_engine_stateinfo,
     raise_if_migration_not_ready,
 )
-from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
+from sqlalchemy.ext.asyncio import create_async_engine
 from tenacity import retry
 
 from .logging_utils import log_context
@@ -27,12 +27,16 @@ async def connect_to_db(app: FastAPI, settings: PostgresSettings) -> None:
     with log_context(
         _logger, logging.DEBUG, f"connection to db {settings.dsn_with_async_sqlalchemy}"
     ):
-        engine: AsyncEngine = create_async_engine(
+        engine = create_async_engine(
             settings.dsn_with_async_sqlalchemy,
             pool_size=settings.POSTGRES_MINSIZE,
             max_overflow=settings.POSTGRES_MAXSIZE - settings.POSTGRES_MINSIZE,
             connect_args={
-                "server_settings": {"application_name": settings.POSTGRES_CLIENT_NAME}
+                "server_settings": (
+                    {"application_name": settings.POSTGRES_CLIENT_NAME}
+                    if settings.POSTGRES_CLIENT_NAME
+                    else None
+                )
             },
             pool_pre_ping=True,  # https://docs.sqlalchemy.org/en/14/core/pooling.html#dealing-with-disconnects
             future=True,  # this uses sqlalchemy 2.0 API, shall be removed when sqlalchemy 2.0 is released

packages/service-library/src/servicelib/db_asyncpg_utils.py

@@ -37,7 +37,7 @@ async def create_async_engine_and_database_ready(
         settings.dsn_with_async_sqlalchemy,
         pool_size=settings.POSTGRES_MINSIZE,
         max_overflow=settings.POSTGRES_MAXSIZE - settings.POSTGRES_MINSIZE,
-        connect_args={"server_settings": server_settings},
+        connect_args={"server_settings": server_settings} if server_settings else None,
         pool_pre_ping=True,  # https://docs.sqlalchemy.org/en/14/core/pooling.html#dealing-with-disconnects
         future=True,  # this uses sqlalchemy 2.0 API, shall be removed when sqlalchemy 2.0 is released
     )