Merge #146882

146882: logictest: enable local-schema-locked in more test cases r=fqazi a=fqazi

Previously, a numbers of tests had local-schema-locked disable because of transaction use. This patch enables these tests by adding required logic to disable schema_locked selectively and update SHOW CREATE TABLE oprations. After this patch ~14 tests have schema locked skipped in the logic test suite.

Informs: #129694

Release note: None

Co-authored-by: Faizan Qazi <[email protected]>

Author: craig[bot]

pkg/sql/logictest/testdata/logic_test/alter_column_type

@@ -1,5 +1,3 @@
-# LogicTest: !local-schema-locked
-
 # Note: this file does not contain tests for virtual computed columns; those
 # are in a separate test file.
 
@@ -11,6 +9,7 @@ CREATE TABLE with_no_column_refs (
   FAMILY "primary" (a, b, c, rowid)
 )
 
+skipif config local-schema-locked
 query TT
 SHOW CREATE TABLE with_no_column_refs
 ----
@@ -22,6 +21,19 @@ with_no_column_refs  CREATE TABLE public.with_no_column_refs (
                        CONSTRAINT with_no_column_refs_pkey PRIMARY KEY (rowid ASC)
                      );
 
+onlyif config local-schema-locked
+query TT
+SHOW CREATE TABLE with_no_column_refs
+----
+with_no_column_refs  CREATE TABLE public.with_no_column_refs (
+                       a INT8 NULL,
+                       b INT8 NULL,
+                       c INT8 NULL AS (3:::INT8) STORED,
+                       rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
+                       CONSTRAINT with_no_column_refs_pkey PRIMARY KEY (rowid ASC)
+                     ) WITH (schema_locked = true);
+
+skipif config local-schema-locked
 query TT
 SHOW CREATE TABLE with_no_column_refs WITH REDACT
 ----
@@ -33,6 +45,18 @@ with_no_column_refs  CREATE TABLE public.with_no_column_refs (
                        CONSTRAINT with_no_column_refs_pkey PRIMARY KEY (rowid ASC)
                      );
 
