scbuild: handle trigger/procedure dependencies for table renames

Release note: None

Author: rafiss

pkg/backup/testdata/backup-restore/plpgsql_procedures

@@ -182,11 +182,10 @@ DROP TABLE sc1.tbl1
 ----
 pq: cannot drop table tbl1 because other objects depend on it
 
-# TODO(mgartner): The error message should say "procedure".
 exec-sql
 ALTER TABLE sc1.tbl1 RENAME TO tbl1_new
 ----
-pq: cannot rename relation "sc1.tbl1" because function "p1" depends on it
+pq: cannot rename relation "db1_new.sc1.tbl1" because procedure "p1" depends on it
 HINT: consider dropping "p1" first.
 
 # TODO(mgartner): The error message should say "procedure".
@@ -384,7 +383,7 @@ pq: cannot drop table tbl1 because other objects depend on it
 exec-sql
 ALTER TABLE sc1.tbl1 RENAME TO tbl1_new
 ----
-pq: cannot rename relation "sc1.tbl1" because function "p1" depends on it
+pq: cannot rename relation "db1.sc1.tbl1" because procedure "p1" depends on it
 HINT: consider dropping "p1" first.
 
 exec-sql

pkg/backup/testdata/backup-restore/plpgsql_user_defined_functions

@@ -247,7 +247,7 @@ pq: cannot drop table tbl1 because other objects depend on it
 exec-sql
 ALTER TABLE sc1.tbl1 RENAME TO tbl1_new
 ----
-pq: cannot rename relation "sc1.tbl1" because function "f1" depends on it
+pq: cannot rename relation "db1_new.sc1.tbl1" because function "f1" depends on it
 HINT: consider dropping "f1" first.
 
 exec-sql
@@ -463,7 +463,7 @@ pq: cannot drop table tbl1 because other objects depend on it
 exec-sql
 ALTER TABLE sc1.tbl1 RENAME TO tbl1_new
 ----
-pq: cannot rename relation "sc1.tbl1" because function "f1" depends on it
+pq: cannot rename relation "db1.sc1.tbl1" because function "f1" depends on it
 HINT: consider dropping "f1" first.
 
 exec-sql

pkg/backup/testdata/backup-restore/procedures

@@ -168,11 +168,10 @@ DROP TABLE sc1.tbl1
 ----
 pq: cannot drop table tbl1 because other objects depend on it
 
-# TODO(mgartner): The error message should say "procedure".
 exec-sql
 ALTER TABLE sc1.tbl1 RENAME TO tbl1_new
 ----
-pq: cannot rename relation "sc1.tbl1" because function "p1" depends on it
+pq: cannot rename relation "db1_new.sc1.tbl1" because procedure "p1" depends on it
 HINT: consider dropping "p1" first.
 
 # TODO(mgartner): The error message should say "procedure".
@@ -356,7 +355,7 @@ pq: cannot drop table tbl1 because other objects depend on it
 exec-sql
 ALTER TABLE sc1.tbl1 RENAME TO tbl1_new
 ----
-pq: cannot rename relation "sc1.tbl1" because function "p1" depends on it
+pq: cannot rename relation "db1.sc1.tbl1" because procedure "p1" depends on it
 HINT: consider dropping "p1" first.
 
 exec-sql

pkg/backup/testdata/backup-restore/triggers

@@ -218,7 +218,7 @@ pq: cannot drop table tbl1 because other objects depend on it
 exec-sql
 ALTER TABLE sc1.tbl1 RENAME TO tbl1_new
 ----
-pq: cannot rename relation "sc1.tbl1" because trigger "tr1" on table "tbl1" depends on it
+pq: cannot rename relation "db1_new.sc1.tbl1" because trigger "tr1" on table "tbl1" depends on it
 
 exec-sql
 ALTER TABLE sc1.tbl1 SET SCHEMA sc2;

pkg/backup/testdata/backup-restore/user-defined-functions

@@ -165,7 +165,7 @@ pq: cannot drop table tbl1 because other objects depend on it
 exec-sql
 ALTER TABLE sc1.tbl1 RENAME TO tbl1_new
 ----
-pq: cannot rename relation "sc1.tbl1" because function "f1" depends on it
+pq: cannot rename relation "db1_new.sc1.tbl1" because function "f1" depends on it
 HINT: consider dropping "f1" first.
 
 exec-sql
