From 01e27aab05f5f83ab4b79688795848d787dab738 Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Tue, 18 Mar 2025 14:06:51 +0530 Subject: [PATCH] Use correct variable name in publicationcmds.c. subid was used at few places for publicationid in publicationcmds.c/.h. Author: vignesh C Reviewed-by: Ashutosh Bapat Discussion: https://postgr.es/m/CALDaNm1KqJ0VFfDJRPbfYi9Shz6LHFEE-Ckn+eqsePfKhebv9w@mail.gmail.com --- src/backend/commands/publicationcmds.c | 12 ++++++------ src/include/commands/publicationcmds.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c index 3091d36ce98..0b23d94c38e 100644 --- a/src/backend/commands/publicationcmds.c +++ b/src/backend/commands/publicationcmds.c @@ -2052,7 +2052,7 @@ AlterPublicationOwner_internal(Relation rel, HeapTuple tup, Oid newOwnerId) ObjectAddress AlterPublicationOwner(const char *name, Oid newOwnerId) { - Oid subid; + Oid pubid; HeapTuple tup; Relation rel; ObjectAddress address; @@ -2068,11 +2068,11 @@ AlterPublicationOwner(const char *name, Oid newOwnerId) errmsg("publication \"%s\" does not exist", name))); pubform = (Form_pg_publication) GETSTRUCT(tup); - subid = pubform->oid; + pubid = pubform->oid; AlterPublicationOwner_internal(rel, tup, newOwnerId); - ObjectAddressSet(address, PublicationRelationId, subid); + ObjectAddressSet(address, PublicationRelationId, pubid); heap_freetuple(tup); @@ -2085,19 +2085,19 @@ AlterPublicationOwner(const char *name, Oid newOwnerId) * Change publication owner -- by OID */ void -AlterPublicationOwner_oid(Oid subid, Oid newOwnerId) +AlterPublicationOwner_oid(Oid pubid, Oid newOwnerId) { HeapTuple tup; Relation rel; rel = table_open(PublicationRelationId, RowExclusiveLock); - tup = SearchSysCacheCopy1(PUBLICATIONOID, ObjectIdGetDatum(subid)); + tup = SearchSysCacheCopy1(PUBLICATIONOID, ObjectIdGetDatum(pubid)); if (!HeapTupleIsValid(tup)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("publication with OID %u does not exist", subid))); + errmsg("publication with OID %u does not exist", pubid))); AlterPublicationOwner_internal(rel, tup, newOwnerId); diff --git a/src/include/commands/publicationcmds.h b/src/include/commands/publicationcmds.h index e41df6db038..f90cf1ef896 100644 --- a/src/include/commands/publicationcmds.h +++ b/src/include/commands/publicationcmds.h @@ -29,7 +29,7 @@ extern void RemovePublicationRelById(Oid proid); extern void RemovePublicationSchemaById(Oid psoid); extern ObjectAddress AlterPublicationOwner(const char *name, Oid newOwnerId); -extern void AlterPublicationOwner_oid(Oid subid, Oid newOwnerId); +extern void AlterPublicationOwner_oid(Oid pubid, Oid newOwnerId); extern void InvalidatePublicationRels(List *relids); extern bool pub_rf_contains_invalid_column(Oid pubid, Relation relation, List *ancestors, bool pubviaroot); -- 2.39.5