From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 19 Jun 2015 23:24:10 +0000 (-0400)
Subject: - repair that we use db_opts when the url here is different,
X-Git-Tag: rel_1_0_6~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e84dcc48563db66cbbc8952f4f7709003a1ae15;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- repair that we use db_opts when the url here is different,
as we are using db_opts for the first time with legacy_schema_args
---

diff --git a/lib/sqlalchemy/testing/engines.py b/lib/sqlalchemy/testing/engines.py
index 8bd1becbf1..1eaf629601 100644
--- a/lib/sqlalchemy/testing/engines.py
+++ b/lib/sqlalchemy/testing/engines.py
@@ -211,6 +211,7 @@ def testing_engine(url=None, options=None):
     """Produce an engine configured by --options with optional overrides."""
 
     from sqlalchemy import create_engine
+    from sqlalchemy.engine.url import make_url
 
     if not options:
         use_reaper = True
@@ -218,12 +219,16 @@ def testing_engine(url=None, options=None):
         use_reaper = options.pop('use_reaper', True)
 
     url = url or config.db.url
+
+    url = make_url(url)
     if options is None:
-        options = config.db_opts
+        if config.db is None or url.drivername == config.db.url.drivername:
+            options = config.db_opts
+        else:
+            options = {}
 
     engine = create_engine(url, **options)
-    engine._has_events = True   # enable event blocks, helps with
-                                # profiling
+    engine._has_events = True   # enable event blocks, helps with profiling
 
     if isinstance(engine.pool, pool.QueuePool):
         engine.pool._timeout = 0