Merge pull request #120 from stijndcl/pytest-migrations

Small cleanup in migrations fix

database/engine.py

@@ -7,17 +7,16 @@ from sqlalchemy.orm import sessionmaker
 import settings
 
 encoded_password = quote_plus(settings.DB_PASSWORD)
-url = URL.create(
-    drivername="postgresql+asyncpg",
-    username=settings.DB_USERNAME,
-    password=encoded_password,
-    host=settings.DB_HOST,
-    port=settings.DB_PORT,
-    database=settings.DB_NAME,
-)
 
 engine = create_async_engine(
-    url,
+    URL.create(
+        drivername="postgresql+asyncpg",
+        username=settings.DB_USERNAME,
+        password=encoded_password,
+        host=settings.DB_HOST,
+        port=settings.DB_PORT,
+        database=settings.DB_NAME,
+    ),
     pool_pre_ping=True,
     future=True,
 )

database/migrations.py

@@ -1,12 +1,11 @@
 import logging
 
-from sqlalchemy.ext.asyncio import create_async_engine
 from sqlalchemy.orm import Session
 
-from alembic import command, config, script
+from alembic import command, script
 from alembic.config import Config
 from alembic.runtime import migration
-from database.engine import engine, url
+from database.engine import engine
 
 __config_path__ = "alembic.ini"
 __migrations_path__ = "alembic/"
@@ -50,6 +49,5 @@ def __execute_downgrade(connection: Session):
 
 async def migrate(up: bool):
     """Migrate the database upwards or downwards"""
-    async_engine = create_async_engine(url, echo=True)
-    async with async_engine.begin() as connection:
+    async with engine.begin() as connection:
         await connection.run_sync(__execute_upgrade if up else __execute_downgrade)