Commit d14c85ed authored by Tom Lane's avatar Tom Lane

Fix materialized-view documentation oversights.

When materialized views were added, psql's \d commands were made to
treat them as a separate object category ... but not everyplace in the
documentation or comments got the memo.

Noted by David Johnston.  Back-patch to 9.3 where matviews came in.

Discussion: https://postgr.es/m/CAKFQuwb27M3VXRhHErjCpkWwN9eKThbqWb1=trtoXi9_ejqPXQ@mail.gmail.com
parent 1c25ef63
...@@ -1096,7 +1096,8 @@ testdb=> ...@@ -1096,7 +1096,8 @@ testdb=>
<listitem> <listitem>
<para> <para>
For each relation (table, view, index, sequence, or foreign table) For each relation (table, view, materialized view, index, sequence,
or foreign table)
or composite type matching the or composite type matching the
<replaceable class="parameter">pattern</replaceable>, show all <replaceable class="parameter">pattern</replaceable>, show all
columns, their types, the tablespace (if not the default) and any columns, their types, the tablespace (if not the default) and any
...@@ -1111,8 +1112,8 @@ testdb=&gt; ...@@ -1111,8 +1112,8 @@ testdb=&gt;
<para> <para>
For some types of relation, <literal>\d</> shows additional information For some types of relation, <literal>\d</> shows additional information
for each column: column values for sequences, indexed expression for for each column: column values for sequences, indexed expressions for
indexes and foreign data wrapper options for foreign tables. indexes, and foreign data wrapper options for foreign tables.
</para> </para>
<para> <para>
...@@ -1134,8 +1135,9 @@ testdb=&gt; ...@@ -1134,8 +1135,9 @@ testdb=&gt;
<para> <para>
If <command>\d</command> is used without a If <command>\d</command> is used without a
<replaceable class="parameter">pattern</replaceable> argument, it is <replaceable class="parameter">pattern</replaceable> argument, it is
equivalent to <command>\dtvsE</command> which will show a list of equivalent to <command>\dtvmsE</command> which will show a list of
all visible tables, views, sequences and foreign tables. all visible tables, views, materialized views, sequences and
foreign tables.
This is purely a convenience measure. This is purely a convenience measure.
</para> </para>
</note> </note>
......
...@@ -3288,7 +3288,6 @@ listDbRoleSettings(const char *pattern, const char *pattern2) ...@@ -3288,7 +3288,6 @@ listDbRoleSettings(const char *pattern, const char *pattern2)
* s - sequences * s - sequences
* E - foreign table (Note: different from 'f', the relkind value) * E - foreign table (Note: different from 'f', the relkind value)
* (any order of the above is fine) * (any order of the above is fine)
* If tabtypes is empty, we default to \dtvsE.
*/ */
bool bool
listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSystem) listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSystem)
...@@ -3305,6 +3304,7 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys ...@@ -3305,6 +3304,7 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
printQueryOpt myopt = pset.popt; printQueryOpt myopt = pset.popt;
static const bool translate_columns[] = {false, false, true, false, false, false, false}; static const bool translate_columns[] = {false, false, true, false, false, false, false};
/* If tabtypes is empty, we default to \dtvmsE (but see also command.c) */
if (!(showTables || showIndexes || showViews || showMatViews || showSeq || showForeign)) if (!(showTables || showIndexes || showViews || showMatViews || showSeq || showForeign))
showTables = showViews = showMatViews = showSeq = showForeign = true; showTables = showViews = showMatViews = showSeq = showForeign = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment