summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing/assertions.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-01-18 20:57:26 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2015-01-18 20:57:26 -0500
commitf5d4f2685f30817af493c32d2cf0ac77715bdb46 (patch)
tree93a0ca7cdb6a715f1f3c2162f5677b138493930e /lib/sqlalchemy/testing/assertions.py
parentf49c367ef712d080e630ba722f96903922d7de7b (diff)
downloadsqlalchemy-f5d4f2685f30817af493c32d2cf0ac77715bdb46.tar.gz
- rework assertsql system, fixes #3293
Diffstat (limited to 'lib/sqlalchemy/testing/assertions.py')
-rw-r--r--lib/sqlalchemy/testing/assertions.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py
index 46fcd64b1..635f6c539 100644
--- a/lib/sqlalchemy/testing/assertions.py
+++ b/lib/sqlalchemy/testing/assertions.py
@@ -419,21 +419,16 @@ class AssertsExecutionResults(object):
callable_()
asserter.assert_(*rules)
- def assert_sql(self, db, callable_, list_, with_sequences=None):
- if (with_sequences is not None and
- config.db.dialect.supports_sequences):
- rules = with_sequences
- else:
- rules = list_
+ def assert_sql(self, db, callable_, rules):
newrules = []
for rule in rules:
if isinstance(rule, dict):
newrule = assertsql.AllOf(*[
- assertsql.ExactSQL(k, v) for k, v in rule.items()
+ assertsql.CompiledSQL(k, v) for k, v in rule.items()
])
else:
- newrule = assertsql.ExactSQL(*rule)
+ newrule = assertsql.CompiledSQL(*rule)
newrules.append(newrule)
self.assert_sql_execution(db, callable_, *newrules)