Merge pull request #8299 from dolthub/taylor/procedure-return

More consistent return types for dolt procedures

go/libraries/doltcore/sqle/dprocedures/dolt_cherry_pick.go

@@ -58,7 +58,7 @@ func doltCherryPick(ctx *sql.Context, args ...string) (sql.RowIter, error) {
 	if err != nil {
 		return nil, err
 	}
-	return rowToIter(newCommitHash, dataConflicts, schemaConflicts, constraintViolations), nil
+	return rowToIter(newCommitHash, int64(dataConflicts), int64(schemaConflicts), int64(constraintViolations)), nil
 }
 
 // doDoltCherryPick attempts to perform a cherry-pick merge based on the arguments specified in |args| and returns

go/libraries/doltcore/sqle/dprocedures/dolt_conflicts_resolve.go

@@ -48,7 +48,7 @@ func doltConflictsResolve(ctx *sql.Context, args ...string) (sql.RowIter, error)
 	if err != nil {
 		return nil, err
 	}
-	return rowToIter(res), nil
+	return rowToIter(int64(res)), nil
 }
 
 // DoltConflictsCatFunc runs a `dolt commit` in the SQL context, committing staged changes to head.

go/libraries/doltcore/sqle/dprocedures/dolt_remote.go

@@ -36,7 +36,7 @@ func doltRemote(ctx *sql.Context, args ...string) (sql.RowIter, error) {
 	if err != nil {
 		return nil, err
 	}
-	return rowToIter(res), nil
+	return rowToIter(int64(res)), nil
 }
 
 // doDoltRemote is used as sql dolt_remote command for only creating or deleting remotes, not listing.

go/libraries/doltcore/sqle/dprocedures/dolt_tag.go

@@ -30,7 +30,7 @@ func doltTag(ctx *sql.Context, args ...string) (sql.RowIter, error) {
 	if err != nil {
 		return nil, err
 	}
-	return rowToIter(res), nil
+	return rowToIter(int64(res)), nil
 }
 
 // doDoltTag is used as sql dolt_tag command for only creating or deleting tags, not listing.

integration-tests/mysql-client-tests/node/workbenchTests/databases.js

@@ -51,8 +51,8 @@ export const databaseTests = [
   {
     q: `SELECT dolt_version()`,
     res: [{ "dolt_version()": "0.0.0" }],
-    matcher: (_, exp) => {
-      return exp[0]["dolt_version()"].length > 0;
+    matcher: (res) => {
+      return res[0]["dolt_version()"].length > 0;
     },
   },
 ];