Bug fixes

zachmu · zachmu · commit 5ffb12b50540 · 2025-06-26T18:36:59.000-07:00
diff --git a/sql/rowexec/rel_iters.go b/sql/rowexec/rel_iters.go
@@ -187,7 +187,7 @@ func (i *ProjectIter) ProjectRowWithNestedIters(
 
 		nestedIterationFinished := true 
 		for _, evaluator := range i.nestedState.iterEvaluators {
-			if !evaluator.finished {
+			if !evaluator.finished && evaluator.iter != nil {
 				nestedIterationFinished = false
 				break
 			}
@@ -268,7 +268,7 @@ func (r RowIterEvaluator) IsNullable() bool {
 }
 
 func (r *RowIterEvaluator) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
-	if r.finished {
+	if r.finished || r.iter == nil {
 		return nil, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ func (i *ProjectIter) ProjectRowWithNestedIters(`
`187`	`187`
`188`	`188`	`nestedIterationFinished := true`
`189`	`189`	`for _, evaluator := range i.nestedState.iterEvaluators {`
`190`		`- if !evaluator.finished {`
	`190`	`+ if !evaluator.finished && evaluator.iter != nil {`
`191`	`191`	`nestedIterationFinished = false`
`192`	`192`	`break`
`193`	`193`	`}`
`@@ -268,7 +268,7 @@ func (r RowIterEvaluator) IsNullable() bool {`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`func (r RowIterEvaluator) Eval(ctx sql.Context, row sql.Row) (interface{}, error) {`
`271`		`- if r.finished {`
	`271`	`+ if r.finished \|\| r.iter == nil {`
`272`	`272`	`return nil, nil`
`273`	`273`	`}`
`274`	`274`