mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-25 00:54:51 -06:00
Code Issues Packages Projects Releases 136 Wiki Activity

fix unknown backup err in bats tests

Browse Source
This commit is contained in:
elianddb
2025-11-21 10:24:48 -08:00
parent 62b71303eb
commit d128e67e9a
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
go/cmd/dolt/commands/backup.go
View File

@@ -166,20 +166,20 @@ func callDoltBackupProc(queryEngine *cli.QueryEngineResult, params []string) err
// name, url, and params columns. Otherwise, it prints only the name column.
func printDoltBackupsTable(queryEngine *cli.QueryEngineResult, apr *argparser.ArgParseResults) errhand.VerboseError {
query := fmt.Sprintf("SELECT * FROM `%s`", doltdb.BackupsTableName)
schema, rowItr, _, err := queryEngine.Queryist.Query(queryEngine.Context, query)
schema, rowIter, _, err := queryEngine.Queryist.Query(queryEngine.Context, query)
if err != nil {
return errhand.BuildDError("failed to execute query for %s", doltdb.BackupsTableName).AddCause(err).Build()
}
rows, err := sql.RowIterToRows(queryEngine.Context, rowItr)
rows, err := sql.RowIterToRows(queryEngine.Context, rowIter)
if err != nil {
return errhand.BuildDError("failed to retrieve slice for %s", doltdb.BackupsTableName).AddCause(err).Build()
}
const colExpectedStrFmt = "column '%s': expected string, got %v"
const errColumnExpectedStringFmt = "column '%s' expected string, got %v"
for _, row := range rows {
name, ok := row[0].(string)
if !ok {
return errhand.BuildDError(colExpectedStrFmt, schema[0].Name, row[0]).Build()
return errhand.BuildDError(errColumnExpectedStringFmt, schema[0].Name, row[0]).Build()
}
if !apr.Contains(cli.VerboseFlag) {
@@ -189,12 +189,12 @@ func printDoltBackupsTable(queryEngine *cli.QueryEngineResult, apr *argparser.Ar
url, ok := row[1].(string)
if !ok {
return errhand.BuildDError(colExpectedStrFmt, schema[1].Name, row[1]).Build()
return errhand.BuildDError(errColumnExpectedStringFmt, schema[1].Name, row[1]).Build()
}
jsonStr, err := getJsonAsString(queryEngine.Context, row[2])
if err != nil {
return errhand.BuildDError(colExpectedStrFmt, schema[2].Name, row[2]).AddCause(err).Build()
return errhand.BuildDError(errColumnExpectedStringFmt, schema[2].Name, row[2]).AddCause(err).Build()
}
cli.Printf("%s %s %s\n", name, url, jsonStr)

4
go/libraries/doltcore/sqle/dprocedures/dolt_backup.go
View File

@@ -237,8 +237,8 @@ func restoreBackup(ctx *sql.Context, _ env.DbData[*sql.Context], apr *argparser.
return err
}
if registerErr := sess.Provider().RegisterNewDatabaseWithLock(ctx, dbName, clonedEnv); registerErr != nil {
return registerErr
if err = sess.Provider().RegisterNewDatabaseWithLock(ctx, dbName, clonedEnv); err != nil {
return err
}
return nil

2
integration-tests/bats/backup.bats
View File

@@ -196,7 +196,7 @@ teardown() {
run dolt backup sync bac1
[ "$status" -eq 1 ]
[[ ! "$output" =~ "panic" ]] || false
[[ "$output" =~ "unknown backup: 'bac1'" ]] || false
[[ "$output" =~ "unknown backup 'bac1'" ]] || false
}
@test "backup: cannot override another client's backup" {

2
integration-tests/bats/sql-backup.bats
View File

@@ -55,7 +55,7 @@ teardown() {
run dolt sql -q "call dolt_backup('remove','bac1')"
[ "$status" -eq 1 ]
[[ "$output" =~ "error: unknown backup: 'bac1'" ]] || false
[[ "$output" =~ "error: unknown backup 'bac1'" ]] || false
}
@test "sql-backup: dolt_backup rm" {