summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing/assertsql.py
diff options
context:
space:
mode:
authorBrian Jarrett <celttechie@gmail.com>2014-07-20 12:44:40 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-07-20 12:44:40 -0400
commitcca03097f47f22783d42d1853faac6cf84607c5a (patch)
tree4fe1a63d03a2d88d1cf37e1167759dfaf84f4ce7 /lib/sqlalchemy/testing/assertsql.py
parent827329a0cca5351094a1a86b6b2be2b9182f0ae2 (diff)
downloadsqlalchemy-cca03097f47f22783d42d1853faac6cf84607c5a.tar.gz
- apply pep8 formatting to sqlalchemy/sql, sqlalchemy/util, sqlalchemy/dialects,
sqlalchemy/orm, sqlalchemy/event, sqlalchemy/testing
Diffstat (limited to 'lib/sqlalchemy/testing/assertsql.py')
-rw-r--r--lib/sqlalchemy/testing/assertsql.py46
1 files changed, 26 insertions, 20 deletions
diff --git a/lib/sqlalchemy/testing/assertsql.py b/lib/sqlalchemy/testing/assertsql.py
index 7b4630c05..bcc999fe3 100644
--- a/lib/sqlalchemy/testing/assertsql.py
+++ b/lib/sqlalchemy/testing/assertsql.py
@@ -78,7 +78,7 @@ class ExactSQL(SQLMatchRule):
return
_received_statement = \
_process_engine_statement(context.unicode_statement,
- context)
+ context)
_received_parameters = context.compiled_parameters
# TODO: remove this step once all unit tests are migrated, as
@@ -99,10 +99,10 @@ class ExactSQL(SQLMatchRule):
params = {}
self._result = equivalent
if not self._result:
- self._errmsg = \
- 'Testing for exact statement %r exact params %r, '\
- 'received %r with params %r' % (sql, params,
- _received_statement, _received_parameters)
+ self._errmsg = (
+ 'Testing for exact statement %r exact params %r, '
+ 'received %r with params %r' %
+ (sql, params, _received_statement, _received_parameters))
class RegexSQL(SQLMatchRule):
@@ -119,7 +119,7 @@ class RegexSQL(SQLMatchRule):
return
_received_statement = \
_process_engine_statement(context.unicode_statement,
- context)
+ context)
_received_parameters = context.compiled_parameters
equivalent = bool(self.regex.match(_received_statement))
if self.params:
@@ -168,9 +168,11 @@ class CompiledSQL(SQLMatchRule):
compiled = \
context.compiled.statement.compile(dialect=DefaultDialect())
else:
- compiled = \
- context.compiled.statement.compile(dialect=DefaultDialect(),
- column_keys=context.compiled.column_keys)
+ compiled = (
+ context.compiled.statement.compile(
+ dialect=DefaultDialect(),
+ column_keys=context.compiled.column_keys)
+ )
_received_statement = re.sub(r'[\n\t]', '', str(compiled))
equivalent = self.statement == _received_statement
if self.params:
@@ -201,17 +203,19 @@ class CompiledSQL(SQLMatchRule):
all_received = []
self._result = equivalent
if not self._result:
- print('Testing for compiled statement %r partial params '\
- '%r, received %r with params %r' % (self.statement,
- all_params, _received_statement, all_received))
- self._errmsg = \
- 'Testing for compiled statement %r partial params %r, '\
- 'received %r with params %r' % (self.statement,
- all_params, _received_statement, all_received)
-
+ print('Testing for compiled statement %r partial params '
+ '%r, received %r with params %r' %
+ (self.statement, all_params,
+ _received_statement, all_received))
+ self._errmsg = (
+ 'Testing for compiled statement %r partial params %r, '
+ 'received %r with params %r' %
+ (self.statement, all_params,
+ _received_statement, all_received))
# print self._errmsg
+
class CountStatements(AssertRule):
def __init__(self, count):
@@ -248,7 +252,7 @@ class AllOf(AssertRule):
executemany):
for rule in self.rules:
rule.process_cursor_execute(statement, parameters, context,
- executemany)
+ executemany)
def is_consumed(self):
if not self.rules:
@@ -265,6 +269,7 @@ class AllOf(AssertRule):
def consume_final(self):
return len(self.rules) == 0
+
class Or(AllOf):
def __init__(self, *rules):
self.rules = set(rules)
@@ -282,6 +287,7 @@ class Or(AllOf):
def consume_final(self):
assert self._consume_final, "Unsatisified rules remain"
+
def _process_engine_statement(query, context):
if util.jython:
@@ -289,7 +295,7 @@ def _process_engine_statement(query, context):
query = str(query)
if context.engine.name == 'mssql' \
- and query.endswith('; select scope_identity()'):
+ and query.endswith('; select scope_identity()'):
query = query[:-25]
query = re.sub(r'\n', '', query)
return query
@@ -348,6 +354,6 @@ class SQLAssert(object):
if self.rules:
rule = self.rules[0]
rule.process_cursor_execute(statement, parameters, context,
- executemany)
+ executemany)
asserter = SQLAssert()