From d3c1f245efb22b45c77561345346469cf6a82ddd Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 22 Aug 2011 11:12:36 -0400 Subject: - Improvement to multi-param statement logging, long lists of bound parameter sets will be compressed with an informative indicator of the compression taking place. Exception messages use the same improved formatting. [ticket:2243] --- lib/sqlalchemy/exc.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'lib/sqlalchemy/exc.py') diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py index 951e44d61..0cc52fd25 100644 --- a/lib/sqlalchemy/exc.py +++ b/lib/sqlalchemy/exc.py @@ -146,15 +146,11 @@ class StatementError(SQLAlchemyError): self.orig = orig def __str__(self): - if isinstance(self.params, (list, tuple)) and \ - len(self.params) > 10 and \ - isinstance(self.params[0], (list, dict, tuple)): - return ' '.join((SQLAlchemyError.__str__(self), - repr(self.statement), - repr(self.params[:2]), - '... and a total of %i bound parameter sets' % len(self.params))) + from sqlalchemy.sql import util + params_repr = util._repr_params(self.params, 10) return ' '.join((SQLAlchemyError.__str__(self), - repr(self.statement), repr(self.params))) + repr(self.statement), repr(params_repr))) + class DBAPIError(StatementError): """Raised when the execution of a database operation fails. -- cgit v1.2.1