diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index cd39b913cd..d39e01dba7 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -3678,7 +3678,7 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys PGresult *res; printQueryOpt myopt = pset.popt; int cols_so_far; - bool translate_columns[] = {false, false, true, false, false, false, false, false}; + bool translate_columns[] = {false, false, true, false, false, false, false, false, false}; /* If tabtypes is empty, we default to \dtvmsE (but see also command.c) */ if (!(showTables || showIndexes || showViews || showMatViews || showSeq || showForeign)) @@ -3751,6 +3751,12 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys * to; this might change with future additions to the output columns. */ + if (pset.sversion >= 120000 && !pset.hide_tableam && + (showTables || showViews || showMatViews || showIndexes)) + appendPQExpBuffer(&buf, + ",\n am.amname as \"%s\"", + gettext_noop("Access Method")); + /* * As of PostgreSQL 9.0, use pg_table_size() to show a more accurate * size of a table, including FSM, VM and TOAST tables. @@ -3772,6 +3778,12 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys appendPQExpBufferStr(&buf, "\nFROM pg_catalog.pg_class c" "\n LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace"); + + if (pset.sversion >= 120000 && !pset.hide_tableam && + (showTables || showViews || showMatViews || showIndexes)) + appendPQExpBufferStr(&buf, + "\n LEFT JOIN pg_catalog.pg_am am ON am.oid = c.relam"); + if (showIndexes) appendPQExpBufferStr(&buf, "\n LEFT JOIN pg_catalog.pg_index i ON i.indexrelid = c.oid" diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out index 7d2d6328fc..4089125b7b 100644 --- a/src/test/regress/expected/psql.out +++ b/src/test/regress/expected/psql.out @@ -2796,19 +2796,24 @@ Type | func \pset tuples_only false -- check conditional tableam display --- Create a heap2 table am handler with heapam handler +\pset expanded off +CREATE SCHEMA conditional_tableam_display; +CREATE ROLE conditional_tableam_display_role; +ALTER SCHEMA conditional_tableam_display OWNER TO conditional_tableam_display_role; +SET search_path TO conditional_tableam_display; CREATE ACCESS METHOD heap_psql TYPE TABLE HANDLER heap_tableam_handler; +SET role TO conditional_tableam_display_role; CREATE TABLE tbl_heap_psql(f1 int, f2 char(100)) using heap_psql; CREATE TABLE tbl_heap(f1 int, f2 char(100)) using heap; \d+ tbl_heap_psql - Table "public.tbl_heap_psql" + Table "conditional_tableam_display.tbl_heap_psql" Column | Type | Collation | Nullable | Default | Storage | Stats target | Description --------+----------------+-----------+----------+---------+----------+--------------+------------- f1 | integer | | | | plain | | f2 | character(100) | | | | extended | | \d+ tbl_heap - Table "public.tbl_heap" + Table "conditional_tableam_display.tbl_heap" Column | Type | Collation | Nullable | Default | Storage | Stats target | Description --------+----------------+-----------+----------+---------+----------+--------------+------------- f1 | integer | | | | plain | | @@ -2816,7 +2821,7 @@ CREATE TABLE tbl_heap(f1 int, f2 char(100)) using heap; \set HIDE_TABLEAM off \d+ tbl_heap_psql - Table "public.tbl_heap_psql" + Table "conditional_tableam_display.tbl_heap_psql" Column | Type | Collation | Nullable | Default | Storage | Stats target | Description --------+----------------+-----------+----------+---------+----------+--------------+------------- f1 | integer | | | | plain | | @@ -2824,16 +2829,43 @@ CREATE TABLE tbl_heap(f1 int, f2 char(100)) using heap; Access method: heap_psql \d+ tbl_heap - Table "public.tbl_heap" + Table "conditional_tableam_display.tbl_heap" Column | Type | Collation | Nullable | Default | Storage | Stats target | Description --------+----------------+-----------+----------+---------+----------+--------------+------------- f1 | integer | | | | plain | | f2 | character(100) | | | | extended | | Access method: heap +\d+ + List of relations + Schema | Name | Type | Owner | Persistence | Access Method | Size | Description +-----------------------------+---------------+-------+----------------------------------+-------------+---------------+---------+------------- + conditional_tableam_display | tbl_heap | table | conditional_tableam_display_role | permanent | heap | 0 bytes | + conditional_tableam_display | tbl_heap_psql | table | conditional_tableam_display_role | permanent | heap_psql | 0 bytes | +(2 rows) + +-- access method column should not be displayed for sequences +\ds+ + List of relations + Schema | Name | Type | Owner | Persistence | Size | Description +--------+------+------+-------+-------------+------+------------- +(0 rows) + \set HIDE_TABLEAM on +\d+ + List of relations + Schema | Name | Type | Owner | Persistence | Size | Description +-----------------------------+---------------+-------+----------------------------------+-------------+---------+------------- + conditional_tableam_display | tbl_heap | table | conditional_tableam_display_role | permanent | 0 bytes | + conditional_tableam_display | tbl_heap_psql | table | conditional_tableam_display_role | permanent | 0 bytes | +(2 rows) + +SET ROLE TO default; DROP TABLE tbl_heap, tbl_heap_psql; DROP ACCESS METHOD heap_psql; +SET search_path TO default; +DROP SCHEMA conditional_tableam_display; +DROP ROLE conditional_tableam_display_role; -- test numericlocale (as best we can without control of psql's locale) \pset format aligned \pset expanded off diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql index bd10aec6d6..4e353e541d 100644 --- a/src/test/regress/sql/psql.sql +++ b/src/test/regress/sql/psql.sql @@ -456,9 +456,14 @@ select 1 where false; \pset tuples_only false -- check conditional tableam display +\pset expanded off --- Create a heap2 table am handler with heapam handler +CREATE SCHEMA conditional_tableam_display; +CREATE ROLE conditional_tableam_display_role; +ALTER SCHEMA conditional_tableam_display OWNER TO conditional_tableam_display_role; +SET search_path TO conditional_tableam_display; CREATE ACCESS METHOD heap_psql TYPE TABLE HANDLER heap_tableam_handler; +SET role TO conditional_tableam_display_role; CREATE TABLE tbl_heap_psql(f1 int, f2 char(100)) using heap_psql; CREATE TABLE tbl_heap(f1 int, f2 char(100)) using heap; \d+ tbl_heap_psql @@ -466,9 +471,17 @@ CREATE TABLE tbl_heap(f1 int, f2 char(100)) using heap; \set HIDE_TABLEAM off \d+ tbl_heap_psql \d+ tbl_heap +\d+ +-- access method column should not be displayed for sequences +\ds+ \set HIDE_TABLEAM on +\d+ +SET ROLE TO default; DROP TABLE tbl_heap, tbl_heap_psql; DROP ACCESS METHOD heap_psql; +SET search_path TO default; +DROP SCHEMA conditional_tableam_display; +DROP ROLE conditional_tableam_display_role; -- test numericlocale (as best we can without control of psql's locale)