Refactor how we manage outer scopes in join iteration

enginetest/queries/derived_table_outer_scope_visibility_queries.go

@@ -125,7 +125,7 @@ var DerivedTableOuterScopeVisibilityQueries = []ScriptTest{
 		},
 	},
 	{
-		Name: "https://github.com/dolthub/go-mysql-server/issues/1282",
+		Name: "github.com/dolthub/go-mysql-server/issues/1282",
 		SetUpScript: []string{
 			"CREATE TABLE `dcim_rackgroup` (`id` char(32) NOT NULL, `lft` int unsigned NOT NULL, `rght` int unsigned NOT NULL, `tree_id` int unsigned NOT NULL, `level` int unsigned NOT NULL, `parent_id` char(32), PRIMARY KEY (`id`), KEY `dcim_rackgroup_tree_id_9c2ad6f4` (`tree_id`), CONSTRAINT `dcim_rackgroup_parent_id_cc315105_fk_dcim_rackgroup_id` FOREIGN KEY (`parent_id`) REFERENCES `dcim_rackgroup` (`id`));",
 			"CREATE TABLE `dcim_rack` (`id` char(32) NOT NULL, `group_id` char(32), PRIMARY KEY (`id`), KEY `dcim_rack_group_id_44e90ea9` (`group_id`), CONSTRAINT `dcim_rack_group_id_44e90ea9_fk_dcim_rackgroup_id` FOREIGN KEY (`group_id`) REFERENCES `dcim_rackgroup` (`id`));",

enginetest/queries/join_queries.go

@@ -1557,4 +1557,83 @@ LATERAL (
 			},
 		},
 	},
+	{
+		Name: "nested lateral joins",
+		SetUpScript: []string{
+			"CREATE table ab (a int primary key, b int);",
+			"insert into ab values (0,3), (1,2), (2,1), (3,0);",
+			"create table three_pk (pk1 tinyint, pk2 tinyint, pk3 tinyint, col tinyint, primary key (pk1, pk2))",
+			"insert into three_pk values (0,0,0,100), (0,1,1,101), (1,0,1,110), (1,1,0,111)",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: `select * from ab ab1 join lateral (select * from ab ab2 join lateral (select * from three_pk where pk1 = ab1.a and pk2 = ab2.a) inner1) inner2;`,
+				Expected: []sql.Row{
+					{0, 3, 0, 3, 0, 0, 0, 100},
+					{0, 3, 1, 2, 0, 1, 1, 101},
+					{1, 2, 0, 3, 1, 0, 1, 110},
+					{1, 2, 1, 2, 1, 1, 0, 111},
+				},
+			},
+			{
+				Query: `select * from ab ab1 join lateral (select * from ab ab2 join lateral (select * from ab ab3 join lateral (select * from three_pk where pk1 = ab1.a and pk2 = ab2.a and pk3 = ab3.a) inner1) inner2) inner3;`,
+				Expected: []sql.Row{
+					{0, 3, 0, 3, 0, 3, 0, 0, 0, 100},
+					{0, 3, 1, 2, 1, 2, 0, 1, 1, 101},
+					{1, 2, 0, 3, 1, 2, 1, 0, 1, 110},
+					{1, 2, 1, 2, 0, 3, 1, 1, 0, 111},
+				},
+			},
+			{
+				Query: `select * from ab ab1 where exists (select * from ab ab2 where exists (select * from three_pk where pk1 = ab1.a and pk2 = ab2.a));`,
+				Expected: []sql.Row{
+					{0, 3},
+					{1, 2},
+				},
+			},
+			{
+				Query: `select * from ab ab1 where exists (select * from ab ab2 where exists (select * from ab ab3 where exists (select * from three_pk where pk1 = ab1.a and pk2 = ab2.a and pk3 = ab3.a)));`,
+				Expected: []sql.Row{
+					{0, 3},
+					{1, 2},
+				},
+			},
+		},
+	},
+	{
+		Name: "non-lateral joins inside inside lateral join",
+		SetUpScript: []string{
+			"CREATE table ab (a int primary key);",
+			"insert into ab values (0), (1), (2);",
+			"create table three_pk (pk1 tinyint, pk2 tinyint, pk3 tinyint, col tinyint, primary key (pk1, pk2))",
+			"insert into three_pk values (0,0,0,100), (0,1,1,101), (1,0,1,110), (1,1,0,111)",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: `
+select *
+from three_pk outer_table join lateral (
+    select /*+ JOIN_ORDER(inner1, inner2, inner3) */ *
+    from three_pk inner1 join (three_pk inner2 join three_pk inner3
+        on outer_table.pk2 = inner2.pk1 and outer_table.pk2 = inner2.pk2
+       and outer_table.pk3 = inner3.pk1 and outer_table.pk3 = inner3.pk2)
+        on outer_table.pk1 = inner1.pk1 and outer_table.pk1 = inner1.pk2
+) inner_join;`,
+				Expected: []sql.Row{
+					{0, 0, 0, 100, 0, 0, 0, 100, 0, 0, 0, 100, 0, 0, 0, 100},
+					{0, 1, 1, 101, 0, 0, 0, 100, 1, 1, 0, 111, 1, 1, 0, 111},
+					{1, 0, 1, 110, 1, 1, 0, 111, 0, 0, 0, 100, 1, 1, 0, 111},
+					{1, 1, 0, 111, 1, 1, 0, 111, 1, 1, 0, 111, 0, 0, 0, 100},
+				},
+			},
+			{
+				Query: `select ab1.a, a2 from ab ab1 join lateral (select ab2.a as a2, ab3.a as a3 from ab ab2 full outer join ab ab3 on ab2.a = ab1.a) inner1 where a3 is null;`,
+				Expected: []sql.Row{
+					{0, 1}, {0, 2},
+					{1, 0}, {1, 2},
+					{2, 0}, {2, 1},
+				},
+			},
+		},
+	},
 }

