Merge pull request #1679 from dolthub/daylon/join-fix

Hydrocharged · web-flow · commit 7d5325285657 · 2023-03-28T19:18:06.000-07:00
Small fix for a join-related regression in Dolt
diff --git a/sql/analyzer/indexed_joins.go b/sql/analyzer/indexed_joins.go
@@ -56,6 +56,8 @@ func constructJoinPlan(ctx *sql.Context, a *Analyzer, n sql.Node, scope *Scope,
 			case *plan.JoinNode:
 				reorder = false
 			}
+		case *plan.Union:
+			reorder = false
 		case *plan.JoinNode:
 			if n.JoinType().IsPhysical() {
 				// TODO: nested subqueries attempt to replan joins, which

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ func constructJoinPlan(ctx sql.Context, a Analyzer, n sql.Node, scope *Scope,`
`56`	`56`	`case *plan.JoinNode:`
`57`	`57`	`reorder = false`
`58`	`58`	`}`
	`59`	`+ case *plan.Union:`
	`60`	`+ reorder = false`
`59`	`61`	`case *plan.JoinNode:`
`60`	`62`	`if n.JoinType().IsPhysical() {`
`61`	`63`	`// TODO: nested subqueries attempt to replan joins, which`