From fbca9af29086444e20d0f8b30a2df0d79abcf801 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Thu, 23 Jul 2026 23:44:10 -0400 Subject: [PATCH] Fix for #10187 Extension UI gives error with PG 19 column reference "comment" is ambiguous LINE 5: e.comment Issue caused because in pg19 : SELECT * FROM pg_catalog.pg_available_extensions(); now outputs an additional column `location` after default_version and comment is now 4th column --- .../extensions/templates/extensions/sql/properties.sql | 2 +- .../templates/search_objects/sql/pg/default/search.sql | 2 +- .../templates/search_objects/sql/ppas/default/search.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/sql/properties.sql index 02466b8e75c..32cdfb92819 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/sql/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/sql/properties.sql @@ -7,7 +7,7 @@ SELECT FROM pg_catalog.pg_extension x LEFT JOIN pg_catalog.pg_namespace n ON x.extnamespace=n.oid - JOIN pg_catalog.pg_available_extensions() e(name, default_version, comment) ON x.extname=e.name + JOIN pg_catalog.pg_available_extensions() e ON x.extname=e.name {%- if eid %} WHERE x.oid = {{eid}}::oid {% elif ename %} diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql index 0b91766b763..1a82b3c90ab 100644 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql +++ b/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql @@ -473,7 +473,7 @@ FROM ( {{ show_node_prefs['extension'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_extension x JOIN pg_catalog.pg_namespace n on x.extnamespace=n.oid - join pg_catalog.pg_available_extensions() e(name, default_version, comment) ON x.extname=e.name + join pg_catalog.pg_available_extensions() e ON x.extname=e.name {% endif %} {% if all_obj %} UNION diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql index 859ba45926a..44d7f05fbab 100644 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql +++ b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql @@ -508,7 +508,7 @@ FROM ( {{ show_node_prefs['extension'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_extension x JOIN pg_catalog.pg_namespace n on x.extnamespace=n.oid - join pg_catalog.pg_available_extensions() e(name, default_version, comment) ON x.extname=e.name + join pg_catalog.pg_available_extensions() e ON x.extname=e.name {% endif %} {% if all_obj %} UNION