sql/analyzer/fix_exec_indexes.go

@@ -661,13 +661,6 @@ func (s *idxScope) finalizeSelf(n sql.Node) (sql.Node, error) {
 				return n, nil
 			}
 			n = jn.WithScopeLen(scopeLen)
-			n, err = n.WithChildren(
-				plan.NewStripRowNode(jn.Left(), scopeLen),
-				plan.NewStripRowNode(jn.Right(), scopeLen),
-			)
-			if err != nil {
-				return nil, err
-			}
 		}
 		return n, nil
 	}

sql/analyzer/resolve_subqueries.go

@@ -170,7 +170,8 @@ func finalizeSubqueriesHelper(ctx *sql.Context, a *Analyzer, node sql.Node, scop
 			var subScope *plan.Scope = scope
 			for _, joinParent := range joinParents {
 				if sqa.OuterScopeVisibility && joinParent != nil {
-					if stripChild, ok := joinParent.Right().(*plan.StripRowNode); ok && stripChild.Child == sqa {
+					// if joinParent.Right() == sqa {
+					if false {
 						subScope = scope.NewScopeInJoin(joinParent.Children()[0])
 						subScope.SetLateralJoin(joinParent.Op.IsLateral())
 					} else {

sql/analyzer/symbol_resolution.go

@@ -105,7 +105,7 @@ func pruneTables(ctx *sql.Context, a *Analyzer, n sql.Node, s *plan.Scope, sel R
 			}
 		case *plan.Filter, *plan.Distinct, *plan.GroupBy, *plan.Project, *plan.TableAlias,
 			*plan.Window, *plan.Sort, *plan.Limit, *plan.RecursiveCte,
-			*plan.RecursiveTable, *plan.TopN, *plan.Offset, *plan.StripRowNode:
+			*plan.RecursiveTable, *plan.TopN, *plan.Offset:
 		default:
 			return n, transform.SameTree, nil
 		}

sql/memo/join_order_builder.go

@@ -238,8 +238,6 @@ func (j *joinOrderBuilder) populateSubgraph(n sql.Node) (vertexSet, edgeSet, *Ex
 		group = j.buildJoinLeaf(n)
 	case sql.NameableNode:
 		group = j.buildJoinLeaf(n.(plan.TableIdNode))
-	case *plan.StripRowNode:
-		return j.populateSubgraph(n.Child)
 	case *plan.CachedResults:
 		return j.populateSubgraph(n.Child)
 	default:

sql/plan/scope.go

@@ -99,18 +99,6 @@ func (s *Scope) NewScopeFromSubqueryExpression(node sql.Node, corr sql.ColSet) *
 // NewScopeFromSubqueryExpression returns a new subscope created from a subquery expression contained by the specified
 // node.
 func (s *Scope) NewScopeInJoin(node sql.Node) *Scope {
-	for {
-		var done bool
-		switch n := node.(type) {
-		case *StripRowNode:
-			node = n.Child
-		default:
-			done = true
-		}
-		if done {
-			break
-		}
-	}
 	if s == nil {
 		return &Scope{joinSiblings: []sql.Node{node}}
 	}