Skip to content

Commit

Permalink
sql: fix tests overwritten with WITH OPTIONS
Browse files Browse the repository at this point in the history
In cockroachdb#107892, there were some tests that accidentally overwrote
the "WITH" syntax to "WITH OPTIONS".

Release note: none
Epic: none
  • Loading branch information
annrpom committed Aug 16, 2023
1 parent e160427 commit a86e3c0
Show file tree
Hide file tree
Showing 3 changed files with 1,025 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/ccl/backupccl/backup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ func TestBackupAndRestoreJobDescription(t *testing.T) {
sqlDB.Exec(t, "BACKUP TO ($1,$2,$3) INCREMENTAL FROM $4", append(incrementals, backups[0])...)
sqlDB.Exec(t, "BACKUP INTO ($1, $2, $3)", collections...)
sqlDB.Exec(t, "BACKUP INTO LATEST IN ($1, $2, $3)", collections...)
sqlDB.Exec(t, "BACKUP INTO LATEST IN ($1, $2, $3) WITH OPTIONS (incremental_location = ($4, $5, $6))",
sqlDB.Exec(t, "BACKUP INTO LATEST IN ($1, $2, $3) WITH incremental_location = ($4, $5, $6)",
append(collections, incrementals...)...)

sqlDB.ExpectErr(t, "the incremental_location option must contain the same number of locality",
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/importer/import_csv_mark_redaction_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func TestMarkRedactionCCLStatement(t *testing.T) {
expected string
}{
{
"IMPORT CSV 'file' WITH OPTIONS (delimiter = 'foo')",
"IMPORT CSV 'file' WITH delimiter = 'foo'",
"IMPORT CSV ‹'file'› WITH OPTIONS (delimiter = ‹'foo'›)",
},
}
Expand Down
Loading

0 comments on commit a86e3c0

Please sign in to comment.