diff options
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/publicationcmds.c | 6 | ||||
| -rw-r--r-- | src/backend/commands/tablecmds.c | 22 | ||||
| -rw-r--r-- | src/backend/commands/trigger.c | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c index 8514ebfe911..a8b75eb1be8 100644 --- a/src/backend/commands/publicationcmds.c +++ b/src/backend/commands/publicationcmds.c @@ -107,7 +107,7 @@ parse_publication_options(ParseState *pstate, { char *publish; List *publish_list; - ListCell *lc; + ListCell *lc2; if (*publish_given) errorConflictingDefElem(defel, pstate); @@ -131,9 +131,9 @@ parse_publication_options(ParseState *pstate, "publish"))); /* Process the option list. */ - foreach(lc, publish_list) + foreach(lc2, publish_list) { - char *publish_opt = (char *) lfirst(lc); + char *publish_opt = (char *) lfirst(lc2); if (strcmp(publish_opt, "insert") == 0) pubactions->pubinsert = true; diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 7d8a75d23c2..1f774ac065b 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -10223,7 +10223,7 @@ CloneFkReferencing(List **wqueue, Relation parentRel, Relation partRel) Oid constrOid; ObjectAddress address, referenced; - ListCell *cell; + ListCell *lc; Oid insertTriggerOid, updateTriggerOid; @@ -10276,9 +10276,9 @@ CloneFkReferencing(List **wqueue, Relation parentRel, Relation partRel) * don't need to recurse to partitions for this constraint. */ attached = false; - foreach(cell, partFKs) + foreach(lc, partFKs) { - ForeignKeyCacheInfo *fk = lfirst_node(ForeignKeyCacheInfo, cell); + ForeignKeyCacheInfo *fk = lfirst_node(ForeignKeyCacheInfo, lc); if (tryAttachPartitionForeignKey(fk, RelationGetRelid(partRel), @@ -10877,7 +10877,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 tgCopyTuple; /* * Remember OIDs of other relation(s) involved in FK constraint. @@ -10901,16 +10901,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); + tgCopyTuple = heap_copytuple(tgtuple); + copy_tg = (Form_pg_trigger) GETSTRUCT(tgCopyTuple); copy_tg->tgdeferrable = cmdcon->deferrable; copy_tg->tginitdeferred = cmdcon->initdeferred; - CatalogTupleUpdate(tgrel, ©Tuple->t_self, copyTuple); + CatalogTupleUpdate(tgrel, &tgCopyTuple->t_self, tgCopyTuple); InvokeObjectPostAlterHook(TriggerRelationId, tgform->oid, 0); - heap_freetuple(copyTuple); + heap_freetuple(tgCopyTuple); } systable_endscan(tgscan); @@ -18083,14 +18083,14 @@ AttachPartitionEnsureIndexes(Relation rel, Relation attachrel) if (!found) { IndexStmt *stmt; - Oid constraintOid; + Oid conOid; stmt = generateClonedIndexStmt(NULL, idxRel, attmap, - &constraintOid); + &conOid); DefineIndex(RelationGetRelid(attachrel), stmt, InvalidOid, RelationGetRelid(idxRel), - constraintOid, + conOid, true, false, false, false, false); } diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 0fcf090f22f..182e6161e0c 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -1694,9 +1694,9 @@ renametrig_partition(Relation tgrel, Oid partitionId, Oid parentTriggerOid, for (int i = 0; i < partdesc->nparts; i++) { - Oid partitionId = partdesc->oids[i]; + Oid partoid = partdesc->oids[i]; - renametrig_partition(tgrel, partitionId, tgform->oid, newname, + renametrig_partition(tgrel, partoid, tgform->oid, newname, NameStr(tgform->tgname)); } } |