From e471dc59121932d669d69d0683c71d5df3b527e3 Mon Sep 17 00:00:00 2001 From: Masahiko Sawada Date: Wed, 22 Apr 2026 09:59:46 -0700 Subject: [PATCH] pg_upgrade: Fix detection of invalid logical replication slots. Commit 7a1f0f8747a optimized the slot verification query but overlooked cases where all logical replication slots are already invalidated. In this scenario, the CTE returns no rows, causing the main query (which used a cross join) to return an empty result even when invalid slots exist. This commit fixes this by using a LEFT JOIN with the CTE, ensuring that slots are properly reported even if the CTE returns no rows. Author: Lakshmi N Reviewed-by: Shveta Malik Reviewed-by: Chao Li Discussion: https://postgr.es/m/CA+3i_M8eT6j8_cBHkYykV-SXCxbmAxpVSKptjDVq+MFtpT-Paw@mail.gmail.com --- src/bin/pg_upgrade/info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c index 8c5679b8097..37fff93892f 100644 --- a/src/bin/pg_upgrade/info.c +++ b/src/bin/pg_upgrade/info.c @@ -743,7 +743,8 @@ get_old_cluster_logical_slot_infos_query(ClusterInfo *cluster) " confirmed_flush_lsn > last_pending_wal " "END as caught_up, " "invalidation_reason IS NOT NULL as invalid " - "FROM pg_catalog.pg_replication_slots, check_caught_up " + "FROM pg_catalog.pg_replication_slots " + "LEFT JOIN check_caught_up ON true " "WHERE slot_type = 'logical' AND " "database = current_database() AND " "temporary IS FALSE ";