From: Ryan P. Kelly <rpkelly@cpan.org>
Date: Thu, 20 Nov 2014 19:40:32 +0000 (-0500)
Subject: Report the type of unexpected expression objects
X-Git-Tag: rel_1_0_0b1~95^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fb6acad67145d0b0b973a7a074eb5b2baf45086;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Report the type of unexpected expression objects
---

diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index 734f78632b..4c66061c83 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -3732,7 +3732,8 @@ def _literal_as_text(element, warn=False):
         return _const_expr(element)
     else:
         raise exc.ArgumentError(
-            "SQL expression object or string expected."
+            "SQL expression object or string expected, got object of type %r "
+            "instead" % type(element)
         )
 
 
diff --git a/test/sql/test_defaults.py b/test/sql/test_defaults.py
index 10e557b76c..21d04ea385 100644
--- a/test/sql/test_defaults.py
+++ b/test/sql/test_defaults.py
@@ -368,7 +368,8 @@ class DefaultTest(fixtures.TestBase):
         ):
             assert_raises_message(
                 sa.exc.ArgumentError,
-                "SQL expression object or string expected.",
+                "SQL expression object or string expected, got object of type "
+                "<type 'list'> instead",
                 t.select, [const]
             )
             assert_raises_message(