From f0edc45856a4c6d2ddb9f83d53bd1c50978801d9 Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Tue, 12 May 2026 14:57:31 -0700 Subject: [PATCH v5 1/4] Check retain_dead_tuples for ALTER SUBSCRIPTION ... SERVER. Previously, the subscription setting retain_dead_tuples didn't cause ALTER SUBSCRIPTION ... SERVER to check the publisher. And if the publisher was checked for some other reason, then it would use the old conninfo. Fix ALTER SUBSCRIPTION ... SERVER to always check the publisher when retain_dead_tuples is set, and to use the new connection info, like ALTER SUBSCRIPTION ... CONNECTION. --- src/backend/commands/subscriptioncmds.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c index 7818f667edf..523959ba0ce 100644 --- a/src/backend/commands/subscriptioncmds.c +++ b/src/backend/commands/subscriptioncmds.c @@ -1427,6 +1427,7 @@ AlterSubscription(ParseState *pstate, AlterSubscriptionStmt *stmt, bool retain_dead_tuples; int max_retention; bool retention_active; + char *new_conninfo = NULL; char *origin; Subscription *sub; Form_pg_subscription form; @@ -1810,7 +1811,6 @@ AlterSubscription(ParseState *pstate, AlterSubscriptionStmt *stmt, ForeignServer *new_server; ObjectAddress referenced; AclResult aclresult; - char *conninfo; /* * Remove what was there before, either another foreign server @@ -1846,13 +1846,13 @@ AlterSubscription(ParseState *pstate, AlterSubscriptionStmt *stmt, /* make sure a user mapping exists */ GetUserMapping(form->subowner, new_server->serverid); - conninfo = ForeignServerConnectionString(form->subowner, - new_server); + new_conninfo = ForeignServerConnectionString(form->subowner, + new_server); /* Load the library providing us libpq calls. */ load_file("libpqwalreceiver", false); /* Check the connection info string. */ - walrcv_check_conninfo(conninfo, + walrcv_check_conninfo(new_conninfo, sub->passwordrequired && !sub->ownersuperuser); values[Anum_pg_subscription_subserver - 1] = ObjectIdGetDatum(new_server->serverid); @@ -1863,6 +1863,13 @@ AlterSubscription(ParseState *pstate, AlterSubscriptionStmt *stmt, update_tuple = true; } + + /* + * Since the remote server configuration might have changed, + * perform a check to ensure it permits enabling + * retain_dead_tuples. + */ + check_pub_rdt = sub->retaindeadtuples; break; case ALTER_SUBSCRIPTION_CONNECTION: @@ -1877,10 +1884,12 @@ AlterSubscription(ParseState *pstate, AlterSubscriptionStmt *stmt, replaces[Anum_pg_subscription_subserver - 1] = true; } + new_conninfo = stmt->conninfo; + /* Load the library providing us libpq calls. */ load_file("libpqwalreceiver", false); /* Check the connection info string. */ - walrcv_check_conninfo(stmt->conninfo, + walrcv_check_conninfo(new_conninfo, sub->passwordrequired && !sub->ownersuperuser); values[Anum_pg_subscription_subconninfo - 1] = @@ -2129,7 +2138,7 @@ AlterSubscription(ParseState *pstate, AlterSubscriptionStmt *stmt, * available. */ must_use_password = sub->passwordrequired && !sub->ownersuperuser; - wrconn = walrcv_connect(stmt->conninfo ? stmt->conninfo : sub->conninfo, + wrconn = walrcv_connect(new_conninfo ? new_conninfo : sub->conninfo, true, true, must_use_password, sub->name, &err); if (!wrconn) -- 2.43.0