From 15b23c7f71c0ca8c526db2794b2c459c84875ab3 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 23 Jan 2014 14:49:04 -0500 Subject: - 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] --- lib/sqlalchemy/orm/query.py | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/sqlalchemy/orm/query.py') 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) -- cgit v1.2.1