scbuild: change parameter type of helper functions

This makes it easier to remember to format the name correctly.

This also adjusts an error message to be slightly more accurate.

Release note: None

Author: rafiss

pkg/sql/alter_table.go

@@ -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/catalog/tabledesc/structured_test.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/logictest/testdata/logic_test/computed

@@ -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/schemachanger/scbuild/internal/scbuildstmt/alter_table_alter_column_drop_not_null.go

@@ -23,7 +23,7 @@ func alterTableDropNotNull(
 	alterColumnPreChecks(b, tn, tbl, t.Column)
 	columnID := getColumnIDFromColumnName(b, tbl.TableID, t.Column, true /*required */)
 	// Block alters on system columns.
-	panicIfSystemColumn(mustRetrieveColumnElem(b, tbl.TableID, columnID), t.Column.String())
+	panicIfSystemColumn(mustRetrieveColumnElem(b, tbl.TableID, columnID), t.Column)
 	// Ensure that this column is not in the primary indexes key.
 	primaryIdx := getLatestPrimaryIndex(b, tbl.TableID)
 	idxColumns := mustRetrieveIndexColumnElements(b, tbl.TableID, primaryIdx.IndexID)

pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_alter_column_set_default.go

@@ -34,10 +34,10 @@ func alterTableSetDefault(
 	colType := mustRetrieveColumnTypeElem(b, tbl.TableID, colID)
 
 	// Block alters on system columns.
-	panicIfSystemColumn(col, t.Column.String())
+	panicIfSystemColumn(col, t.Column)
 
 	// Block disallowed operations on computed columns.
-	panicIfComputedColumn(b, tn.ObjectName, colType, t.Column.String(), t.Default)
+	panicIfComputedColumn(b, tn.ObjectName, colType, t.Column, t.Default)
 
 	// For DROP DEFAULT.
 	if t.Default == nil {
@@ -148,7 +148,7 @@ func sanitizeColumnExpression(
 
 // panicIfComputedColumn blocks disallowed operations on computed columns.
 func panicIfComputedColumn(
-	b BuildCtx, tn tree.Name, col *scpb.ColumnType, colName string, def tree.Expr,
+	b BuildCtx, tn tree.Name, col *scpb.ColumnType, colName tree.Name, def tree.Expr,
 ) {
 	computeExpr := retrieveColumnComputeExpression(b, col.TableID, col.ColumnID)
 	// Block setting a column default if the column is computed.
@@ -158,12 +158,12 @@ func panicIfComputedColumn(
 			panic(pgerror.Newf(
 				pgcode.Syntax,
 				"column %q of relation %q is a computed column",
-				colName,
+				tree.ErrString(&colName),
 				tn))
 		}
 		panic(pgerror.Newf(
 			pgcode.Syntax,
-			"computed column %q cannot also have a DEFAULT expression",
-			colName))
+			"computed column %q cannot also have a DEFAULT or ON UPDATE expression",
+			tree.ErrString(&colName)))
 	}
 }

pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_alter_column_set_not_null.go

@@ -25,7 +25,7 @@ func alterTableSetNotNull(
 		return
 	}
 	// Block alters on system columns.
-	panicIfSystemColumn(mustRetrieveColumnElem(b, tbl.TableID, columnID), t.Column.String())
+	panicIfSystemColumn(mustRetrieveColumnElem(b, tbl.TableID, columnID), t.Column)
 	b.Add(&scpb.ColumnNotNull{
 		TableID:  tbl.TableID,
 		ColumnID: columnID,

pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_alter_column_set_on_update.go

@@ -24,10 +24,10 @@ func alterTableSetOnUpdate(
 	colType := mustRetrieveColumnTypeElem(b, tbl.TableID, colID)
 
 	// Block alters on system columns.
-	panicIfSystemColumn(col, t.Column.String())
+	panicIfSystemColumn(col, t.Column)
 
 	// Block disallowed operations on computed columns.
-	panicIfComputedColumn(b, tn.ObjectName, colType, t.Column.String(), t.Expr)
+	panicIfComputedColumn(b, tn.ObjectName, colType, t.Column, t.Expr)
 
 	// For DROP ON UPDATE.
 	if t.Expr == nil {

pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_alter_column_type.go

@@ -42,7 +42,7 @@ func alterTableAlterColumnType(
 ) {
 	colID := getColumnIDFromColumnName(b, tbl.TableID, t.Column, true /* required */)
 	col := mustRetrieveColumnElem(b, tbl.TableID, colID)
-	panicIfSystemColumn(col, t.Column.String())
+	panicIfSystemColumn(col, t.Column)
 
 	// Setup for the new type ahead of any checking. As we need its resolved type
 	// for the checks.

pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_drop_column.go

@@ -109,7 +109,7 @@ func resolveColumnForDropColumn(
 		return nil, nil, true
 	}
 	// Block drops on system columns.
-	panicIfSystemColumn(col, n.Column.String())
+	panicIfSystemColumn(col, n.Column)
 	return col, elts, false
 }
 

pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_rename_column.go

@@ -71,7 +71,7 @@ func renameColumnChecks(b BuildCtx, col *scpb.Column, oldName, newName tree.Name
 	}
 
 	// Block renaming of system columns.
-	panicIfSystemColumn(col, oldName.String())
+	panicIfSystemColumn(col, oldName)
 
 	// Block renaming of shard columns.
 	if isShardColumn(b, col) {