From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 25 Jul 2009 18:59:56 +0000 (+0000)
Subject: - Improved error message when query() is called with
X-Git-Tag: rel_0_5_6~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e6df0eeb7845e85e98ce334474e4c9ab8c10611;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Improved error message when query() is called with
a non-SQL /entity expression. [ticket:1476]
---

diff --git a/CHANGES b/CHANGES
index 600fec83d6..5234440a0a 100644
--- 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 043ee15683..78e3542188 100644
--- 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