- re: #2967, also fixed a somewhat related issue where join rewriting would fail

on the columns clause of the SELECT statement if the targets were
aliased tables, as opposed to individual aliased columns.

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index e6693677a23ab46f985f2cce0546df9886630bf9..a99032aa056a6393a121c02e31d6efa56850d577 100644 (file)
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -21,6 +21,9 @@
         Fixed bug in SQLite "join rewriting" where usage of an exists() construct
         would fail to be rewritten properly, such as when the exists is
         mapped to a column_property in an intricate nested-join scenario.
+        Also fixed a somewhat related issue where join rewriting would fail
+        on the columns clause of the SELECT statement if the targets were
+        aliased tables, as opposed to individual aliased columns.
 
     .. change::
         :tags: sqlite, bug

diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 17c9c9e8b09db8444c941943b345ea5da5402c10..148da19aa91bc0db569cc7fd160d3d792cd946a4 100644 (file)
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -1315,8 +1315,13 @@ class SQLCompiler(Compiled):
                     zip(newelem.right.element.c, selectable_.c)
                 )
 
+                # translating from both the old and the new
+                # because different select() structures will lead us
+                # to traverse differently
                 translate_dict[right.element.left] = selectable_
                 translate_dict[right.element.right] = selectable_
+                translate_dict[newelem.right.element.left] = selectable_
+                translate_dict[newelem.right.element.right] = selectable_
 
                 # propagate translations that we've gained
                 # from nested visit(newelem.right) outwards

diff --git a/test/sql/test_join_rewriting.py b/test/sql/test_join_rewriting.py
index d44a002f7b72276989d6a94d325d2ecb22ebd71e..30ab1500bcc51f95261318a25e6885dfe7fe2ab4 100644 (file)
--- a/test/sql/test_join_rewriting.py
+++ b/test/sql/test_join_rewriting.py
@@ -160,6 +160,19 @@ class _JoinRewriteTestBase(AssertsCompiledSQL):
             self._a_atobalias_balias_c_w_exists
         )
 
+    def test_a_atobalias_balias(self):
+        a_to_b_alias = a_to_b.alias()
+        b_alias = b.alias()
+
+        j1 = a_to_b_alias.join(b_alias)
+        j2 = a.outerjoin(j1, a.c.id == a_to_b_alias.c.a_id)
+
+        s = select([a, a_to_b_alias, b_alias], use_labels=True).select_from(j2)
+
+        self._test(
+            s,
+            self._a_atobalias_balias
+        )
 
 
 class JoinRewriteTest(_JoinRewriteTestBase, fixtures.TestBase):
@@ -257,6 +270,15 @@ class JoinRewriteTest(_JoinRewriteTestBase, fixtures.TestBase):
         "ON a.id = anon_1.a_to_b_1_a_id"
     )
 
+    _a_atobalias_balias = (
+        "SELECT a.id AS a_id, anon_1.a_to_b_1_a_id AS a_to_b_1_a_id, "
+        "anon_1.a_to_b_1_b_id AS a_to_b_1_b_id, anon_1.b_1_id AS b_1_id, "
+        "anon_1.b_1_a_id AS b_1_a_id FROM a LEFT OUTER JOIN "
+        "(SELECT a_to_b_1.a_id AS a_to_b_1_a_id, a_to_b_1.b_id AS a_to_b_1_b_id, "
+        "b_1.id AS b_1_id, b_1.a_id AS b_1_a_id FROM a_to_b AS a_to_b_1 "
+        "JOIN b AS b_1 ON b_1.id = a_to_b_1.b_id) AS anon_1 ON a.id = anon_1.a_to_b_1_a_id"
+    )
+
 class JoinPlainTest(_JoinRewriteTestBase, fixtures.TestBase):
     """test rendering of each join with normal nesting."""
     @util.classproperty
@@ -330,6 +352,14 @@ class JoinPlainTest(_JoinRewriteTestBase, fixtures.TestBase):
         "ON a.id = a_to_b_1.a_id"
     )
 
+    _a_atobalias_balias = (
+        "SELECT a.id AS a_id, a_to_b_1.a_id AS a_to_b_1_a_id, "
+        "a_to_b_1.b_id AS a_to_b_1_b_id, b_1.id AS b_1_id, "
+        "b_1.a_id AS b_1_a_id "
+        "FROM a LEFT OUTER JOIN (a_to_b AS a_to_b_1 "
+        "JOIN b AS b_1 ON b_1.id = a_to_b_1.b_id) ON a.id = a_to_b_1.a_id"
+    )
+
 class JoinNoUseLabelsTest(_JoinRewriteTestBase, fixtures.TestBase):
     @util.classproperty
     def __dialect__(cls):
@@ -406,11 +436,18 @@ class JoinNoUseLabelsTest(_JoinRewriteTestBase, fixtures.TestBase):
         "ON a.id = a_to_b_1.a_id"
     )
 
+    _a_atobalias_balias = (
+        "SELECT a.id, a_to_b_1.a_id, a_to_b_1.b_id, b_1.id, b_1.a_id "
+        "FROM a LEFT OUTER JOIN (a_to_b AS a_to_b_1 "
+        "JOIN b AS b_1 ON b_1.id = a_to_b_1.b_id) ON a.id = a_to_b_1.a_id"
+    )
+
 class JoinExecTest(_JoinRewriteTestBase, fixtures.TestBase):
     """invoke the SQL on the current backend to ensure compatibility"""
 
     _a_bc = _a_bc_comma_a1_selbc = _a__b_dc = _a_bkeyassoc = \
-        _a_bkeyassoc_aliased = _a_atobalias_balias_c_w_exists = None
+        _a_bkeyassoc_aliased = _a_atobalias_balias_c_w_exists = \
+        _a_atobalias_balias = None
 
     @classmethod
     def setup_class(cls):