Merge #152769 #152884

152769: schemachanger: implement RENAME COLUMN in the declarative schema changer r=rafiss a=rafiss

This was a pretty straightforward copy of the logic from the legacy schema changer.

Only one new dependency rule was needed, to make sure the old column name is removed
before the new one is added.

fixes #148340
Release note: None

152884: kvserver: fix TestUpdateLastUpdateTimesUsingStoreLiveness r=arulajmani a=arulajmani

This test wasn't doing as advertised on the tin after I broke some testing knobs in 02fa61b.

Epic: none

Release note: None

Co-authored-by: Annie Pompa <[email protected]>
Co-authored-by: Rafi Shamim <[email protected]>
Co-authored-by: Arul Ajmani <[email protected]>

Author: 4 people

pkg/ccl/schemachangerccl/sctestbackupccl/backup_base_generated_test.go

@@ -699,7 +699,7 @@ func (r *Replica) stepRaftGroupRaftMuLocked(req *kvserverpb.RaftMessageRequest)
 			// Update the lastUpdateTimes map, unless configured not to by a testing
 			// knob.
 			disableUpdateLastUpdateTimesMapOnRaftGroupStep := false
-			if r.store.TestingKnobs() == nil &&
+			if r.store.TestingKnobs() != nil &&
 				r.store.TestingKnobs().DisableUpdateLastUpdateTimesMapOnRaftGroupStep != nil {
 				disableUpdateLastUpdateTimesMapOnRaftGroupStep = r.store.TestingKnobs().DisableUpdateLastUpdateTimesMapOnRaftGroupStep(r)
 			}

pkg/kv/kvserver/replica_raft.go

