Merge pull request #3105 from dolthub/jennifer/srf

jennifersp · web-flow · commit 50982784d998 · 2025-07-17T10:42:24.000-07:00
support set returning function cases in table function wrapper
diff --git a/sql/expression/tablefunction/table_function.go b/sql/expression/tablefunction/table_function.go
@@ -50,6 +50,9 @@ func (t *TableFunctionWrapper) NewInstance(ctx *sql.Context, db sql.Database, ar
 	if err != nil {
 		return nil, err
 	}
+	if !f.Resolved() {
+		return nil, fmt.Errorf("table function is unresolved")
+	}
 	nt.funcExpr = f
 	return &nt, nil
 }
@@ -82,7 +85,11 @@ func (t *TableFunctionWrapper) RowIter(ctx *sql.Context, r sql.Row) (sql.RowIter
 	if err != nil {
 		return nil, err
 	}
-	return sql.RowsToRowIter(sql.Row{v}), nil
+	if ri, ok := v.(sql.RowIter); ok {
+		return ri, nil
+	} else {
+		return sql.RowsToRowIter(sql.Row{v}), nil
+	}
 }
 
 func (t *TableFunctionWrapper) Resolved() bool {

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,9 @@ func (t TableFunctionWrapper) NewInstance(ctx sql.Context, db sql.Database, ar`
`50`	`50`	`if err != nil {`
`51`	`51`	`return nil, err`
`52`	`52`	`}`
	`53`	`+ if !f.Resolved() {`
	`54`	`+ return nil, fmt.Errorf("table function is unresolved")`
	`55`	`+ }`
`53`	`56`	`nt.funcExpr = f`
`54`	`57`	`return &nt, nil`
`55`	`58`	`}`
`@@ -82,7 +85,11 @@ func (t TableFunctionWrapper) RowIter(ctx sql.Context, r sql.Row) (sql.RowIter`
`82`	`85`	`if err != nil {`
`83`	`86`	`return nil, err`
`84`	`87`	`}`
`85`		`- return sql.RowsToRowIter(sql.Row{v}), nil`
	`88`	`+ if ri, ok := v.(sql.RowIter); ok {`
	`89`	`+ return ri, nil`
	`90`	`+ } else {`
	`91`	`+ return sql.RowsToRowIter(sql.Row{v}), nil`
	`92`	`+ }`
`86`	`93`	`}`
`87`	`94`
`88`	`95`	`func (t *TableFunctionWrapper) Resolved() bool {`