Merge pull request #3250 from dolthub/angela/subquery_optimization

Replace SubqueryAlias that selects an entire table with TableAlias

Author: angelamayxie

enginetest/enginetests.go

@@ -4915,10 +4915,6 @@ func TestSessionSelectLimit(t *testing.T, harness Harness) {
 			Query:    "select count(*), y from (select y from a) b group by y;",
 			Expected: []sql.Row{{2, 1}, {3, 2}},
 		},
-		{
-			Query:    "select count(*), y from (select y from a) b group by y;",
-			Expected: []sql.Row{{2, 1}, {3, 2}},
-		},
 		{
 			Query:    "with b as (select y from a order by x) select * from b",
 			Expected: []sql.Row{{1}, {1}},

enginetest/join_planning_tests.go

@@ -1801,12 +1801,12 @@ join uv d on d.u = c.x`,
 		tests: []JoinPlanTest{
 			{
 				q:     "select * from t1 cross join t2 join (select * from t3) v3 on v3.k = t2.j;",
-				types: []plan.JoinType{plan.JoinTypeHash, plan.JoinTypeCross},
+				types: []plan.JoinType{plan.JoinTypeCross, plan.JoinTypeInner},
 				exp:   []sql.Row{},
 			},
 			{
 				q:     "select * from t1 cross join t2 join (select * from t3) v3 on v3.k >= t2.j order by i, j, k;",
-				types: []plan.JoinType{plan.JoinTypeInner, plan.JoinTypeCross},
+				types: []plan.JoinType{plan.JoinTypeCross, plan.JoinTypeInner},
 				exp: []sql.Row{
 					{1, 1, 3},
 					{1, 2, 3},