bad merge

dolthub · Dec 26, 2024 · 0bae8b3 · 0bae8b3
1 parent 27a1049
commit 0bae8b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
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 {