From: Chao Li <li.evan.chao@gmail.com>
Content-Type: multipart/mixed;
	boundary="Apple-Mail=_E088A7F8-947E-4A7D-9783-F7BE63540B01"
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.400.21\))
Subject: Bug: wrong relname in RemoveSubscriptionRel() error detail
Message-Id: <B7B16777-AC54-413A-BECE-A814E90D395B@gmail.com>
Date: Fri, 27 Mar 2026 17:51:57 +0800
To: PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>
Archived-At: 
 <https://www.postgresql.org/message-id/B7B16777-AC54-413A-BECE-A814E90D395B%40gmail.com>
Precedence: bulk


--Apple-Mail=_E088A7F8-947E-4A7D-9783-F7BE63540B01
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=utf-8

Hi,

I just noticed a wrong relation name in the error detail emitted by =
RemoveSubscriptionRel():
```
*
 * Drop subscription relation mapping. These can be for a particular
 * subscription, or for a particular relation, or both.
 */
void
RemoveSubscriptionRel(Oid subid, Oid relid)
{
	Relation	rel;
	TableScanDesc scan;
	ScanKeyData skey[2];
	HeapTuple	tup;
	int			nkeys =3D 0;

	rel =3D table_open(SubscriptionRelRelationId, RowExclusiveLock);

	if (OidIsValid(subid))
	{
		ScanKeyInit(&skey[nkeys++],
					=
Anum_pg_subscription_rel_srsubid,
					BTEqualStrategyNumber,
					F_OIDEQ,
					ObjectIdGetDatum(subid));
	}

	if (OidIsValid(relid))
	{
		ScanKeyInit(&skey[nkeys++],
					=
Anum_pg_subscription_rel_srrelid,
					BTEqualStrategyNumber,
					F_OIDEQ,
					ObjectIdGetDatum(relid));
	}

	/* Do the search and delete what we found. */
	scan =3D table_beginscan_catalog(rel, nkeys, skey);
	while (HeapTupleIsValid(tup =3D heap_getnext(scan, =
ForwardScanDirection)))
	{
		Form_pg_subscription_rel subrel;

		subrel =3D (Form_pg_subscription_rel) GETSTRUCT(tup);

		if (!OidIsValid(subid) &&
			subrel->srsubstate !=3D SUBREL_STATE_READY &&
			get_rel_relkind(subrel->srrelid) !=3D =
RELKIND_SEQUENCE)
		{
			ereport(ERROR,
					=
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
					 errmsg("could not drop relation =
mapping for subscription \"%s\"",
							=
get_subscription_name(subrel->srsubid, false)),
					 errdetail("Table =
synchronization for relation \"%s\" is in progress and is in state =
\"%c\".",
							   =
get_rel_name(relid), subrel->srsubstate), // <=3D=3D=3D=3D=3D=3D bug is =
here

```

In the error detail, it uses relid to get the relation name. But at that =
point we are iterating over subrel, and the function argument relid can =
be InvalidOid. So the error detail should use subrel->srrelid instead.

This looks like a first-day bug introducing by ce0fdbf, so I think =
it=E2=80=99s worth back-patching.

Best regards,
--
Chao Li (Evan)
HighGo Software Co., Ltd.
https://www.highgo.com/


--Apple-Mail=_E088A7F8-947E-4A7D-9783-F7BE63540B01
Content-Disposition: attachment;
	filename=v1-0001-Fix-wrong-relname-in-RemoveSubscriptionRel-error-.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="v1-0001-Fix-wrong-relname-in-RemoveSubscriptionRel-error-.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=20c49dc0495607c05c6ac8e15cc0300f91bacf0f6c=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20"Chao=20Li=20(Evan)"=20<lic@highgo.com>=0A=
Date:=20Fri,=2027=20Mar=202026=2017:39:30=20+0800=0ASubject:=20[PATCH=20=
v1]=20Fix=20wrong=20relname=20in=20RemoveSubscriptionRel()=20error=20=
detail=0A=0AAuthor:=20Chao=20Li=20<lic@highgo.com>=0AReviewed-by:=0A=
Discussion:=20https://postgr.es/m/=0A---=0A=20=
src/backend/catalog/pg_subscription.c=20|=202=20+-=0A=201=20file=20=
changed,=201=20insertion(+),=201=20deletion(-)=0A=0Adiff=20--git=20=
a/src/backend/catalog/pg_subscription.c=20=
b/src/backend/catalog/pg_subscription.c=0Aindex=20=
5a733585490..0ee00d91d83=20100644=0A---=20=
a/src/backend/catalog/pg_subscription.c=0A+++=20=
b/src/backend/catalog/pg_subscription.c=0A@@=20-525,7=20+525,7=20@@=20=
RemoveSubscriptionRel(Oid=20subid,=20Oid=20relid)=0A=20=09=09=09=09=09=20=
errmsg("could=20not=20drop=20relation=20mapping=20for=20subscription=20=
\"%s\"",=0A=20=09=09=09=09=09=09=09=
get_subscription_name(subrel->srsubid,=20false)),=0A=20=09=09=09=09=09=20=
errdetail("Table=20synchronization=20for=20relation=20\"%s\"=20is=20in=20=
progress=20and=20is=20in=20state=20\"%c\".",=0A-=09=09=09=09=09=09=09=20=20=
=20get_rel_name(relid),=20subrel->srsubstate),=0A+=09=09=09=09=09=09=09=20=
=20=20get_rel_name(subrel->srrelid),=20subrel->srsubstate),=0A=20=0A=20=09=
=09=09/*=0A=20=09=09=09=20*=20translator:=20first=20%s=20is=20a=20SQL=20=
ALTER=20command=20and=20second=20%s=20is=20a=0A--=20=0A2.50.1=20(Apple=20=
Git-155)=0A=0A=

--Apple-Mail=_E088A7F8-947E-4A7D-9783-F7BE63540B01--