- annotations store 'parententity' as well as 'parentmapper'

- ORMAdapter filters all replacements against a non-compatible 'parentmapper' annotation
- Other filterings, like
query(A).join(A.bs).filter(B.foo=='bar'), were erroneously
adapting "B.foo" as though it were an "A".

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/sqlalchemy/orm/evaluator.py b/lib/sqlalchemy/orm/evaluator.py
index 03955afa8..4611dd91b 100644
--- a/lib/sqlalchemy/orm/evaluator.py
+++ b/lib/sqlalchemy/orm/evaluator.py
@@ -30,8 +30,8 @@ class EvaluatorCompiler(object):
         return lambda obj: None
 
     def visit_column(self, clause):
-        if 'parententity' in clause._annotations:
-            key = clause._annotations['parententity']._get_col_to_prop(clause).key
+        if 'parentmapper' in clause._annotations:
+            key = clause._annotations['parentmapper']._get_col_to_prop(clause).key
         else:
             key = clause.key
         get_corresponding_attr = operator.attrgetter(key)