merged r5976

diff --git a/CHANGES b/CHANGES
index 165d2ec07930c8e10180ad49becfa6ef259b6eab..a2ba1c57209a45d970971ea2c7ae8838da8a29ce 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,13 @@
 CHANGES
 =======
 
+0.5.4p2
+=======
+
+- sql
+    - Repaired the printing of SQL exceptions which are not 
+      based on parameters.
+
 0.5.4p1
 =======
 

diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py
index d9fdd5df924c0aff58da4ce996bdad50abcf7119..f72bec6fdb1e6541928e48d39ebeae105895398b 100644 (file)
--- a/lib/sqlalchemy/exc.py
+++ b/lib/sqlalchemy/exc.py
@@ -132,7 +132,7 @@ class DBAPIError(SQLAlchemyError):
         self.connection_invalidated = connection_invalidated
 
     def __str__(self):
-        if len(self.params) > 10:
+        if self.params and len(self.params) > 10:
             return ' '.join((SQLAlchemyError.__str__(self),
                              repr(self.statement),
                              repr(self.params[:2]),