@@ -352,7 +352,7 @@ pq: cannot drop table tbl1 because other objects depend on it
 exec-sql
 ALTER TABLE sc1.tbl1 RENAME TO tbl1_new
 ----
-pq: cannot rename relation "sc1.tbl1" because function "f1" depends on it
+pq: cannot rename relation "db1.sc1.tbl1" because function "f1" depends on it
 HINT: consider dropping "f1" first.
 
 exec-sql

pkg/ccl/logictestccl/testdata/logic_test/triggers

@@ -929,9 +929,14 @@ statement ok
 CREATE TRIGGER foo AFTER INSERT ON xy FOR EACH ROW EXECUTE FUNCTION trigger_func();
 
 # Relations are referenced by name, so renaming the table is not allowed.
+onlyif config local-legacy-schema-changer local-mixed-25.2 local-mixed-25.3
 statement error pgcode 2BP01 cannot rename relation "t" because trigger "foo" on table "xy" depends on it
 ALTER TABLE t RENAME TO t2;
 
+skipif config local-legacy-schema-changer local-mixed-25.2 local-mixed-25.3
+statement error pgcode 2BP01 cannot rename relation "test.public.t" because trigger "foo" on table "xy" depends on it
+ALTER TABLE t RENAME TO t2;
+
 # Sequences are remapped to their IDs, so renaming is allowed.
 statement ok
 ALTER SEQUENCE s RENAME TO s2;

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

@@ -240,7 +240,27 @@ func checkNameBasedDependencies(
 			_, _, viewNS := scpb.FindNamespace(viewElts)
 			panic(sqlerrors.NewDependentBlocksOpError("rename", "relation", objectName.String(), "view", viewNS.Name))
 		case *scpb.FunctionName:
-			panic(sqlerrors.NewDependentBlocksOpError("rename", "relation", objectName.String(), "function", backRefElem.Name))
+			funcElem := b.QueryByID(backRefElem.FunctionID).FilterFunction().MustGetOneElement()
+			funcType := "function"
+			if funcElem.IsProcedure {
+				funcType = "procedure"
+			}
+			panic(sqlerrors.NewDependentBlocksOpError("rename", "relation", objectName.String(), funcType, backRefElem.Name))
+		case *scpb.TriggerDeps:
+			for _, usesRelation := range backRefElem.UsesRelations {
+				if usesRelation.ID == descriptorID {
+					dependentTableID := backRefElem.TableID
+					dependentTriggerID := backRefElem.TriggerID
+					dependentTableNS := b.QueryByID(dependentTableID).FilterNamespace().MustGetOneElement()
+					dependentTriggerName := backRefs.FilterTriggerName().Filter(func(_ scpb.Status, _ scpb.TargetStatus, e *scpb.TriggerName) bool {
+						return e.TriggerID == dependentTriggerID && e.TableID == dependentTableID
+					}).MustGetOneElement()
+					panic(sqlerrors.NewDependentObjectErrorf(
+						"cannot rename relation %q because trigger %q on table %q depends on it",
+						objectName.String(), dependentTriggerName.Name, dependentTableNS.Name,
+					))
+				}
+			}
 		}
 	})
 }

pkg/sql/schemachanger/scdecomp/decomp.go

@@ -1028,10 +1028,11 @@ func (w *walkCtx) walkForeignKeyConstraint(
 func (w *walkCtx) walkFunction(fnDesc catalog.FunctionDescriptor) {
 	typeT := newTypeT(fnDesc.GetReturnType().Type)
 	fn := &scpb.Function{
-		FunctionID: fnDesc.GetID(),
-		ReturnSet:  fnDesc.GetReturnType().ReturnSet,
-		ReturnType: *typeT,
-		Params:     make([]scpb.Function_Parameter, len(fnDesc.GetParams())),
+		FunctionID:  fnDesc.GetID(),
+		ReturnSet:   fnDesc.GetReturnType().ReturnSet,
+		ReturnType:  *typeT,
+		Params:      make([]scpb.Function_Parameter, len(fnDesc.GetParams())),
+		IsProcedure: fnDesc.IsProcedure(),
 	}
 	for i, param := range fnDesc.GetParams() {
 		typeT := newTypeT(param.Type)