From e05f91efb8034243f91851c07abe03d46fbdd474 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 14 Mar 2018 11:04:43 -0400
Subject: Track if we're rendering within the CTE recursively

Fixed a regression that occurred from the previous fix to :ticket:`4204` in
version 1.2.5, where a CTE that refers to itself after the
:meth:`.CTE.alias` method has been called would not refer to iself
correctly.

Change-Id: Iaa63d65ad2b90c8693f9953fbb32dbb10c73a037
Fixes: #4204
(cherry picked from commit ef2859bbc8bb8104bf4e429a52efb50a712d834a)
---
 test/sql/test_cte.py        | 44 ++++++++++++++++++++++++++++++++++++++++++++
 test/sql/test_generative.py |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

(limited to 'test/sql')

diff --git a/test/sql/test_cte.py b/test/sql/test_cte.py
index 2c19ed032..efc4640ed 100644
--- a/test/sql/test_cte.py
+++ b/test/sql/test_cte.py
@@ -122,6 +122,50 @@ class CTETest(fixtures.TestBase, AssertsCompiledSQL):
             "JOIN parts ON anon_1.part = parts.part "
             "GROUP BY anon_1.sub_part", dialect=mssql.dialect())
 
+    def test_recursive_inner_cte_unioned_to_alias(self):
+        parts = table('parts',
+                      column('part'),
+                      column('sub_part'),
+                      column('quantity'),
+                      )
+
+        included_parts = select([
+            parts.c.sub_part,
+            parts.c.part,
+            parts.c.quantity]).\
+            where(parts.c.part == 'our part').\
+            cte(recursive=True)
+
+        incl_alias = included_parts.alias('incl')
+        parts_alias = parts.alias()
+        included_parts = incl_alias.union(
+            select([
+                parts_alias.c.sub_part,
+                parts_alias.c.part,
+                parts_alias.c.quantity]).
+            where(parts_alias.c.part == incl_alias.c.sub_part)
+        )
+
+        s = select([
+            included_parts.c.sub_part,
+            func.sum(included_parts.c.quantity).label('total_quantity')]).\
+            select_from(included_parts.join(
+                parts, included_parts.c.part == parts.c.part)).\
+            group_by(included_parts.c.sub_part)
+        self.assert_compile(
+            s, "WITH RECURSIVE incl(sub_part, part, quantity) "
+            "AS (SELECT parts.sub_part AS sub_part, parts.part "
+            "AS part, parts.quantity AS quantity FROM parts "
+            "WHERE parts.part = :part_1 UNION "
+            "SELECT parts_1.sub_part AS sub_part, "
+            "parts_1.part AS part, parts_1.quantity "
+            "AS quantity FROM parts AS parts_1, incl "
+            "WHERE parts_1.part = incl.sub_part) "
+            "SELECT incl.sub_part, "
+            "sum(incl.quantity) AS total_quantity FROM incl "
+            "JOIN parts ON incl.part = parts.part "
+            "GROUP BY incl.sub_part")
+
     def test_recursive_union_no_alias_one(self):
         s1 = select([literal(0).label("x")])
         cte = s1.cte(name="cte", recursive=True)
diff --git a/test/sql/test_generative.py b/test/sql/test_generative.py
index 145b2da3c..8b1436879 100644
--- a/test/sql/test_generative.py
+++ b/test/sql/test_generative.py
@@ -509,7 +509,7 @@ class ClauseTest(fixtures.TestBase, AssertsCompiledSQL):
         self.assert_compile(
             cloned,
             "WITH RECURSIVE foo(n) AS (SELECT values(:values_1) AS n "
-            "UNION ALL SELECT foo.n + :n_1 AS anon_1 FROM t AS foo "
+            "UNION ALL SELECT foo.n + :n_1 AS anon_1 FROM foo "
             "WHERE foo.n < :n_2) SELECT sum(foo.n) AS sum_1 FROM foo"
         )
 
-- 
cgit v1.2.1