From 82d3a425d7dda6c11cfbfcb8b3dadd57cc6d2af9 Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Tue, 19 May 2026 17:04:49 +1000 Subject: [PATCH v3 1/2] Fix psql publication describe for tables in schema --- src/bin/psql/describe.c | 7 ++++++- src/test/regress/expected/publication.out | 6 ------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index e1449654f96..f5551896598 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -7015,7 +7015,12 @@ describePublications(const char *pattern) " pg_catalog.pg_publication_rel pr\n" "WHERE c.relnamespace = n.oid\n" " AND c.oid = pr.prrelid\n" - " AND pr.prpubid = '%s'\n", pubid); + " AND pr.prpubid = '%s'\n" + " AND n.oid NOT IN (\n" + " SELECT pn.pnnspid\n" + " FROM pg_catalog.pg_publication_namespace pn\n" + " WHERE pn.pnpubid = '%s'\n)", + pubid, pubid); if (pset.sversion >= 190000) appendPQExpBufferStr(&buf, " AND NOT pr.prexcept\n"); diff --git a/src/test/regress/expected/publication.out b/src/test/regress/expected/publication.out index 29e54b214a0..b29b6b53119 100644 --- a/src/test/regress/expected/publication.out +++ b/src/test/regress/expected/publication.out @@ -146,8 +146,6 @@ RESET client_min_messages; Owner | All tables | All sequences | Inserts | Updates | Deletes | Truncates | Generated columns | Via root | Description --------------------------+------------+---------------+---------+---------+---------+-----------+-------------------+----------+------------- regress_publication_user | f | f | t | t | t | t | none | f | -Tables: - "pub_test.testpub_nopk" Tables from schemas: "pub_test" @@ -167,8 +165,6 @@ ALTER PUBLICATION testpub_forschema ADD TABLE pub_test.testpub_nopk; Owner | All tables | All sequences | Inserts | Updates | Deletes | Truncates | Generated columns | Via root | Description --------------------------+------------+---------------+---------+---------+---------+-----------+-------------------+----------+------------- regress_publication_user | f | f | t | t | t | t | none | f | -Tables: - "pub_test.testpub_nopk" Tables from schemas: "pub_test" @@ -832,8 +828,6 @@ RESET client_min_messages; Owner | All tables | All sequences | Inserts | Updates | Deletes | Truncates | Generated columns | Via root | Description --------------------------+------------+---------------+---------+---------+---------+-----------+-------------------+----------+------------- regress_publication_user | f | f | t | t | t | t | none | f | -Tables: - "testpub_rf_schema2.testpub_rf_tbl6" WHERE (i < 99) Tables from schemas: "testpub_rf_schema2" -- 2.54.0