diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-01-26 16:49:43 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-01-26 16:49:43 -0500 |
| commit | 0e6579bc6268782d30d82c8fb13770f3b916ba41 (patch) | |
| tree | d9b03be6195a84ab5b35f6c11bbfc4f6dcf0c3d9 | |
| parent | 7b102eeaee12265a2c4f4f5619827178d379d210 (diff) | |
| parent | 9fb6acad67145d0b0b973a7a074eb5b2baf45086 (diff) | |
| download | sqlalchemy-0e6579bc6268782d30d82c8fb13770f3b916ba41.tar.gz | |
Merge remote-tracking branch 'origin/pr/150'
| -rw-r--r-- | lib/sqlalchemy/sql/elements.py | 3 | ||||
| -rw-r--r-- | test/sql/test_defaults.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py index 8df22b7a6..fa4f14fb9 100644 --- a/lib/sqlalchemy/sql/elements.py +++ b/lib/sqlalchemy/sql/elements.py @@ -3740,7 +3740,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 b7893d5f1..ce11a2603 100644 --- a/test/sql/test_defaults.py +++ b/test/sql/test_defaults.py @@ -378,7 +378,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( |