Skip to content

Commit

Permalink
Merge pull request #134645 from cockroachdb/revert-134534-blathers/ba…
Browse files Browse the repository at this point in the history
…ckport-release-24.3-134345

Revert "release-24.3: workloadccl: update backup/restore syntax"
  • Loading branch information
dt authored Nov 8, 2024
2 parents 9ae3fb3 + a9d4764 commit 57646a5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/ccl/workloadccl/fixture.go
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ func MakeFixture(
for _, t := range gen.Tables() {
t := t
g.Go(func() error {
q := fmt.Sprintf(`BACKUP "%s"."%s" INTO $1`, dbName, t.Name)
q := fmt.Sprintf(`BACKUP "%s"."%s" TO $1`, dbName, t.Name)
output := config.ObjectPathToURI(filepath.Join(fixtureFolder, t.Name))
log.Infof(ctx, "Backing %s up to %q...", t.Name, output)
_, err := sqlDB.Exec(q, output)
Expand Down Expand Up @@ -638,7 +638,7 @@ func RestoreFixture(
table := table
g.GoCtx(func(ctx context.Context) error {
start := timeutil.Now()
restoreStmt := fmt.Sprintf(`RESTORE %s.%s FROM LATEST IN $1 WITH into_db=$2, unsafe_restore_incompatible_version`, genName, table.TableName)
restoreStmt := fmt.Sprintf(`RESTORE %s.%s FROM $1 WITH into_db=$2, unsafe_restore_incompatible_version`, genName, table.TableName)
log.Infof(ctx, "Restoring from %s", table.BackupURI)
var rows, index, tableBytes int64
var discard interface{}
Expand Down

0 comments on commit 57646a5

Please sign in to comment.