run the drop database awaitable

litestar-org · Feb 1, 2025 · d43629c · d43629c
1 parent a7f84e4
commit d43629c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/advanced_alchemy/cli.py b/advanced_alchemy/cli.py
@@ -436,6 +436,7 @@ async def _create_database_wrapper() -> None:
     @bind_key_option
     @no_prompt_option
     def drop_database(bind_key: str | None, no_prompt: bool) -> None:  # pyright: ignore[reportUnusedFunction]
+        from anyio import run
         from rich.prompt import Confirm
 
         from advanced_alchemy.utils.databases import drop_database as _drop_database
@@ -450,6 +451,10 @@ def drop_database(bind_key: str | None, no_prompt: bool) -> None:  # pyright: ig
             True if no_prompt else Confirm.ask(f"[bold]Are you sure you want to drop database `{db_name}`?[/]")
         )
         if input_confirmed:
-            _drop_database(sqlalchemy_config)
+
+            async def _drop_database_wrapper() -> None:
+                await _drop_database(sqlalchemy_config)
+
+            run(_drop_database_wrapper)
 
     return database_group
diff --git a/advanced_alchemy/utils/databases.py b/advanced_alchemy/utils/databases.py
@@ -137,14 +137,13 @@ def _disconnect_users_sql(self, version: tuple[int, int] | None, database: str |
 
 def get_adapter(config: SQLAlchemyAsyncConfig | SQLAlchemySyncConfig, encoding: str = "utf8") -> Adapter:
     dialect_name = config.get_engine().url.get_dialect().name
-    driver = config.get_engine().url.get_dialect().driver
-
     adapter_class = ADAPTERS.get(dialect_name)
 
     if not adapter_class:
         msg = f"No adapter available for {dialect_name}"
         raise ValueError(msg)
 
+    driver = config.get_engine().url.get_dialect().driver
     if driver not in adapter_class.supported_drivers:
         msg = f"{dialect_name} adapter does not support the {driver} driver"
         raise ValueError(msg)
@@ -154,17 +153,15 @@ def get_adapter(config: SQLAlchemyAsyncConfig | SQLAlchemySyncConfig, encoding:
 
 async def create_database(config: SQLAlchemySyncConfig | SQLAlchemyAsyncConfig, encoding: str = "utf8") -> None:
     adapter = get_adapter(config, encoding)
-    engine = config.get_engine()
-    if isinstance(engine, AsyncEngine):
+    if isinstance(config.get_engine(), AsyncEngine):
         await adapter.create_async()
     else:
         adapter.create()
 
 
 async def drop_database(config: SQLAlchemySyncConfig | SQLAlchemyAsyncConfig) -> None:
     adapter = get_adapter(config)
-    engine = config.get_engine()
-    if isinstance(engine, AsyncEngine):
+    if isinstance(config.get_engine(), AsyncEngine):
         await adapter.drop_async()
     else:
         adapter.drop()