psql: show default extension version in \dx output

Reviewed-By: Julien Rouhaud <[email protected]>
Reviewed-By: Michael Banck <[email protected]>
Reviewed-By: Yugo Nagata <[email protected]>
Reviewed-By: Nathan Bossart <[email protected]>
Reviewed-By: Jelte Fennema-Nio <[email protected]>
Discussion: https://postgr.es/m/CABUevEyTMyXC6OvCWkj+rPnHrfi8_Rw_+DD_jzgFFNPqgf+Oig@mail.gmail.com

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index e6cf468ac9e9e50f76af81fe81e176fe797d221b..01e62430fff0871c03f8f1416de8150020d6c1fe 100644 (file)
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -6188,13 +6188,16 @@ listExtensions(const char *pattern)
    initPQExpBuffer(&buf);
    printfPQExpBuffer(&buf,
                      "SELECT e.extname AS \"%s\", "
-                     "e.extversion AS \"%s\", n.nspname AS \"%s\", c.description AS \"%s\"\n"
+                     "e.extversion AS \"%s\", ae.default_version AS \"%s\","
+                     "n.nspname AS \"%s\", c.description AS \"%s\"\n"
                      "FROM pg_catalog.pg_extension e "
                      "LEFT JOIN pg_catalog.pg_namespace n ON n.oid = e.extnamespace "
                      "LEFT JOIN pg_catalog.pg_description c ON c.objoid = e.oid "
+                     "LEFT JOIN pg_catalog.pg_available_extensions() ae(name, default_version, comment) ON ae.name = e.extname "
                      "AND c.classoid = 'pg_catalog.pg_extension'::pg_catalog.regclass\n",
                      gettext_noop("Name"),
                      gettext_noop("Version"),
+                     gettext_noop("Default version"),
                      gettext_noop("Schema"),
                      gettext_noop("Description"));
 

diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index 8687ffe27506128fa8c4145ee12c86c275c4436f..b1d12585eaed041e491f5dc6a72240fd7d771863 100644 (file)
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -6460,9 +6460,9 @@ List of schemas
 (0 rows)
 
 \dx "no.such.installed.extension"
-     List of installed extensions
- Name | Version | Schema | Description 
-------+---------+--------+-------------
+              List of installed extensions
+ Name | Version | Default version | Schema | Description 
+------+---------+-----------------+--------+-------------
 (0 rows)
 
 \dX "no.such.extended.statistics"