summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-08-15 14:38:33 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-08-15 14:38:33 -0400
commit961217aa923562c21a0113fae41d6841276e6ca5 (patch)
tree395838d9eaaaf5dbc1dc91d6db0eff79175f3f80 /lib/sqlalchemy/testing
parentd768ec2c266ec462a8ff0b782516c494c451f2db (diff)
downloadsqlalchemy-961217aa923562c21a0113fae41d6841276e6ca5.tar.gz
- clean up provision and keep sqlite on memory DBs if thats what we start with
Diffstat (limited to 'lib/sqlalchemy/testing')
-rw-r--r--lib/sqlalchemy/testing/plugin/provision.py17
1 files changed, 7 insertions, 10 deletions
diff --git a/lib/sqlalchemy/testing/plugin/provision.py b/lib/sqlalchemy/testing/plugin/provision.py
index baec8a299..c6b9030f5 100644
--- a/lib/sqlalchemy/testing/plugin/provision.py
+++ b/lib/sqlalchemy/testing/plugin/provision.py
@@ -36,14 +36,8 @@ class register(object):
def create_follower_db(follower_ident):
for cfg in _configs_for_db_operation():
- url = cfg.db.url
- backend = url.get_backend_name()
_create_db(cfg, cfg.db, follower_ident)
- new_url = sa_url.make_url(str(url))
-
- new_url.database = follower_ident
-
def configure_follower(follower_ident):
for cfg in config.Config.all_configs():
@@ -63,7 +57,6 @@ def setup_config(db_url, db_opts, options, file_config, follower_ident):
def drop_follower_db(follower_ident):
for cfg in _configs_for_db_operation():
- url = cfg.db.url
_drop_db(cfg, cfg.db, follower_ident)
@@ -110,9 +103,13 @@ def _follower_url_from_main(url, ident):
return url
-#@_follower_url_from_main.for_db("sqlite")
-#def _sqlite_follower_url_from_main(url, ident):
-# return sa_url.make_url("sqlite:///%s.db" % ident)
+@_follower_url_from_main.for_db("sqlite")
+def _sqlite_follower_url_from_main(url, ident):
+ url = sa_url.make_url(url)
+ if not url.database or url.database == ':memory:':
+ return url
+ else:
+ return sa_url.make_url("sqlite:///%s.db" % ident)
@_create_db.for_db("postgresql")