- Fixed 1.0 regression where the "parent entity" of a synonym-

mapped attribute on top of an :func:`.aliased` object would
resolve to the original mapper, not the :func:`.aliased`
version of it, thereby causing problems for a :class:`.Query`
that relies on this attribute (e.g. it's the only representative
attribute given in the constructor) to figure out the correct FROM
clause for the query.
fixes #3466
- apply consitency to ._parententity vs.
__clause_element__()._annotations['parententity']
in terms of aliased class, test it all.

2 files changed, 66 insertions, 1 deletions

diff --git a/test/orm/test_query.py b/test/orm/test_query.py
index 62c97ec90..55af023b1 100644
--- a/test/orm/test_query.py
+++ b/test/orm/test_query.py
@@ -3390,7 +3390,8 @@ class WithTransientOnNone(_fixtures.FixtureTest, AssertsCompiledSQL):
         )
 
 
-class SynonymTest(QueryTest):
+class SynonymTest(QueryTest, AssertsCompiledSQL):
+    __dialect__ = 'default'
 
     @classmethod
     def setup_mappers(cls):
@@ -3510,6 +3511,20 @@ class SynonymTest(QueryTest):
                 Order(description="order 1"), Order(description="order 3"),
                 Order(description="order 5")] == o
 
+    def test_froms_aliased_col(self):
+        Address, User = self.classes.Address, self.classes.User
+
+        sess = create_session()
+        ua = aliased(User)
+
+        q = sess.query(ua.name_syn).join(
+            Address, ua.id == Address.user_id)
+        self.assert_compile(
+            q,
+            "SELECT users_1.name AS users_1_name FROM "
+            "users AS users_1 JOIN addresses ON users_1.id = addresses.user_id"
+        )
+
 
 class ImmediateTest(_fixtures.FixtureTest):
     run_inserts = 'once'
diff --git a/test/orm/test_utils.py b/test/orm/test_utils.py
index ae225ad92..168cee19c 100644
--- a/test/orm/test_utils.py
+++ b/test/orm/test_utils.py
@@ -222,6 +222,56 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL):
             "WHERE point_1.x > point.x"
         )
 
+    def test_parententity_vs_parentmapper(self):
+        class Point(object):
+            pass
+
+        self._fixture(Point, properties={
+            'x_syn': synonym("x")
+        })
+        pa = aliased(Point)
+
+        is_(Point.x_syn._parententity, inspect(Point))
+        is_(Point.x._parententity, inspect(Point))
+        is_(Point.x_syn._parentmapper, inspect(Point))
+        is_(Point.x._parentmapper, inspect(Point))
+
+        is_(
+            Point.x_syn.__clause_element__()._annotations['parententity'],
+            inspect(Point))
+        is_(
+            Point.x.__clause_element__()._annotations['parententity'],
+            inspect(Point))
+        is_(
+            Point.x_syn.__clause_element__()._annotations['parentmapper'],
+            inspect(Point))
+        is_(
+            Point.x.__clause_element__()._annotations['parentmapper'],
+            inspect(Point))
+
+        pa = aliased(Point)
+
+        is_(pa.x_syn._parententity, inspect(pa))
+        is_(pa.x._parententity, inspect(pa))
+        is_(pa.x_syn._parentmapper, inspect(Point))
+        is_(pa.x._parentmapper, inspect(Point))
+
+        is_(
+            pa.x_syn.__clause_element__()._annotations['parententity'],
+            inspect(pa)
+        )
+        is_(
+            pa.x.__clause_element__()._annotations['parententity'],
+            inspect(pa)
+        )
+        is_(
+            pa.x_syn.__clause_element__()._annotations['parentmapper'],
+            inspect(Point))
+        is_(
+            pa.x.__clause_element__()._annotations['parentmapper'],
+            inspect(Point))
+
+
 class IdentityKeyTest(_fixtures.FixtureTest):
     run_inserts = None