mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-26 11:39:05 -05:00
Code Issues Packages Projects Releases 158 Wiki Activity

Fixing tests & code cleanup

Browse Source
This commit is contained in:
Nathan Gabrielson
2025-06-23 09:07:47 -07:00
parent 63a24513fc
commit 6b9a55cc31
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/cmd/dolt/commands/stash.go
+9 -10
View File
@@ -123,7 +123,7 @@ func stashPush(ctx context.Context, cliCtx cli.CliContext, apr *argparser.ArgPar
defer closeFunc()
}
stashes, err := getStashesSQL(ctx, sqlCtx, queryist, 1)
stashes, err := getStashesSQL(sqlCtx, queryist, 1)
if err != nil {
return err
}
@@ -147,7 +147,7 @@ func stashRemove(ctx context.Context, cliCtx cli.CliContext, apr *argparser.ArgP
defer closeFunc()
}
stashes, err := getStashesSQL(ctx, sqlCtx, queryist, 0)
stashes, err := getStashesSQL(sqlCtx, queryist, 0)
if err != nil {
return err
}
@@ -158,8 +158,7 @@ func stashRemove(ctx context.Context, cliCtx cli.CliContext, apr *argparser.ArgP
return fmt.Errorf("stash index stash@{%d} does not exist", idx)
}
qry, params := generateStashSql(apr, subcommand)
interpolatedQuery, err := dbr.InterpolateForDialect(qry, params, dialect.MySQL)
interpolatedQuery, err := generateStashSql(apr, subcommand)
if err != nil {
return err
}
@@ -190,7 +189,7 @@ func stashList(ctx context.Context, cliCtx cli.CliContext) error {
defer closeFunc()
}
stashes, err := getStashesSQL(ctx, sqlCtx, queryist, 0)
stashes, err := getStashesSQL(sqlCtx, queryist, 0)
if err != nil {
return err
}
@@ -214,7 +213,7 @@ func stashClear(ctx context.Context, cliCtx cli.CliContext, apr *argparser.ArgPa
}
// getStashesSQL queries the dolt_stashes system table to return the requested number of stashes. A limit of 0 will get all stashes
func getStashesSQL(ctx context.Context, sqlCtx *sql.Context, queryist cli.Queryist, limit int) ([]*doltdb.Stash, error) {
func getStashesSQL(sqlCtx *sql.Context, queryist cli.Queryist, limit int) ([]*doltdb.Stash, error) {
limitStr := fmt.Sprintf("limit %d", limit)
if limit == 0 {
limitStr = ""
@@ -261,7 +260,7 @@ func getStashesSQL(ctx context.Context, sqlCtx *sql.Context, queryist cli.Queryi
}
// generateStashSql returns the query that will call the `DOLT_STASH` stored procedure.
func generateStashSql(apr *argparser.ArgParseResults, subcommand string) (string, []interface{}) {
func generateStashSql(apr *argparser.ArgParseResults, subcommand string) (string, error) {
var buffer bytes.Buffer
var params []interface{}
buffer.WriteString("CALL DOLT_STASH(?, ?")
@@ -281,7 +280,8 @@ func generateStashSql(apr *argparser.ArgParseResults, subcommand string) (string
}
buffer.WriteString(")")
return buffer.String(), params
interpolatedQuery, err := dbr.InterpolateForDialect(buffer.String(), params, dialect.MySQL)
return interpolatedQuery, err
}
func stashQuery(ctx context.Context, cliCtx cli.CliContext, apr *argparser.ArgParseResults, subcommand string) (sql.RowIter, cli.Queryist, *sql.Context, func(), error) {
@@ -290,8 +290,7 @@ func stashQuery(ctx context.Context, cliCtx cli.CliContext, apr *argparser.ArgPa
return nil, nil, nil, nil, err
}
qry, params := generateStashSql(apr, subcommand)
interpolatedQuery, err := dbr.InterpolateForDialect(qry, params, dialect.MySQL)
interpolatedQuery, err := generateStashSql(apr, subcommand)
if err != nil {
return nil, nil, nil, nil, err
}
go/libraries/doltcore/sqle/dprocedures/dolt_stash.go
+1 -1
View File
@@ -504,7 +504,7 @@ func handleMerge(ctx *sql.Context, dbData env.DbData[*sql.Context], stashName st
tblNames := strings.Join(doltdb.FlattenTableNames(tablesWithConflict), "', '")
status := fmt.Errorf("error: Your local changes to the following tables would be overwritten by applying stash %d:\n"+
"\t{'%s'}\n"+
"Please commit your changes or stash them before you merge.\nAborting\n\"The stash entry is kept in case you need it again.\n", idx, tblNames)
"Please commit your changes or stash them before you merge.\nAborting\nThe stash entry is kept in case you need it again.\n", idx, tblNames)
return nil, nil, nil, status
}
go/libraries/doltcore/sqle/enginetest/dolt_queries_help.go
+1
View File
@@ -57,6 +57,7 @@ var DoltHelpScripts = []queries.ScriptTest{
{"dolt_backup"},
{"dolt_tag"},
{"dolt_gc"},
{"dolt_stash"},
{"dolt_rebase"},
},
},
go/libraries/doltcore/sqle/enginetest/dolt_queries_stash.go
+1 -1
View File
@@ -292,7 +292,7 @@ var DoltStashTests = []queries.ScriptTest{
{
Query: "CALL DOLT_STASH('pop', 'myStash');",
ExpectedErrStr: "error: Your local changes to the following tables would be overwritten by applying stash 0:\n\t{'test'}\n" +
"Please commit your changes or stash them before you merge.\nAborting\n",
"Please commit your changes or stash them before you merge.\nAborting\nThe stash entry is kept in case you need it again.\n",
},
{
Query: "SELECT * FROM DOLT_STASHES;",