summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing/assertsql.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-01-16 20:10:55 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-01-16 20:10:55 -0500
commit87002643407f886f13a3b53283ea0b6dafa695cc (patch)
tree6e47dd17e9c8c92856a9e027af84b5be00c3ede1 /lib/sqlalchemy/testing/assertsql.py
parent46a9209cde6e9e8bf333eada55ef45193f3f4fff (diff)
downloadsqlalchemy-87002643407f886f13a3b53283ea0b6dafa695cc.tar.gz
- preparing for #695, modernize constraint/index tests
Diffstat (limited to 'lib/sqlalchemy/testing/assertsql.py')
-rw-r--r--lib/sqlalchemy/testing/assertsql.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/sqlalchemy/testing/assertsql.py b/lib/sqlalchemy/testing/assertsql.py
index d955d1554..864ce5b4d 100644
--- a/lib/sqlalchemy/testing/assertsql.py
+++ b/lib/sqlalchemy/testing/assertsql.py
@@ -144,7 +144,7 @@ class RegexSQL(SQLMatchRule):
class CompiledSQL(SQLMatchRule):
- def __init__(self, statement, params):
+ def __init__(self, statement, params=None):
SQLMatchRule.__init__(self)
self.statement = statement
self.params = params
@@ -153,14 +153,19 @@ class CompiledSQL(SQLMatchRule):
executemany):
if not context:
return
+ from sqlalchemy.schema import _DDLCompiles
_received_parameters = list(context.compiled_parameters)
# recompile from the context, using the default dialect
- compiled = \
- context.compiled.statement.compile(dialect=DefaultDialect(),
+ if isinstance(context.compiled.statement, _DDLCompiles):
+ compiled = \
+ context.compiled.statement.compile(dialect=DefaultDialect())
+ else:
+ compiled = \
+ context.compiled.statement.compile(dialect=DefaultDialect(),
column_keys=context.compiled.column_keys)
- _received_statement = re.sub(r'\n', '', str(compiled))
+ _received_statement = re.sub(r'[\n\t]', '', str(compiled))
equivalent = self.statement == _received_statement
if self.params:
if util.callable(self.params):