diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index 0a181b01d9..3eef06ab7d 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -1484,6 +1484,8 @@ describeOneTableDetails(const char *schemaname, char *reloftype; char relpersistence; char relreplident; + char *relam; + bool relam_is_default; } tableinfo; bool show_column_details = false; @@ -1503,9 +1505,11 @@ describeOneTableDetails(const char *schemaname, "c.relhastriggers, c.relrowsecurity, c.relforcerowsecurity, " "false AS relhasoids, %s, c.reltablespace, " "CASE WHEN c.reloftype = 0 THEN '' ELSE c.reloftype::pg_catalog.regtype::pg_catalog.text END, " - "c.relpersistence, c.relreplident\n" + "c.relpersistence, c.relreplident, am.amname," + "am.amname = current_setting('default_table_access_method') \n" "FROM pg_catalog.pg_class c\n " "LEFT JOIN pg_catalog.pg_class tc ON (c.reltoastrelid = tc.oid)\n" + "LEFT JOIN pg_catalog.pg_am am ON (c.relam = am.oid)\n" "WHERE c.oid = '%s';", (verbose ? "pg_catalog.array_to_string(c.reloptions || " @@ -1656,6 +1660,17 @@ describeOneTableDetails(const char *schemaname, *(PQgetvalue(res, 0, 11)) : 0; tableinfo.relreplident = (pset.sversion >= 90400) ? *(PQgetvalue(res, 0, 12)) : 'd'; + if (pset.sversion >= 120000) + { + tableinfo.relam = PQgetisnull(res, 0, 13) ? + (char *) NULL : pg_strdup(PQgetvalue(res, 0, 13)); + tableinfo.relam_is_default = strcmp(PQgetvalue(res, 0, 14), "t") == 0; + } + else + { + tableinfo.relam = NULL; + tableinfo.relam_is_default = false; + } PQclear(res); res = NULL; @@ -3141,6 +3156,16 @@ describeOneTableDetails(const char *schemaname, /* Tablespace info */ add_tablespace_footer(&cont, tableinfo.relkind, tableinfo.tablespace, true); + + /* Access method info */ + if (pset.sversion >= 120000 && verbose && tableinfo.relam != NULL && + !(pset.hide_tableam && tableinfo.relam_is_default)) + { + printfPQExpBuffer(&buf, _("Access method: %s"), fmtId(tableinfo.relam)); + printTableAddFooter(&cont, buf.data); + } + + } /* reloptions, if verbose */ diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h index 176c85afd0..0c62dfac30 100644 --- a/src/bin/psql/settings.h +++ b/src/bin/psql/settings.h @@ -140,6 +140,7 @@ typedef struct _psqlSettings const char *prompt3; PGVerbosity verbosity; /* current error verbosity level */ PGContextVisibility show_context; /* current context display level */ + bool hide_tableam; } PsqlSettings; extern PsqlSettings pset; diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index e7536a8a06..b757febcc5 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -1128,6 +1128,11 @@ show_context_hook(const char *newval) return true; } +static bool +hide_tableam_hook(const char *newval) +{ + return ParseVariableBool(newval, "HIDE_TABLEAM", &pset.hide_tableam); +} static void EstablishVariableSpace(void) @@ -1191,4 +1196,7 @@ EstablishVariableSpace(void) SetVariableHooks(pset.vars, "SHOW_CONTEXT", show_context_substitute_hook, show_context_hook); + SetVariableHooks(pset.vars, "HIDE_TABLEAM", + bool_substitute_hook, + hide_tableam_hook); } diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out index 19bb538411..031c09422c 100644 --- a/src/test/regress/expected/copy2.out +++ b/src/test/regress/expected/copy2.out @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on CREATE TEMP TABLE x ( a serial, b int, diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out index 7e52c27e3f..15c4474235 100644 --- a/src/test/regress/expected/create_table.out +++ b/src/test/regress/expected/create_table.out @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- CREATE_TABLE -- diff --git a/src/test/regress/expected/create_table_like.out b/src/test/regress/expected/create_table_like.out index b582211270..08cbeadf0c 100644 --- a/src/test/regress/expected/create_table_like.out +++ b/src/test/regress/expected/create_table_like.out @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on /* Test inheritance of structure (LIKE) */ CREATE TABLE inhx (xx text DEFAULT 'text'); /* diff --git a/src/test/regress/expected/domain.out b/src/test/regress/expected/domain.out index 0b5a9041b0..e2568008d9 100644 --- a/src/test/regress/expected/domain.out +++ b/src/test/regress/expected/domain.out @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- Test domains. -- diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out index 4d82d3a7e8..60a28c09fb 100644 --- a/src/test/regress/expected/foreign_data.out +++ b/src/test/regress/expected/foreign_data.out @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- Test foreign-data wrapper and server management. -- diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out index f259d07535..5236af2744 100644 --- a/src/test/regress/expected/inherit.out +++ b/src/test/regress/expected/inherit.out @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- Test inheritance features -- diff --git a/src/test/regress/expected/insert.out b/src/test/regress/expected/insert.out index 1cf6531c01..ab90db4d66 100644 --- a/src/test/regress/expected/insert.out +++ b/src/test/regress/expected/insert.out @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- insert with DEFAULT in the target_list -- diff --git a/src/test/regress/expected/matview.out b/src/test/regress/expected/matview.out index 08cd4bea48..ff9ade106d 100644 --- a/src/test/regress/expected/matview.out +++ b/src/test/regress/expected/matview.out @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- create a table to use as a basis for views and materialized views in various combinations CREATE TABLE mvtest_t (id int NOT NULL PRIMARY KEY, type text NOT NULL, amt numeric NOT NULL); INSERT INTO mvtest_t VALUES diff --git a/src/test/regress/expected/publication.out b/src/test/regress/expected/publication.out index afbbdd543d..cc5d42dbf2 100644 --- a/src/test/regress/expected/publication.out +++ b/src/test/regress/expected/publication.out @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- PUBLICATION -- diff --git a/src/test/regress/expected/replica_identity.out b/src/test/regress/expected/replica_identity.out index 175ecd2879..f3331ee833 100644 --- a/src/test/regress/expected/replica_identity.out +++ b/src/test/regress/expected/replica_identity.out @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on CREATE TABLE test_replica_identity ( id serial primary key, keya text not null, diff --git a/src/test/regress/expected/rowsecurity.out b/src/test/regress/expected/rowsecurity.out index 1d12b01068..a3c3befb04 100644 --- a/src/test/regress/expected/rowsecurity.out +++ b/src/test/regress/expected/rowsecurity.out @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- Test of Row-level security feature -- diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index b68b8d273f..feb7cd95b1 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- RULES -- From Jan's original setup_ruletest.sql and run_ruletest.sql diff --git a/src/test/regress/expected/update.out b/src/test/regress/expected/update.out index d09326c182..bf209c14b0 100644 --- a/src/test/regress/expected/update.out +++ b/src/test/regress/expected/update.out @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- UPDATE syntax tests -- diff --git a/src/test/regress/sql/copy2.sql b/src/test/regress/sql/copy2.sql index e36df8858e..bec93af438 100644 --- a/src/test/regress/sql/copy2.sql +++ b/src/test/regress/sql/copy2.sql @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on CREATE TEMP TABLE x ( a serial, b int, diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql index a2cae9663c..fb1e9083a4 100644 --- a/src/test/regress/sql/create_table.sql +++ b/src/test/regress/sql/create_table.sql @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- CREATE_TABLE -- diff --git a/src/test/regress/sql/create_table_like.sql b/src/test/regress/sql/create_table_like.sql index 65c3880792..46889a5b1f 100644 --- a/src/test/regress/sql/create_table_like.sql +++ b/src/test/regress/sql/create_table_like.sql @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on /* Test inheritance of structure (LIKE) */ CREATE TABLE inhx (xx text DEFAULT 'text'); diff --git a/src/test/regress/sql/domain.sql b/src/test/regress/sql/domain.sql index 68da27de22..c12f0b3093 100644 --- a/src/test/regress/sql/domain.sql +++ b/src/test/regress/sql/domain.sql @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- Test domains. -- diff --git a/src/test/regress/sql/foreign_data.sql b/src/test/regress/sql/foreign_data.sql index d6fb3fae4e..3aba5a9236 100644 --- a/src/test/regress/sql/foreign_data.sql +++ b/src/test/regress/sql/foreign_data.sql @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- Test foreign-data wrapper and server management. -- diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql index 425052c1f4..40dffccc7d 100644 --- a/src/test/regress/sql/inherit.sql +++ b/src/test/regress/sql/inherit.sql @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- Test inheritance features -- diff --git a/src/test/regress/sql/insert.sql b/src/test/regress/sql/insert.sql index a7f659bc2b..85b5ca909c 100644 --- a/src/test/regress/sql/insert.sql +++ b/src/test/regress/sql/insert.sql @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- insert with DEFAULT in the target_list -- diff --git a/src/test/regress/sql/matview.sql b/src/test/regress/sql/matview.sql index d96175aa26..2ce509581d 100644 --- a/src/test/regress/sql/matview.sql +++ b/src/test/regress/sql/matview.sql @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- create a table to use as a basis for views and materialized views in various combinations CREATE TABLE mvtest_t (id int NOT NULL PRIMARY KEY, type text NOT NULL, amt numeric NOT NULL); INSERT INTO mvtest_t VALUES diff --git a/src/test/regress/sql/publication.sql b/src/test/regress/sql/publication.sql index 815410b3c5..d5a1370c74 100644 --- a/src/test/regress/sql/publication.sql +++ b/src/test/regress/sql/publication.sql @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- PUBLICATION -- diff --git a/src/test/regress/sql/replica_identity.sql b/src/test/regress/sql/replica_identity.sql index b08a3623b8..90db4a7c40 100644 --- a/src/test/regress/sql/replica_identity.sql +++ b/src/test/regress/sql/replica_identity.sql @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on CREATE TABLE test_replica_identity ( id serial primary key, keya text not null, diff --git a/src/test/regress/sql/rowsecurity.sql b/src/test/regress/sql/rowsecurity.sql index 38e9b38bc4..4b1c2ee619 100644 --- a/src/test/regress/sql/rowsecurity.sql +++ b/src/test/regress/sql/rowsecurity.sql @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- Test of Row-level security feature -- diff --git a/src/test/regress/sql/rules.sql b/src/test/regress/sql/rules.sql index f4ee30ec8f..a54038f3a2 100644 --- a/src/test/regress/sql/rules.sql +++ b/src/test/regress/sql/rules.sql @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- RULES -- From Jan's original setup_ruletest.sql and run_ruletest.sql diff --git a/src/test/regress/sql/update.sql b/src/test/regress/sql/update.sql index c9bb3b53d3..837b6d1871 100644 --- a/src/test/regress/sql/update.sql +++ b/src/test/regress/sql/update.sql @@ -1,3 +1,4 @@ +\set HIDE_TABLEAM on -- -- UPDATE syntax tests --