moveJoinConditionsToFilter bug

enginetest/queries/queries.go

@@ -6937,6 +6937,10 @@ var QueryTests = []QueryTest{
 		Query:    "SELECT CONV(i, 10, 2) FROM mytable",
 		Expected: []sql.Row{{"1"}, {"10"}, {"11"}},
 	},
+	{
+		Query:    `SELECT t1.pk from one_pk join (one_pk t1 join one_pk t2 on t1.pk = t2.pk) on t1.pk = one_pk.pk and one_pk.pk = 1 join (one_pk t3 join one_pk t4 on t3.c1 is not null) on t3.pk = one_pk.pk and one_pk.c1 = 10`,
+		Expected: []sql.Row{{1}, {1}, {1}, {1}},
+	},
 	{
 		Query:    "select i from mytable where i in (select (select i from mytable order by i limit 1) as i)",
 		Expected: []sql.Row{{1}},

sql/analyzer/optimization_rules.go

@@ -133,28 +133,19 @@ func moveJoinConditionsToFilter(ctx *sql.Context, a *Analyzer, n sql.Node, scope
 		return node, transform.SameTree, nil
 	}
 
-	// Add a new filter node with all removed predicates above the top level InnerJoin. Or, if there is a filter node
-	// above that, combine into a new filter.
-	selector := func(c transform.Context) bool {
-		switch c.Parent.(type) {
-		case *plan.Filter:
-			return false
+	return transform.NodeWithCtx(node, func(transform.Context) bool { return true }, func(c transform.Context) (sql.Node, transform.TreeIdentity, error) {
+		if c.Node != topJoin {
+			return c.Node, transform.SameTree, nil
 		}
-		return c.Parent != topJoin
-	}
-
-	return transform.NodeWithCtx(node, selector, func(c transform.Context) (sql.Node, transform.TreeIdentity, error) {
-		switch node := c.Node.(type) {
+		switch n := c.Parent.(type) {
 		case *plan.Filter:
 			return plan.NewFilter(
-				expression.JoinAnd(append([]sql.Expression{node.Expression}, nonJoinFilters...)...),
-				node.Child), transform.NewTree, nil
-		case *plan.InnerJoin, *plan.CrossJoin:
+				expression.JoinAnd(append([]sql.Expression{n.Expression}, nonJoinFilters...)...),
+				n.Child), transform.NewTree, nil
+		default:
 			return plan.NewFilter(
 				expression.JoinAnd(nonJoinFilters...),
-				node), transform.NewTree, nil
-		default:
-			return node, transform.SameTree, nil
+				c.Node), transform.NewTree, nil
 		}
 	})
 }