summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing/assertions.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-10-04 17:36:02 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-10-04 17:36:02 -0400
commitef7c2f359dcb88577a9aa37256d5060c2c87d2af (patch)
tree5c5ff37246d4808818bf9ab939f2e8a9124f3aad /lib/sqlalchemy/testing/assertions.py
parent1c3e3225521647cc843a633e34ed84e1ca4e797a (diff)
downloadsqlalchemy-ef7c2f359dcb88577a9aa37256d5060c2c87d2af.tar.gz
- don't call get_lastrowid() on explicit returning
- don't hardwire "subqueries" requirement in the base, mysql < 4.1 isn't working anyway - don't need explicit FB/PG exclusions in test_returning - hit db.connect() for the returning requirement
Diffstat (limited to 'lib/sqlalchemy/testing/assertions.py')
-rw-r--r--lib/sqlalchemy/testing/assertions.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py
index 1e8559c1a..2b305b98a 100644
--- a/lib/sqlalchemy/testing/assertions.py
+++ b/lib/sqlalchemy/testing/assertions.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import
from . import util as testutil
from sqlalchemy import pool, orm, util
-from sqlalchemy.engine import default
+from sqlalchemy.engine import default, create_engine
from sqlalchemy import exc as sa_exc
from sqlalchemy.util import decorator
from sqlalchemy import types as sqltypes, schema
@@ -183,6 +183,8 @@ class AssertsCompiledSQL(object):
dialect = default.DefaultDialect()
elif dialect is None:
dialect = config.db.dialect
+ elif isinstance(dialect, basestring):
+ dialect = create_engine("%s://" % dialect).dialect
kw = {}
if params is not None: