- Improved error message when query() is called with

a non-SQL /entity expression. [ticket:1476]

diff --git a/CHANGES b/CHANGES
index 600fec83d6c63806b60808b1dd559025360ace52..5234440a0a9c35363b410fbd7bfdef44f3e828fe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,9 @@ CHANGES
       during a flush.  This is currently to support 
       many-to-many relations from concrete inheritance setups.
       Outside of that use case, YMMV.  [ticket:1477]
+
+    - Improved error message when query() is called with
+      a non-SQL /entity expression. [ticket:1476]
       
 - sql
     - Fixed a bug in extract() introduced in 0.5.4 whereby

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 043ee15683851ffd81441f71f1764d45f46f91e7..78e35421880c1c76e794e1d124c588317e18fbb2 100644 (file)
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -2025,7 +2025,9 @@ class _ColumnEntity(_QueryEntity):
                 return
 
         if not isinstance(column, sql.ColumnElement):
-            raise sa_exc.InvalidRequestError("Invalid column expression '%r'" % column)
+            raise sa_exc.InvalidRequestError(
+                "SQL expression, column, or mapped entity expected - got '%r'" % column
+            )
 
         # if the Column is unnamed, give it a
         # label() so that mutable column expressions