diff options
| author | Tom Lane | 2022-09-06 22:00:32 +0000 |
|---|---|---|
| committer | Tom Lane | 2022-09-06 22:00:32 +0000 |
| commit | 20b6847176976da9cae6103475b967e6c2971898 (patch) | |
| tree | c0a92c69263428af839fbc63c4f13e4371601795 /src | |
| parent | cec2754fbebee0a40aaf905947deb823cca4fe39 (diff) | |
Fix new pg_publication_tables query.
The addition of published column names forgot to filter on attisdropped,
leading to cases where you could see "........pg.dropped.1........"
or the like as a reportedly-published column.
While we're here, rewrite the new subquery to get a more efficient plan
for it.
Hou Zhijie, per report from Jaime Casanova. Back-patch to v15 where
the bug was introduced. (Sadly, this means we need a post-beta4
catversion bump before beta4 has even hit the streets. I see no
good alternative though.)
Discussion: https://postgr.es/m/Yxa1SU4nH2HfN3/i@ahch-to
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/catalog/system_views.sql | 9 | ||||
| -rw-r--r-- | src/include/catalog/catversion.h | 2 | ||||
| -rw-r--r-- | src/test/regress/expected/rules.out | 9 |
3 files changed, 7 insertions, 13 deletions
diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql index 5a844b63a1c..55f7ec79e05 100644 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@ -370,11 +370,10 @@ CREATE VIEW pg_publication_tables AS N.nspname AS schemaname, C.relname AS tablename, ( SELECT array_agg(a.attname ORDER BY a.attnum) - FROM unnest(CASE WHEN GPT.attrs IS NOT NULL THEN GPT.attrs - ELSE (SELECT array_agg(g) FROM generate_series(1, C.relnatts) g) - END) k - JOIN pg_attribute a - ON (a.attrelid = GPT.relid AND a.attnum = k) + FROM pg_attribute a + WHERE a.attrelid = GPT.relid AND a.attnum > 0 AND + NOT a.attisdropped AND + (a.attnum = ANY(GPT.attrs) OR GPT.attrs IS NULL) ) AS attnames, pg_get_expr(GPT.qual, GPT.relid) AS rowfilter FROM pg_publication P, diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 78d25036b35..c6a82d679b1 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -57,6 +57,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 202209011 +#define CATALOG_VERSION_NO 202209062 #endif diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index 7ec3d2688f0..9dd137415e8 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -1440,13 +1440,8 @@ pg_publication_tables| SELECT p.pubname, n.nspname AS schemaname, c.relname AS tablename, ( SELECT array_agg(a.attname ORDER BY a.attnum) AS array_agg - FROM (unnest( - CASE - WHEN (gpt.attrs IS NOT NULL) THEN (gpt.attrs)::integer[] - ELSE ( SELECT array_agg(g.g) AS array_agg - FROM generate_series(1, (c.relnatts)::integer) g(g)) - END) k(k) - JOIN pg_attribute a ON (((a.attrelid = gpt.relid) AND (a.attnum = k.k))))) AS attnames, + FROM pg_attribute a + WHERE ((a.attrelid = gpt.relid) AND (a.attnum > 0) AND (NOT a.attisdropped) AND ((a.attnum = ANY ((gpt.attrs)::smallint[])) OR (gpt.attrs IS NULL)))) AS attnames, pg_get_expr(gpt.qual, gpt.relid) AS rowfilter FROM pg_publication p, LATERAL pg_get_publication_tables((p.pubname)::text) gpt(relid, attrs, qual), |