From 853992649c64252c3959b76600434f9cab05288c Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 26 May 2009 17:03:03 +0000 Subject: more fixes to bound parameter exception reporting --- lib/sqlalchemy/exc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/exc.py') diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py index e0310d03c..ce130ce3c 100644 --- a/lib/sqlalchemy/exc.py +++ b/lib/sqlalchemy/exc.py @@ -132,11 +132,11 @@ class DBAPIError(SQLAlchemyError): self.connection_invalidated = connection_invalidated def __str__(self): - if self.params and len(self.params) > 10: + 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 parameters' % len(self.params))) + '... and a total of %i bound parameter sets' % len(self.params))) return ' '.join((SQLAlchemyError.__str__(self), repr(self.statement), repr(self.params))) -- cgit v1.2.1