From 9877e327b4b3f5f362024e64351b67bf04181bd8 Mon Sep 17 00:00:00 2001
From: chenxiaobin19 <1025221611@qq.com>
Date: Thu, 9 Nov 2023 19:42:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=86=E5=9B=BEpg=5Fpublic?=
 =?UTF-8?q?ation=5Ftables=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=95=88=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/backend/catalog/system_views.sql         | 10 +++++++---
 src/common/backend/utils/init/globals.cpp           |  3 +--
 .../rollback-post_catalog_maindb_92_920.sql         |  9 +++++++++
 .../rollback-post_catalog_otherdb_92_920.sql        |  9 +++++++++
 .../upgrade-post_catalog_maindb_92_920.sql          | 13 +++++++++++++
 .../upgrade-post_catalog_otherdb_92_920.sql         | 13 +++++++++++++
 6 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_920.sql
 create mode 100644 src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_920.sql
 create mode 100644 src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_920.sql
 create mode 100644 src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_920.sql

diff --git a/src/common/backend/catalog/system_views.sql b/src/common/backend/catalog/system_views.sql
index 124b489fe..927c45dd3 100644
--- a/src/common/backend/catalog/system_views.sql
+++ b/src/common/backend/catalog/system_views.sql
@@ -3588,12 +3588,16 @@ SELECT * FROM pg_catalog.pv_thread_memory_detail() WHERE contextname LIKE '%Loca
 
 CREATE VIEW pg_publication_tables AS
     SELECT
-        P.pubname AS pubname,
+        gpt.pubname AS pubname,
         N.nspname AS schemaname,
         C.relname AS tablename
-    FROM pg_publication P, pg_class C
+    FROM (SELECT
+         P.pubname,
+         pg_catalog.pg_get_publication_tables(P.pubname) relid
+         FROM pg_publication P) gpt,
+         pg_class C
          JOIN pg_namespace N ON (N.oid = C.relnamespace)
-    WHERE C.oid IN (SELECT relid FROM pg_catalog.pg_get_publication_tables(P.pubname));
+    WHERE C.oid = gpt.relid;
 
 CREATE VIEW pg_stat_subscription AS
     SELECT
diff --git a/src/common/backend/utils/init/globals.cpp b/src/common/backend/utils/init/globals.cpp
index 9c4e10f05..f8b8466a7 100644
--- a/src/common/backend/utils/init/globals.cpp
+++ b/src/common/backend/utils/init/globals.cpp
@@ -75,8 +75,7 @@ bool will_shutdown = false;
  *       NEXT   |  92899   |     ?      |     ?     
  *
  ********************************************/
-const uint32 GRAND_VERSION_NUM = 92919;
-
+const uint32 GRAND_VERSION_NUM = 92920;
 
 /********************************************
  * 2.VERSION NUM FOR EACH FEATURE
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_920.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_920.sql
new file mode 100644
index 000000000..64105085a
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_920.sql
@@ -0,0 +1,9 @@
+DROP VIEW IF EXISTS pg_catalog.pg_publication_tables;
+CREATE VIEW pg_catalog.pg_publication_tables AS
+    SELECT
+        P.pubname AS pubname,
+        N.nspname AS schemaname,
+        C.relname AS tablename
+    FROM pg_publication P, pg_class C
+         JOIN pg_namespace N ON (N.oid = C.relnamespace)
+    WHERE C.oid IN (SELECT relid FROM pg_catalog.pg_get_publication_tables(P.pubname));
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_920.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_920.sql
new file mode 100644
index 000000000..a28b92217
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_920.sql
@@ -0,0 +1,9 @@
+DROP VIEW IF EXISTS pg_catalog.pg_publication_tables;
+CREATE VIEW pg_catalog.pg_publication_tables AS
+    SELECT
+        P.pubname AS pubname,
+        N.nspname AS schemaname,
+        C.relname AS tablename
+    FROM pg_publication P, pg_class C
+         JOIN pg_namespace N ON (N.oid = C.relnamespace)
+    WHERE C.oid IN (SELECT relid FROM pg_catalog.pg_get_publication_tables(P.pubname));
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_920.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_920.sql
new file mode 100644
index 000000000..60979d823
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_920.sql
@@ -0,0 +1,13 @@
+DROP VIEW IF EXISTS pg_catalog.pg_publication_tables;
+CREATE VIEW pg_catalog.pg_publication_tables AS
+    SELECT
+        gpt.pubname AS pubname,
+        N.nspname AS schemaname,
+        C.relname AS tablename
+    FROM (SELECT
+         P.pubname,
+         pg_catalog.pg_get_publication_tables(P.pubname) relid
+         FROM pg_publication P) gpt,
+         pg_class C
+         JOIN pg_namespace N ON (N.oid = C.relnamespace)
+    WHERE C.oid = gpt.relid;
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_920.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_920.sql
new file mode 100644
index 000000000..60979d823
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_920.sql
@@ -0,0 +1,13 @@
+DROP VIEW IF EXISTS pg_catalog.pg_publication_tables;
+CREATE VIEW pg_catalog.pg_publication_tables AS
+    SELECT
+        gpt.pubname AS pubname,
+        N.nspname AS schemaname,
+        C.relname AS tablename
+    FROM (SELECT
+         P.pubname,
+         pg_catalog.pg_get_publication_tables(P.pubname) relid
+         FROM pg_publication P) gpt,
+         pg_class C
+         JOIN pg_namespace N ON (N.oid = C.relnamespace)
+    WHERE C.oid = gpt.relid;