bad merge

James Cor · James Cor · commit 0bae8b393360 · 2024-12-26T13:27:06.000-08:00
diff --git a/sql/expression/tablefunction/table_function.go b/sql/expression/tablefunction/table_function.go
@@ -82,7 +82,7 @@ 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
+	return sql.RowsToRowIter(sql.UntypedSqlRow{v}), nil
 }
 
 func (t *TableFunctionWrapper) Resolved() bool {
diff --git a/sql/plan/create_user_data.go b/sql/plan/create_user_data.go
@@ -178,10 +178,11 @@ func NewDefaultAuthentication(password string) Authentication {
 type AuthenticationOther struct {
 	password string
 	plugin   string
+	identity string
 }
 
-func NewOtherAuthentication(password, plugin string) Authentication {
-	return AuthenticationOther{password, plugin}
+func NewOtherAuthentication(password, plugin, identity string) Authentication {
+	return AuthenticationOther{password, plugin, identity}
 }
 
 func (a AuthenticationOther) Plugin() string {

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func (t TableFunctionWrapper) RowIter(ctx sql.Context, r sql.Row) (sql.RowIter`
`82`	`82`	`if err != nil {`
`83`	`83`	`return nil, err`
`84`	`84`	`}`
`85`		`- return sql.RowsToRowIter(sql.Row{v}), nil`
	`85`	`+ return sql.RowsToRowIter(sql.UntypedSqlRow{v}), nil`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`func (t *TableFunctionWrapper) Resolved() bool {`
Original file line number	Diff line number	Diff line change
`@@ -178,10 +178,11 @@ func NewDefaultAuthentication(password string) Authentication {`
`178`	`178`	`type AuthenticationOther struct {`
`179`	`179`	`password string`
`180`	`180`	`plugin string`
	`181`	`+ identity string`
`181`	`182`	`}`
`182`	`183`
`183`		`-func NewOtherAuthentication(password, plugin string) Authentication {`
`184`		`- return AuthenticationOther{password, plugin}`
	`184`	`+func NewOtherAuthentication(password, plugin, identity string) Authentication {`
	`185`	`+ return AuthenticationOther{password, plugin, identity}`
`185`	`186`	`}`
`186`	`187`
`187`	`188`	`func (a AuthenticationOther) Plugin() string {`