summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-01-23 14:49:04 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-01-23 14:49:04 -0500
commit15b23c7f71c0ca8c526db2794b2c459c84875ab3 (patch)
tree7f793ff00fdbd81ca0b6acaf4437e7e09ee9f087 /lib/sqlalchemy/orm/query.py
parent9fef2c314bef31758e878d03d7793e744f2562c6 (diff)
downloadsqlalchemy-15b23c7f71c0ca8c526db2794b2c459c84875ab3.tar.gz
- Fixed an 0.9 regression where the automatic aliasing applied by
:class:`.Query` and in other situations where selects or joins were aliased (such as joined table inheritance) could fail if a user-defined :class:`.Column` subclass were used in the expression. In this case, the subclass would fail to propagate ORM-specific "annotations" along needed by the adaptation. The "expression annotations" system has been corrected to account for this case. [ticket:2918]
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 6bd465e9c..23fe9315a 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -229,7 +229,6 @@ class Query(object):
have been applied within this query."""
adapters = []
-
# do we adapt all expression elements or only those
# tagged as 'ORM' constructs ?
orm_only = getattr(self, '_orm_only_adapt', orm_only)