From 38a883118a87214062fb401ba83308a9aeeebe40 Mon Sep 17 00:00:00 2001
From: Anastasia Lubennikova <anastasia@neon.tech>
Date: Wed, 5 Mar 2025 11:29:46 +0000
Subject: [PATCH] Skip dropping tablesync replication slots on the publisher
 from branch (#11073)

fixes https://github.com/neondatabase/cloud/issues/24292

Do not drop tablesync replication slots on the publisher,
when we're in the process of dropping subscriptions inherited by a neon
branch.
Because these slots are still needed by the parent branch subscriptions.

For regular slots we handle this by setting the slot_name to NONE
before calling DROP SUBSCRIPTION, but tablesync slots are not exposed to
SQL.

rely on GUC disable_logical_replication_subscribers=true
to know that we're in the Neon-specific process of dropping
subscriptions.
---
 vendor/postgres-v14   | 2 +-
 vendor/postgres-v15   | 2 +-
 vendor/postgres-v16   | 2 +-
 vendor/postgres-v17   | 2 +-
 vendor/revisions.json | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/vendor/postgres-v14 b/vendor/postgres-v14
index 6254ab9b44..b1425505c6 160000
--- a/vendor/postgres-v14
+++ b/vendor/postgres-v14
@@ -1 +1 @@
-Subproject commit 6254ab9b4496c3e481bc037ae69d859bbc2bdd7d
+Subproject commit b1425505c6f9a622a5aadf3ee362740519993310
diff --git a/vendor/postgres-v15 b/vendor/postgres-v15
index 9b118b1cff..533be42f7d 160000
--- a/vendor/postgres-v15
+++ b/vendor/postgres-v15
@@ -1 +1 @@
-Subproject commit 9b118b1cffa6e4ca0d63389b57b54d11e207e9a8
+Subproject commit 533be42f7da97e614ce1c494fafe3e49f53991b1
diff --git a/vendor/postgres-v16 b/vendor/postgres-v16
index 799e7a08dd..78050f965f 160000
--- a/vendor/postgres-v16
+++ b/vendor/postgres-v16
@@ -1 +1 @@
-Subproject commit 799e7a08dd171aa06a7395dd326f4243aaeb9f93
+Subproject commit 78050f965f2e550fd6e58f837394cb3d080d7d42
diff --git a/vendor/postgres-v17 b/vendor/postgres-v17
index 517b8dc244..780efda2ef 160000
--- a/vendor/postgres-v17
+++ b/vendor/postgres-v17
@@ -1 +1 @@
-Subproject commit 517b8dc244abf3e56f0089849e464af76f70b94e
+Subproject commit 780efda2ef8d629495cc289624534ba8cde40779
diff --git a/vendor/revisions.json b/vendor/revisions.json
index 8dde46a01e..1a811cfa3d 100644
--- a/vendor/revisions.json
+++ b/vendor/revisions.json
@@ -1,18 +1,18 @@
 {
   "v17": [
     "17.4",
-    "517b8dc244abf3e56f0089849e464af76f70b94e"
+    "780efda2ef8d629495cc289624534ba8cde40779"
   ],
   "v16": [
     "16.8",
-    "799e7a08dd171aa06a7395dd326f4243aaeb9f93"
+    "78050f965f2e550fd6e58f837394cb3d080d7d42"
   ],
   "v15": [
     "15.12",
-    "9b118b1cffa6e4ca0d63389b57b54d11e207e9a8"
+    "533be42f7da97e614ce1c494fafe3e49f53991b1"
   ],
   "v14": [
     "14.17",
-    "6254ab9b4496c3e481bc037ae69d859bbc2bdd7d"
+    "b1425505c6f9a622a5aadf3ee362740519993310"
   ]
 }