+onlyif config local-schema-locked
+query TT
+SHOW CREATE TABLE with_no_column_refs WITH REDACT
+----
+with_no_column_refs  CREATE TABLE public.with_no_column_refs (
+                       a INT8 NULL,
+                       b INT8 NULL,
+                       c INT8 NULL AS (‹×›:::INT8) STORED,
+                       rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
+                       CONSTRAINT with_no_column_refs_pkey PRIMARY KEY (rowid ASC)
+                     ) WITH (schema_locked = true);
+
 statement ok
 CREATE TABLE extra_parens (
   a INT,
@@ -41,6 +65,7 @@ CREATE TABLE extra_parens (
   FAMILY "primary" (a, b, c, rowid)
 )
 
+skipif config local-schema-locked
 query TT
 SHOW CREATE TABLE extra_parens
 ----
@@ -52,6 +77,17 @@ extra_parens  CREATE TABLE public.extra_parens (
                 CONSTRAINT extra_parens_pkey PRIMARY KEY (rowid ASC)
               );
 
+onlyif config local-schema-locked
+query TT
+SHOW CREATE TABLE extra_parens
+----
+extra_parens  CREATE TABLE public.extra_parens (
+                a INT8 NULL,
+                b INT8 NULL,
+                c INT8 NULL AS (3:::INT8) STORED,
+                rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
+                CONSTRAINT extra_parens_pkey PRIMARY KEY (rowid ASC)
+              ) WITH (schema_locked = true);
 
 statement error cannot write directly to computed column "c"
 INSERT INTO with_no_column_refs VALUES (1, 2, 3)
@@ -95,6 +131,7 @@ CREATE TABLE x (
   FAMILY "primary" (a, b, c, d, rowid)
 )
 
+skipif config local-schema-locked
 query TT
 SHOW CREATE TABLE x
 ----
@@ -107,6 +144,19 @@ x  CREATE TABLE public.x (
      CONSTRAINT x_pkey PRIMARY KEY (rowid ASC)
    );
 
+onlyif config local-schema-locked
+query TT
+SHOW CREATE TABLE x
+----
+x  CREATE TABLE public.x (
+     a INT8 NULL DEFAULT 3:::INT8,
+     b INT8 NULL DEFAULT 7:::INT8,
+     c INT8 NULL AS (a) STORED,
+     d INT8 NULL AS (a + b) STORED,
+     rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
+     CONSTRAINT x_pkey PRIMARY KEY (rowid ASC)
+   ) WITH (schema_locked = true);
+
 query TTBTTTB colnames
 SELECT * FROM  [SHOW COLUMNS FROM x] ORDER BY column_name
 ----
@@ -791,6 +841,7 @@ CREATE TABLE x (
   FAMILY "primary" (a, b, rowid)
 )
 
+skipif config local-schema-locked
 query TT
 SHOW CREATE TABLE x
 ----
@@ -801,6 +852,17 @@ x  CREATE TABLE public.x (
      CONSTRAINT x_pkey PRIMARY KEY (rowid ASC)
    );
 
+onlyif config local-schema-locked
+query TT
+SHOW CREATE TABLE x
+----
+x  CREATE TABLE public.x (
+     a INT8 NULL,
+     b INT8 NULL AS (a) STORED,
+     rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
+     CONSTRAINT x_pkey PRIMARY KEY (rowid ASC)
+   ) WITH (schema_locked = true);
+
 statement ok
 DROP TABLE x
 
@@ -815,6 +877,7 @@ CREATE TABLE x (
 statement ok
 ALTER TABLE x RENAME COLUMN a TO c
 
+skipif config local-schema-locked
 query TT
 SHOW CREATE TABLE x
 ----
@@ -825,6 +888,17 @@ x  CREATE TABLE public.x (
      CONSTRAINT x_pkey PRIMARY KEY (rowid ASC)
    );
 
+onlyif config local-schema-locked
+query TT
+SHOW CREATE TABLE x
+----
+x  CREATE TABLE public.x (
+     c INT8 NULL,
+     b INT8 NULL AS (c) STORED,
+     rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
+     CONSTRAINT x_pkey PRIMARY KEY (rowid ASC)
+   ) WITH (schema_locked = true);
+
 statement ok
 DROP TABLE x
 
@@ -855,6 +929,7 @@ INSERT INTO x VALUES (3)
 statement ok
 ALTER TABLE x ADD COLUMN c INT NOT NULL AS (a + 4) STORED
 
+skipif config local-schema-locked
 query TT
 SHOW CREATE TABLE x
 ----
@@ -866,6 +941,19 @@ x  CREATE TABLE public.x (
      CONSTRAINT x_pkey PRIMARY KEY (rowid ASC)
    );
 
+onlyif config local-schema-locked
+query TT
+SHOW CREATE TABLE x
+----
+x  CREATE TABLE public.x (
+     a INT8 NULL,
+     b INT8 NULL AS (a * 2:::INT8) STORED,
+     rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
+     c INT8 NOT NULL AS (a + 4:::INT8) STORED,
+     CONSTRAINT x_pkey PRIMARY KEY (rowid ASC)
+   ) WITH (schema_locked = true);
+
+skipif config local-schema-locked
 query TT
 SHOW CREATE TABLE x WITH REDACT
 ----
@@ -877,6 +965,18 @@ x  CREATE TABLE public.x (
      CONSTRAINT x_pkey PRIMARY KEY (rowid ASC)
    );
 
+onlyif config local-schema-locked
+query TT
+SHOW CREATE TABLE x WITH REDACT
+----
+x  CREATE TABLE public.x (
+     a INT8 NULL,
+     b INT8 NULL AS (a * ‹×›:::INT8) STORED,
+     rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
+     c INT8 NOT NULL AS (a + ‹×›:::INT8) STORED,
+     CONSTRAINT x_pkey PRIMARY KEY (rowid ASC)
+   ) WITH (schema_locked = true);
+
 statement ok
 INSERT INTO x VALUES (6)
 
@@ -886,6 +986,10 @@ SELECT * FROM x ORDER BY a
 3 6 7
 6 12 10
 
+onlyif config local-schema-locked
+statement ok
+ALTER TABLE x SET (schema_locked=false);
+
 # Multiple ADD COLUMNs can only reference columns that are defined previously.
 statement error pq: column "t" does not exist, referenced in "lower\(t\)"
 ALTER TABLE x
@@ -897,6 +1001,10 @@ ALTER TABLE x
     ADD COLUMN s STRING,
     ADD COLUMN t STRING AS (lower(s)) STORED
 
+onlyif config local-schema-locked
+statement ok
+ALTER TABLE x SET (schema_locked=true);
+
 # Verify a bad statement fails.
 statement error pq: could not parse "a" as type int
 ALTER TABLE x ADD COLUMN d INT AS (a + 'a') STORED
@@ -1000,6 +1108,7 @@ statement ok
 CREATE TABLE t42418 (x INT GENERATED ALWAYS AS (1) STORED);
 ALTER TABLE t42418 ADD COLUMN y INT GENERATED ALWAYS AS (1) STORED
 
+skipif config local-schema-locked
 query TT
 SHOW CREATE t42418
 ----
@@ -1010,6 +1119,17 @@ t42418  CREATE TABLE public.t42418 (
           CONSTRAINT t42418_pkey PRIMARY KEY (rowid ASC)
         );
 
+onlyif config local-schema-locked
+query TT
+SHOW CREATE t42418
+----
+t42418  CREATE TABLE public.t42418 (
+          x INT8 NULL AS (1:::INT8) STORED,
+          rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
+          y INT8 NULL AS (1:::INT8) STORED,
+          CONSTRAINT t42418_pkey PRIMARY KEY (rowid ASC)
+        ) WITH (schema_locked = true);
+
 # Tests for computed column rewrites.
 statement error timestamptz::string: context-dependent operators are not allowed in STORED COMPUTED COLUMN
 CREATE TABLE trewrite(k INT PRIMARY KEY, ts TIMESTAMPTZ, c STRING AS (ts::STRING) STORED, FAMILY (k,ts,c))
@@ -1026,6 +1146,7 @@ SET experimental_computed_column_rewrites = "(ts :: STRING) -> (to_char(ts AT TI
 statement ok
 CREATE TABLE trewrite(k INT PRIMARY KEY, ts TIMESTAMPTZ, c STRING AS (ts::STRING) STORED, FAMILY (k,ts,c))
 
+skipif config local-schema-locked
 query T
 SELECT create_statement FROM [SHOW CREATE TABLE trewrite]
 ----
@@ -1037,6 +1158,18 @@ CREATE TABLE public.trewrite (
   FAMILY fam_0_k_ts_c (k, ts, c)
 );
 
+onlyif config local-schema-locked
+query T
+SELECT create_statement FROM [SHOW CREATE TABLE trewrite]
+----
+CREATE TABLE public.trewrite (
+  k INT8 NOT NULL,
+  ts TIMESTAMPTZ NULL,
+  c STRING NULL AS (to_char(timezone('utc':::STRING, ts))) STORED,
+  CONSTRAINT trewrite_pkey PRIMARY KEY (k ASC),
+  FAMILY fam_0_k_ts_c (k, ts, c)
+) WITH (schema_locked = true);
+
 statement ok
 DROP TABLE trewrite
 
@@ -1046,6 +1179,7 @@ CREATE TABLE trewrite(k INT PRIMARY KEY, ts TIMESTAMPTZ, FAMILY (k,ts))
 statement ok
 ALTER TABLE trewrite ADD COLUMN c STRING AS (ts::STRING) STORED
 
+skipif config local-schema-locked
 query T
 SELECT create_statement FROM [SHOW CREATE TABLE trewrite]
 ----
@@ -1057,12 +1191,25 @@ CREATE TABLE public.trewrite (
   FAMILY fam_0_k_ts (k, ts, c)
 );
 
+onlyif config local-schema-locked
+query T
+SELECT create_statement FROM [SHOW CREATE TABLE trewrite]
+----
+CREATE TABLE public.trewrite (
+  k INT8 NOT NULL,
+  ts TIMESTAMPTZ NULL,
+  c STRING NULL AS (to_char(timezone('utc':::STRING, ts))) STORED,
+  CONSTRAINT trewrite_pkey PRIMARY KEY (k ASC),
+  FAMILY fam_0_k_ts (k, ts, c)
+) WITH (schema_locked = true);
+
 statement ok
 SET experimental_computed_column_rewrites = ""
 
 statement ok
 CREATE TABLE trewrite_copy (LIKE trewrite INCLUDING ALL)
 
+skipif config local-schema-locked
 query T
 SELECT create_statement FROM [SHOW CREATE TABLE trewrite_copy]
 ----
@@ -1073,6 +1220,17 @@ CREATE TABLE public.trewrite_copy (
   CONSTRAINT trewrite_pkey PRIMARY KEY (k ASC)
 );
 
+onlyif config local-schema-locked
+query T
+SELECT create_statement FROM [SHOW CREATE TABLE trewrite_copy]
+----
+CREATE TABLE public.trewrite_copy (
+  k INT8 NOT NULL,
+  ts TIMESTAMPTZ NULL,
+  c STRING NULL AS (to_char(timezone('utc':::STRING, ts))) STORED,
+  CONSTRAINT trewrite_pkey PRIMARY KEY (k ASC)
+) WITH (schema_locked = true);
+
 statement ok
 DROP TABLE trewrite
 
@@ -1099,6 +1257,7 @@ CREATE TABLE trewrite2(
   FAMILY (k,ts,b,str,c1,c2,c3)
 )
 
+skipif config local-schema-locked
 query T
 SELECT create_statement FROM [SHOW CREATE TABLE trewrite2]
 ----
@@ -1114,6 +1273,23 @@ CREATE TABLE public.trewrite2 (
   FAMILY fam_0_k_ts_b_str_c1_c2_c3 (k, ts, b, str, c1, c2, c3)
 );
 
+
+onlyif config local-schema-locked
+query T
+SELECT create_statement FROM [SHOW CREATE TABLE trewrite2]
+----
+CREATE TABLE public.trewrite2 (
+  k INT8 NOT NULL,
+  ts TIMESTAMPTZ NULL,
+  b BYTES NULL,
+  str STRING NULL,
+  c1 STRING NULL AS (to_char(timezone('utc':::STRING, ts))) STORED,
+  c2 TIMESTAMP NULL AS (parse_timestamp(str)) STORED,
+  c3 INT8 NULL AS (mod(fnv32(b), 4:::INT8)) STORED,
+  CONSTRAINT trewrite2_pkey PRIMARY KEY (k ASC),
+  FAMILY fam_0_k_ts_b_str_c1_c2_c3 (k, ts, b, str, c1, c2, c3)
+) WITH (schema_locked = true);
+
 statement ok
 DROP TABLE trewrite2
 

pkg/sql/logictest/testdata/logic_test/computed

@@ -1,5 +1,3 @@
-# LogicTest: !local-schema-locked
-
 statement ok
 CREATE TABLE kv (
   k INT PRIMARY KEY,
@@ -230,7 +228,7 @@ SELECT count(*) FROM [DELETE FROM unindexed LIMIT 5 RETURNING v]
 subtest regression_29494
 
 statement ok
-CREATE TABLE t29494(x INT PRIMARY KEY); INSERT INTO t29494 VALUES (12)
+CREATE TABLE t29494(x INT PRIMARY KEY) WITH (schema_locked=false); INSERT INTO t29494 VALUES (12)
 
 statement ok
 BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
@@ -269,7 +267,7 @@ COMMIT
 subtest regression_33361
 
 statement ok
-CREATE TABLE t33361(x INT PRIMARY KEY, y INT UNIQUE, z INT); INSERT INTO t33361 VALUES (1, 2, 3)
+CREATE TABLE t33361(x INT PRIMARY KEY, y INT UNIQUE, z INT) WITH (schema_locked=false); INSERT INTO t33361 VALUES (1, 2, 3)
 
 statement ok
 BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;