Skip to content

Commit dc7e101

Browse files
committed
lease_test: fix tests that rely on legacy testing knobs
Sicne RENAME now works in the declarative schema changer, we need to force these tests to use the legacy schema changer to test the desired behavior. Release note: None
1 parent e8fd2fc commit dc7e101

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

pkg/sql/catalog/lease/lease_test.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,7 +1298,12 @@ func TestIncrementTableVersion(t *testing.T) {
12981298
defer srv.Stopper().Stop(context.Background())
12991299
codec := srv.ApplicationLayer().Codec()
13001300

1301+
// This test relies on legacy schema changer testing knobs.
1302+
if _, err := sqlDB.Exec(`SET CLUSTER SETTING sql.defaults.use_declarative_schema_changer = 'off';`); err != nil {
1303+
t.Fatal(err)
1304+
}
13011305
if _, err := sqlDB.Exec(`
1306+
SET use_declarative_schema_changer = 'off';
13021307
CREATE DATABASE t;
13031308
CREATE TABLE t.kv (k CHAR PRIMARY KEY, v CHAR);
13041309
`); err != nil {
@@ -1404,7 +1409,12 @@ func TestTwoVersionInvariantRetryErrorWithSavePoint(t *testing.T) {
14041409
defer srv.Stopper().Stop(context.Background())
14051410
s := srv.ApplicationLayer()
14061411

1412+
// This test relies on legacy schema changer testing knobs.
1413+
if _, err := sqlDB.Exec(`SET CLUSTER SETTING sql.defaults.use_declarative_schema_changer = 'off';`); err != nil {
1414+
t.Fatal(err)
1415+
}
14071416
if _, err := sqlDB.Exec(`
1417+
SET use_declarative_schema_changer = 'off';
14081418
CREATE DATABASE t;
14091419
CREATE TABLE t.kv (k CHAR PRIMARY KEY, v CHAR);
14101420
INSERT INTO t.kv VALUES ('a', 'b');
@@ -1524,7 +1534,12 @@ func TestTwoVersionInvariantRetryError(t *testing.T) {
15241534
defer srv.Stopper().Stop(context.Background())
15251535
s := srv.ApplicationLayer()
15261536

1537+
// This test relies on legacy schema changer testing knobs.
1538+
if _, err := sqlDB.Exec(`SET CLUSTER SETTING sql.defaults.use_declarative_schema_changer = 'off';`); err != nil {
1539+
t.Fatal(err)
1540+
}
15271541
if _, err := sqlDB.Exec(`
1542+
SET use_declarative_schema_changer = 'off';
15281543
CREATE DATABASE t;
15291544
CREATE TABLE t.kv (k CHAR PRIMARY KEY, v CHAR);
15301545
INSERT INTO t.kv VALUES ('a', 'b');

0 commit comments

Comments
 (0)