[binder] duplicate CTEs get distinct table and column ids

Author: max-hoffman

enginetest/queries/imdb_plans.go

@@ -778,6 +778,12 @@ var SpatialQueryTests = []QueryTest{
 }
 
 var QueryTests = []QueryTest{
+	{
+		Query: "WITH cte AS (SELECT * FROM xy) SELECT *, (SELECT SUM(x) FROM cte) AS xy FROM cte",
+		Expected: []sql.Row{
+			{0, 2, float64(6)}, {1, 0, float64(6)}, {2, 1, float64(6)}, {3, 3, float64(6)},
+		},
+	},
 	{
 		Query: "select 0 as col1, 1 as col2, 2 as col2 group by col2 having col2 = 1",
 		Expected: []sql.Row{

enginetest/queries/integration_plans.go

@@ -85,6 +85,7 @@ func (b *Builder) buildCte(inScope *scope, e ast.TableExpr, name string, columns
 
 func (b *Builder) buildRecursiveCte(inScope *scope, union *ast.SetOp, name string, columns []string) *scope {
 	l, r := splitRecursiveCteUnion(name, union)
+	scopeMapping := make(map[sql.ColumnId]sql.Expression)
 	if r == nil {
 		// not recursive
 		sqScope := inScope.pushSubquery()
@@ -104,9 +105,10 @@ func (b *Builder) buildRecursiveCte(inScope *scope, union *ast.SetOp, name strin
 				c.tableId = tabId
 				cteScope.cols[i] = c
 				colset.Add(sql.ColumnId(c.id))
+				scopeMapping[sql.ColumnId(c.id)] = c.scalarGf()
 			}
 
-			cteScope.node = sq.WithId(tabId).WithColumns(colset)
+			cteScope.node = sq.WithScopeMapping(scopeMapping).WithId(tabId).WithColumns(colset)
 		}
 		return cteScope
 	}
@@ -128,7 +130,6 @@ func (b *Builder) buildRecursiveCte(inScope *scope, union *ast.SetOp, name strin
 	cteScope := leftScope.replace()
 	tableId := cteScope.addTable(name)
 	var cols sql.ColSet
-	scopeMapping := make(map[sql.ColumnId]sql.Expression)
 	{
 		rInit = leftScope.node
 		recSch = make(sql.Schema, len(rInit.Schema()))
@@ -149,7 +150,6 @@ func (b *Builder) buildRecursiveCte(inScope *scope, union *ast.SetOp, name strin
 			c.scalar = nil
 			c.table = name
 			toId := cteScope.newColumn(c)
-			scopeMapping[sql.ColumnId(toId)] = c.scalarGf()
 			cols.Add(sql.ColumnId(toId))
 		}
 		b.renameSource(cteScope, name, columns)

enginetest/queries/queries.go

@@ -52,6 +52,9 @@ func TestPlanBuilder(t *testing.T) {
 	//rewrite = true
 
 	var tests = []planTest{
+		{
+			Query: "WITH cte AS (SELECT * FROM xy) SELECT *, (SELECT SUM(x) FROM cte) AS xy FROM cte",
+		},
 		{
 			Query: "select 0 as col1, 1 as col2, 2 as col2 group by col2 having col2 = 1",
 			ExpectedPlan: `

enginetest/queries/query_plans.go

@@ -360,13 +360,19 @@ func (s *scope) aliasCte(alias string) *scope {
 		return nil
 	}
 	outScope := s.copy()
-	if _, ok := s.tables[alias]; ok || alias == "" {
-		return outScope
-	}
 
 	sq, _ := outScope.node.(*plan.SubqueryAlias)
 
-	tabId := outScope.addTable(alias)
+	name := strings.ToLower(outScope.node.(sql.NameableNode).Name())
+
+	var tabId sql.TableId
+	if alias != "" {
+		tabId = outScope.addTable(alias)
+	} else {
+		alias = name
+		tabId = s.tables[strings.ToLower(name)]
+	}
+
 	outScope.cols = nil
 	var colSet sql.ColSet
 	scopeMapping := make(map[sql.ColumnId]sql.Expression)
@@ -462,6 +468,7 @@ func (s *scope) getCte(name string) *scope {
 		if checkScope.ctes != nil {
 			cte, ok := checkScope.ctes[strings.ToLower(name)]
 			if ok {
+				cte.tables[name] += 1
 				return cte
 			}
 		}