From 1987c2b633ee543941679604898c9798077d3a31 Mon Sep 17 00:00:00 2001 From: Dan Allan Date: Tue, 1 Oct 2024 10:59:26 -0400 Subject: [PATCH] Consistently use database URI with schema. --- tiled/commandline/_catalog.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tiled/commandline/_catalog.py b/tiled/commandline/_catalog.py index b1fd5215e..68e50dc70 100644 --- a/tiled/commandline/_catalog.py +++ b/tiled/commandline/_catalog.py @@ -49,9 +49,10 @@ def init( if not SCHEME_PATTERN.match(database): # Interpret URI as filepath. database = f"sqlite+aiosqlite:///{database}" + database = ensure_specified_sql_driver(database) async def do_setup(): - engine = create_async_engine(ensure_specified_sql_driver(database)) + engine = create_async_engine(database) redacted_url = engine.url._replace(password="[redacted]") try: await check_database(engine, REQUIRED_REVISION, ALL_REVISIONS) @@ -96,8 +97,10 @@ def upgrade_database( from ..catalog.core import ALL_REVISIONS from ..utils import ensure_specified_sql_driver + database_uri = ensure_specified_sql_driver(database_uri) + async def do_setup(): - engine = create_async_engine(ensure_specified_sql_driver(database_uri)) + engine = create_async_engine(database_uri) redacted_url = engine.url._replace(password="[redacted]") current_revision = await get_current_revision(engine, ALL_REVISIONS) await engine.dispose() @@ -130,8 +133,10 @@ def downgrade_database( from ..catalog.core import ALL_REVISIONS from ..utils import ensure_specified_sql_driver + database_uri = ensure_specified_sql_driver(database_uri) + async def do_setup(): - engine = create_async_engine(ensure_specified_sql_driver(database_uri)) + engine = create_async_engine(database_uri) redacted_url = engine.url._replace(password="[redacted]") current_revision = await get_current_revision(engine, ALL_REVISIONS) if current_revision is None: