From 0ff0dad2688b130b91cf0d532e042338544266d6 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Tue, 16 Aug 2022 20:17:46 -0500 Subject: [PATCH 11/26] avoid shadow vars: tablecmds.c: copyTuple commit 6f70d7ca1d1937a9f7b79eff6fb18ed1bb2a4c47 Author: Alvaro Herrera Date: Wed May 5 12:14:21 2021 -0400 Have ALTER CONSTRAINT recurse on partitioned tables --- src/backend/commands/tablecmds.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 93b217ee14d..3403307c893 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -10865,7 +10865,7 @@ ATExecAlterConstrRecurse(Constraint *cmdcon, Relation conrel, Relation tgrel, { Form_pg_trigger tgform = (Form_pg_trigger) GETSTRUCT(tgtuple); Form_pg_trigger copy_tg; - HeapTuple copyTuple; + HeapTuple this_copyTuple; /* * Remember OIDs of other relation(s) involved in FK constraint. @@ -10889,16 +10889,16 @@ ATExecAlterConstrRecurse(Constraint *cmdcon, Relation conrel, Relation tgrel, tgform->tgfoid != F_RI_FKEY_CHECK_UPD) continue; - copyTuple = heap_copytuple(tgtuple); - copy_tg = (Form_pg_trigger) GETSTRUCT(copyTuple); + this_copyTuple = heap_copytuple(tgtuple); + copy_tg = (Form_pg_trigger) GETSTRUCT(this_copyTuple); copy_tg->tgdeferrable = cmdcon->deferrable; copy_tg->tginitdeferred = cmdcon->initdeferred; - CatalogTupleUpdate(tgrel, ©Tuple->t_self, copyTuple); + CatalogTupleUpdate(tgrel, &this_copyTuple->t_self, this_copyTuple); InvokeObjectPostAlterHook(TriggerRelationId, tgform->oid, 0); - heap_freetuple(copyTuple); + heap_freetuple(this_copyTuple); } systable_endscan(tgscan); -- 2.17.1