summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan P. Kelly <rpkelly@cpan.org>2014-11-20 14:40:32 -0500
committerRyan P. Kelly <rpkelly@cpan.org>2014-11-20 14:40:32 -0500
commit9fb6acad67145d0b0b973a7a074eb5b2baf45086 (patch)
treefb3ab9c9be7fa7a6a33168eeae732674b1cff612
parent69979c8b2e4dcd009be5d1a1f466a24985e15301 (diff)
downloadsqlalchemy-pr/150.tar.gz
Report the type of unexpected expression objectspr/150
-rw-r--r--lib/sqlalchemy/sql/elements.py3
-rw-r--r--test/sql/test_defaults.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index 734f78632..4c66061c8 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 10e557b76..21d04ea38 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(