From: Michael Paquier Date: Wed, 10 Jun 2026 01:56:23 +0000 (+0900) Subject: psql: Add some missing schema qualifications in describe.c X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf5206f007732c64f857e6bc214f77b5f31efc6a;p=thirdparty%2Fpostgresql.git psql: Add some missing schema qualifications in describe.c These schema qualifications have been missed by 2f094e7a (recent), 8185bb53 (recent) and 923def9a533a (much older, down to v15). Author: Chao Li Reviewed-by: Tingchuan Sun Reviewed-by: Bertrand Drouvot Discussion: https://postgr.es/m/C809E3C7-2437-486E-B626-0BE5F40BBB6C@gmail.com --- diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index e1449654f96..7f9b2b71a36 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -1950,11 +1950,11 @@ describeOneTableDetails(const char *schemaname, "\n when " CppAsString2(PGEKIND_EDGE) " then 'edge' end AS \"%s\"," "\n s.pgealias as \"%s\"," "\n d.pgealias as \"%s\"" - "\n FROM pg_propgraph_element e" - "\n INNER JOIN pg_class c ON c.oid = e.pgerelid" - "\n INNER JOIN pg_namespace n ON c.relnamespace = n.oid" - "\n LEFT JOIN pg_propgraph_element s ON e.pgesrcvertexid = s.oid" - "\n LEFT JOIN pg_propgraph_element d ON e.pgedestvertexid = d.oid" + "\n FROM pg_catalog.pg_propgraph_element e" + "\n INNER JOIN pg_catalog.pg_class c ON c.oid = e.pgerelid" + "\n INNER JOIN pg_catalog.pg_namespace n ON c.relnamespace = n.oid" + "\n LEFT JOIN pg_catalog.pg_propgraph_element s ON e.pgesrcvertexid = s.oid" + "\n LEFT JOIN pg_catalog.pg_propgraph_element d ON e.pgedestvertexid = d.oid" "\n WHERE e.pgepgid = '%s'" "\n ORDER BY e.pgealias", gettext_noop("Element Alias"), @@ -3189,9 +3189,9 @@ describeOneTableDetails(const char *schemaname, "WHERE pc.oid ='%s' and pg_catalog.pg_relation_is_publishable('%s')\n" "UNION\n" "SELECT pubname\n" - " , pg_get_expr(pr.prqual, c.oid)\n" + " , pg_catalog.pg_get_expr(pr.prqual, c.oid)\n" " , (CASE WHEN pr.prattrs IS NOT NULL THEN\n" - " (SELECT string_agg(attname, ', ')\n" + " (SELECT pg_catalog.string_agg(attname, ', ')\n" " FROM pg_catalog.generate_series(0, pg_catalog.array_upper(pr.prattrs::pg_catalog.int2[], 1)) s,\n" " pg_catalog.pg_attribute\n" " WHERE attrelid = pr.prrelid AND attnum = prattrs[s])\n" @@ -6995,7 +6995,7 @@ describePublications(const char *pattern) if (pset.sversion >= 150000) { appendPQExpBufferStr(&buf, - ", pg_get_expr(pr.prqual, c.oid)"); + ", pg_catalog.pg_get_expr(pr.prqual, c.oid)"); appendPQExpBufferStr(&buf, ", (CASE WHEN pr.prattrs IS NOT NULL THEN\n" " pg_catalog.array_to_string(" @@ -7165,7 +7165,7 @@ describeSubscriptions(const char *pattern, bool verbose) if (pset.sversion >= 190000) { appendPQExpBuffer(&buf, - ", (select srvname from pg_foreign_server where oid=subserver) AS \"%s\"\n", + ", (select srvname from pg_catalog.pg_foreign_server where oid=subserver) AS \"%s\"\n", gettext_noop("Server")); appendPQExpBuffer(&buf,