fix panic over setop with joins and subqueries

Author: James Cor

enginetest/queries/script_queries.go

@@ -11206,8 +11206,8 @@ where
 
 	{
 		// TODO: This test currently fails in Doltgres because Doltgres does not allow `create table...as select...`
-		// even though it's a valid Postgres query. Remove Dialect tag once fixed in Doltgres
-		// https://github.com/dolthub/doltgresql/issues/1669
+		//   even though it's a valid Postgres query. Remove Dialect tag once fixed in Doltgres
+		//   https://github.com/dolthub/doltgresql/issues/1669
 		Dialect: "mysql",
 		Name:    "union field indexes",
 		SetUpScript: []string{
@@ -11218,18 +11218,30 @@ where
 		},
 		Assertions: []ScriptTestAssertion{
 			{
-				Query: "select * from " +
-					"(select id, words from t union " +
-					"select id,words from t2) as combined where combined.id=1",
+				Query: `
+select * from (
+    select id, words from t
+    union
+    select id, words from t2
+) as combined
+where
+    combined.id = 1;
+`,
 				Expected: []sql.Row{
 					{1, "foo"},
 					{1, "boo"},
 				},
 			},
 			{
-				Query: "select * from " +
-					"(select 'parent' as tbl, id, words from t union " +
-					"select 'child' as tbl, id,words from t2) as combined where combined.id=1",
+				Query: `
+select * from (
+    select 'parent' as tbl, id, words from t
+    union
+    select 'child' as tbl, id, words from t2
+) as combined
+where
+    combined.id = 1;
+`,
 				Expected: []sql.Row{
 					{"parent", 1, "foo"},
 					{"child", 1, "boo"},
@@ -11270,6 +11282,71 @@ where
 			},
 		},
 	},
+	{
+		// https://github.com/dolthub/dolt/issues/9631
+		Name: "test union/intersect/except over subqueries over joins",
+		SetUpScript: []string{
+			"create table t1 (i int primary key);",
+			"create table t2 (j int primary key);",
+			"insert into t1 values (0), (1);",
+			"insert into t2 values (0), (2);",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: `
+select * from t1 union (
+    select j from t2
+    where (
+        j > 10
+        or
+        j in (
+            select j from t1 join t2
+        )
+    )
+);
+`,
+				Expected: []sql.Row{
+					{0},
+					{1},
+					{2},
+				},
+			},
+			{
+				Query: `
+select * from t1 intersect (
+    select j from t2
+    where (
+        j = 1
+        or
+        j in (
+            select j from t1 join t2
+        )
+    )
+);
+`,
+				Expected: []sql.Row{
+					{0},
+				},
+			},
+			{
+				Query: `
+select * from t1 except (
+    select j from t2
+    where (
+        j = 1
+        or
+        j in (
+            select j from t1 join t2
+        )
+    )
+);
+`,
+				Expected: []sql.Row{
+					{1},
+				},
+			},
+		},
+	},
 }
 
 var SpatialScriptTests = []ScriptTest{

sql/analyzer/analyzer.go

@@ -450,7 +450,9 @@ func NewFinalizeUnionSel(sel RuleSelector) RuleSelector {
 		case
 			// skip recursive resolve rules
 			resolveSubqueriesId,
-			resolveUnionsId:
+			resolveUnionsId,
+			// skip redundant finalize rules
+			assignExecIndexesId:
 			return false
 		case finalizeSubqueriesId,
 			hoistOutOfScopeFiltersId:

sql/analyzer/resolve_unions.go

@@ -95,10 +95,10 @@ func finalizeUnions(ctx *sql.Context, a *Analyzer, n sql.Node, scope *plan.Scope
 
 		scope.SetJoin(false)
 
-		newn, err := n.WithChildren(left, right)
+		newN, err := n.WithChildren(left, right)
 		if err != nil {
 			return nil, transform.SameTree, err
 		}
-		return newn, transform.NewTree, nil
+		return newN, transform.NewTree, nil
 	})
 }