Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1dce053

Browse files
committed
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
1 parent 1f18442 commit 1dce053

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

doc/src/sgml/ref/psql-ref.sgml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,8 @@ testdb=>
10711071

10721072
<listitem>
10731073
<para>
1074-
For each relation (table, view, index, sequence, or foreign table)
1074+
For each relation (table, view, materialized view, index, sequence,
1075+
or foreign table)
10751076
or composite type matching the
10761077
<replaceable class="parameter">pattern</replaceable>, show all
10771078
columns, their types, the tablespace (if not the default) and any
@@ -1086,8 +1087,8 @@ testdb=&gt;
10861087

10871088
<para>
10881089
For some types of relation, <literal>\d</> shows additional information
1089-
for each column: column values for sequences, indexed expression for
1090-
indexes and foreign data wrapper options for foreign tables.
1090+
for each column: column values for sequences, indexed expressions for
1091+
indexes, and foreign data wrapper options for foreign tables.
10911092
</para>
10921093

10931094
<para>
@@ -1109,8 +1110,9 @@ testdb=&gt;
11091110
<para>
11101111
If <command>\d</command> is used without a
11111112
<replaceable class="parameter">pattern</replaceable> argument, it is
1112-
equivalent to <command>\dtvsE</command> which will show a list of
1113-
all visible tables, views, sequences and foreign tables.
1113+
equivalent to <command>\dtvmsE</command> which will show a list of
1114+
all visible tables, views, materialized views, sequences and
1115+
foreign tables.
11141116
This is purely a convenience measure.
11151117
</para>
11161118
</note>

src/bin/psql/describe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2993,7 +2993,6 @@ listDbRoleSettings(const char *pattern, const char *pattern2)
29932993
* s - sequences
29942994
* E - foreign table (Note: different from 'f', the relkind value)
29952995
* (any order of the above is fine)
2996-
* If tabtypes is empty, we default to \dtvsE.
29972996
*/
29982997
bool
29992998
listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSystem)
@@ -3010,6 +3009,7 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
30103009
printQueryOpt myopt = pset.popt;
30113010
static const bool translate_columns[] = {false, false, true, false, false, false, false};
30123011

3012+
/* If tabtypes is empty, we default to \dtvmsE (but see also command.c) */
30133013
if (!(showTables || showIndexes || showViews || showMatViews || showSeq || showForeign))
30143014
showTables = showViews = showMatViews = showSeq = showForeign = true;
30153015

0 commit comments

Comments
 (0)