From b84acc9f7652f8f5b11a92df8852e898a4c81589 Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Sun, 6 Jun 2010 15:15:34 -0700 Subject: [PATCH] Use sql.fill_url in dsn_callback, for more consistency. Signed-off-by: Edward Z. Yang --- wizard/install/__init__.py | 4 +++- wizard/sql.py | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/wizard/install/__init__.py b/wizard/install/__init__.py index e4f3e66..ece234a 100644 --- a/wizard/install/__init__.py +++ b/wizard/install/__init__.py @@ -26,11 +26,13 @@ import sqlalchemy import warnings import wizard -from wizard import scripts, shell, util +from wizard import scripts, shell, sql, util def dsn_callback(options): if not isinstance(options.dsn, sqlalchemy.engine.url.URL): options.dsn = sqlalchemy.engine.url.make_url(options.dsn) + # do some guessing with sql + options.dsn = sql.fill_url(options.dsn) # perform some sanity checks on the database database = options.dsn.database options.dsn.database = None diff --git a/wizard/sql.py b/wizard/sql.py index 5780dcc..f19f5e3 100644 --- a/wizard/sql.py +++ b/wizard/sql.py @@ -35,8 +35,9 @@ def fill_url(url): return url except shell.CallError: pass - dsn = os.getenv("WIZARD_DSN") - old_url = url - url = sqlalchemy.engine.url.make_url(dsn) - url.database = old_url.database + env_dsn = os.getenv("WIZARD_DSN") + if env_dsn: + old_url = url + url = sqlalchemy.engine.url.make_url(env_dsn) + url.database = old_url.database return url -- 2.45.0