Merge pull request #3164 from dolthub/jennifer/tbl-func-wrapper

jennifersp · web-flow · commit 4678e45abe87 · 2025-08-15T13:03:58.000-07:00
handle RowIter as result from Eval function in TableFunctionWrapper
diff --git a/sql/expression/tablefunction/table_function.go b/sql/expression/tablefunction/table_function.go
@@ -85,9 +85,9 @@ func (t *TableFunctionWrapper) RowIter(ctx *sql.Context, r sql.Row) (sql.RowIter
 	if err != nil {
 		return nil, err
 	}
-	//if ri, ok := v.(sql.RowIter); ok {
-	//	return ri, nil
-	//}
+	if ri, ok := v.(sql.RowIter); ok {
+		return ri, nil
+	}
 	return sql.RowsToRowIter(sql.Row{v}), nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,9 @@ func (t TableFunctionWrapper) RowIter(ctx sql.Context, r sql.Row) (sql.RowIter`
`85`	`85`	`if err != nil {`
`86`	`86`	`return nil, err`
`87`	`87`	`}`
`88`		`- //if ri, ok := v.(sql.RowIter); ok {`
`89`		`- // return ri, nil`
`90`		`- //}`
	`88`	`+ if ri, ok := v.(sql.RowIter); ok {`
	`89`	`+ return ri, nil`
	`90`	`+ }`
`91`	`91`	`return sql.RowsToRowIter(sql.Row{v}), nil`
`92`	`92`	`}`
`93`	`93`