From cdbe3f84ba4656fd54205212b5adcd5ad9c8e8d2 Mon Sep 17 00:00:00 2001 From: Federico Caselli Date: Sat, 15 Feb 2020 12:34:37 +0100 Subject: Deprecate add of columns in order by with distinct Deprecate automatic addition of order by column in a query with a distinct Fixes: #5134 Change-Id: I467a39379c496be7e84a05f11ba9f8ca2bcc6e32 --- lib/sqlalchemy/testing/assertsql.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/sqlalchemy/testing') diff --git a/lib/sqlalchemy/testing/assertsql.py b/lib/sqlalchemy/testing/assertsql.py index f0da69400..8876c2304 100644 --- a/lib/sqlalchemy/testing/assertsql.py +++ b/lib/sqlalchemy/testing/assertsql.py @@ -184,8 +184,8 @@ class CompiledSQL(SQLMatchRule): def _failure_message(self, expected_params): return ( - "Testing for compiled statement %r partial params %s, " - "received %%(received_statement)r with params " + "Testing for compiled statement\n%r partial params %s, " + "received\n%%(received_statement)r with params " "%%(received_parameters)r" % ( self.statement.replace("%", "%%"), @@ -343,6 +343,9 @@ class SQLExecuteObserved(object): self.parameters = _distill_params(multiparams, params) self.statements = [] + def __repr__(self): + return str(self.statements) + class SQLCursorExecuteObserved( collections.namedtuple( @@ -373,7 +376,7 @@ class SQLAsserter(object): elif rule.errormessage: assert False, rule.errormessage if observed: - assert False, "Additional SQL statements remain" + assert False, "Additional SQL statements remain:\n%s" % observed elif not rule.is_consumed: rule.no_more_statements() -- cgit v1.2.1