@@ -804,7 +804,7 @@ func (n *alterTableNode) startExec(params runParams) error {
 				tableDesc.GetRowLevelTTL().HasDurationExpr() {
 				return pgerror.Newf(
 					pgcode.InvalidTableDefinition,
-					`cannot rename column %s while ttl_expire_after is set`,
+					`cannot alter column %s while ttl_expire_after is set`,
 					columnName,
 				)
 			}
@@ -986,7 +986,7 @@ func applyColumnMutation(
 			}
 			return pgerror.Newf(
 				pgcode.Syntax,
-				"computed column %q cannot also have a DEFAULT expression",
+				"computed column %q cannot also have a DEFAULT or ON UPDATE expression",
 				col.GetName())
 		}
 		if err := updateNonComputedColExpr(
@@ -1005,6 +1005,12 @@ func applyColumnMutation(
 		}
 
 	case *tree.AlterTableSetOnUpdate:
+		if col.IsComputed() {
+			return pgerror.Newf(
+				pgcode.Syntax,
+				"computed column %q cannot also have a DEFAULT or ON UPDATE expression",
+				col.GetName())
+		}
 		// We want to reject uses of ON UPDATE where there is also a foreign key ON
 		// UPDATE.
 		for _, fk := range tableDesc.OutboundFKs {

pkg/sql/alter_table.go

@@ -963,7 +963,7 @@ func TestRemoveDefaultExprFromComputedColumn(t *testing.T) {
 	defer srv.Stopper().Stop(context.Background())
 	tdb := sqlutils.MakeSQLRunner(sqlDB)
 
-	const expectedErrRE = `.*: computed column \"b\" cannot also have a DEFAULT expression`
+	const expectedErrRE = `.*: computed column \"b\" cannot also have a DEFAULT or ON UPDATE expression`
 	// Create a table with a computed column.
 	tdb.Exec(t, `CREATE DATABASE t`)
 	tdb.Exec(t, `CREATE TABLE t.tbl (a INT PRIMARY KEY, b INT AS (1) STORED)`)

pkg/sql/catalog/tabledesc/structured_test.go

@@ -1319,7 +1319,7 @@ SELECT * FROM t69327
 f  f
 
 # Regression test for #72881. Computed columns can't have a DEFAULT expr.
-statement error pgcode 42601 computed column "v" cannot also have a DEFAULT expression
+statement error pgcode 42601 computed column "v" cannot also have a DEFAULT or ON UPDATE expression
 ALTER TABLE t69327 ALTER COLUMN v SET DEFAULT 'foo'
 
 # Regression test for #69665.Computed columns should be evaluated after
@@ -1379,10 +1379,13 @@ CREATE TABLE foooooo (
     gen INT AS (x + y) STORED
 );
 
-statement error pgcode 42601 computed column "gen" cannot also have a DEFAULT expression
+statement error pgcode 42601 computed column "gen" cannot also have a DEFAULT or ON UPDATE expression
 ALTER TABLE foooooo ALTER COLUMN gen SET DEFAULT 1;
 
-statement error pgcode 42601 computed column "gen" cannot also have a DEFAULT expression
+statement error pgcode 42601 computed column "gen" cannot also have a DEFAULT or ON UPDATE expression
+ALTER TABLE foooooo ALTER COLUMN gen SET ON UPDATE 1;
+
+statement error pgcode 42601 computed column "gen" cannot also have a DEFAULT or ON UPDATE expression
 ALTER TABLE foooooo ALTER COLUMN gen SET DEFAULT NULL;
 
 statement error pgcode 42601 column "gen" of relation "foooooo" is a computed column

pkg/sql/logictest/testdata/logic_test/computed

@@ -92,9 +92,8 @@ ALTER TABLE users RENAME COLUMN id TO uid
 statement error cannot rename column "username" because view "v1" depends on it
 ALTER TABLE users RENAME COLUMN username TO name
 
-# TODO(knz): restore test after #17269 / #10083 is fixed.
-#statement ok
-#ALTER TABLE users RENAME COLUMN species TO title
+statement ok
+ALTER TABLE users RENAME COLUMN species TO title
 
 statement ok
 CREATE VIEW v2 AS SELECT id from users
@@ -105,9 +104,8 @@ DROP VIEW v1
 statement error cannot rename column "id" because view "v2" depends on it
 ALTER TABLE users RENAME COLUMN id TO uid
 
-# TODO(knz): restore test after #17269 / #10083 is fixed.
-# statement ok
-# ALTER TABLE users RENAME COLUMN username TO name
+statement ok
+ALTER TABLE users RENAME COLUMN username TO name
 
 statement ok
 DROP VIEW v2
@@ -116,14 +114,14 @@ query T
 SELECT column_name FROM [SHOW COLUMNS FROM users] ORDER BY column_name
 ----
 id
-species
-username
+name
+title
 
 statement ok
 SET vectorize=on
 
 query T
-EXPLAIN ALTER TABLE users RENAME COLUMN species TO woo
+EXPLAIN ALTER TABLE users RENAME COLUMN title TO woo
 ----
 distribution: local
 vectorized: true
@@ -138,24 +136,24 @@ query T
 SELECT column_name FROM [SHOW COLUMNS FROM users] ORDER BY column_name
 ----
 id
-species
-username
+name
+title
 
 skipif config schema-locked-disabled
 statement ok
 ALTER TABLE users SET (schema_locked=false);
 
 # Check that a column can be added and renamed in the same statement
 statement ok
-ALTER TABLE users RENAME COLUMN species TO species_old,
-                  ADD COLUMN species STRING AS (species_old || ' woo') STORED
+ALTER TABLE users RENAME COLUMN title TO title_old,
+                  ADD COLUMN title STRING AS (title_old || ' woo') STORED
 
 skipif config schema-locked-disabled
 statement ok
 ALTER TABLE users SET (schema_locked=true);
 
 query T rowsort
-SELECT species FROM users
+SELECT title FROM users
 ----
 cat woo
 rat woo
@@ -199,3 +197,34 @@ query II
 SELECT j, k FROM foo;
 ----
 1  2
+
+# Test that mixed-case column names are handled correctly for rename operations.
+statement ok
+CREATE TABLE mixed_case_table (
+    "CamelCase" INT PRIMARY KEY,
+    "snake_case" TEXT,
+    "UPPERCASE" DECIMAL
+);
+
+statement error column "UPPERCASE" of relation "mixed_case_table" already exists
+ALTER TABLE mixed_case_table RENAME COLUMN "CamelCase" TO "UPPERCASE";
+
+statement ok
+ALTER TABLE mixed_case_table RENAME COLUMN "CamelCase" TO "CamelCase";
+
+statement ok
+ALTER TABLE mixed_case_table RENAME COLUMN "CamelCase" TO "NewCamelCase";
+
+statement ok
+ALTER TABLE mixed_case_table RENAME COLUMN "snake_case" TO "SnakeCase";
+
+statement ok
+ALTER TABLE mixed_case_table RENAME COLUMN "UPPERCASE" TO "decimal_value";
+
+query T colnames
+SELECT column_name FROM [SHOW COLUMNS FROM mixed_case_table] ORDER BY column_name;
+----
+column_name
+NewCamelCase
+SnakeCase
+decimal_value

pkg/sql/logictest/testdata/logic_test/rename_column

@@ -227,7 +227,7 @@ subtest alter_column_crdb_internal_expiration_rename
 statement ok
 CREATE TABLE alter_column_crdb_internal_expiration_rename() WITH (ttl_expire_after='10 minutes')
 
-statement error cannot rename column crdb_internal_expiration while ttl_expire_after is set
+statement error cannot alter column crdb_internal_expiration while ttl_expire_after is set
 ALTER TABLE alter_column_crdb_internal_expiration_rename RENAME COLUMN crdb_internal_expiration TO crdb_internal_expiration_2
 
 subtest end

pkg/sql/logictest/testdata/logic_test/row_level_ttl

@@ -253,7 +253,7 @@ ALTER TABLE tab3 SET (schema_locked=true)
 
 subtest alter_commands
 
-statement error pq: cannot rename system column "crdb_internal_mvcc_timestamp"
+statement error pq: cannot alter system column "crdb_internal_mvcc_timestamp"
 ALTER TABLE tab3 RENAME crdb_internal_mvcc_timestamp TO blah;
 
 statement error pq: cannot alter system column "crdb_internal_mvcc_timestamp"

pkg/sql/logictest/testdata/logic_test/system_columns

@@ -105,7 +105,7 @@ func (p *planner) findColumnToRename(
 	if col.IsSystemColumn() {
 		return nil, pgerror.Newf(
 			pgcode.FeatureNotSupported,
-			"cannot rename system column %q", col.ColName(),
+			"cannot alter system column %q", col.ColName(),
 		)
 	}
 	for _, tableRef := range tableDesc.DependedOnBy {

pkg/sql/rename_column.go

@@ -15,6 +15,7 @@ go_library(
         "alter_table_alter_primary_key.go",
         "alter_table_drop_column.go",
         "alter_table_drop_constraint.go",
+        "alter_table_rename_column.go",
         "alter_table_set_rls_mode.go",
         "alter_table_validate_constraint.go",
         "comment_on.go",