diff options
| author | Tom Lane | 2016-04-15 02:54:26 +0000 |
|---|---|---|
| committer | Tom Lane | 2016-04-15 02:54:31 +0000 |
| commit | 6f0d6a507889d94a79c0d18577a0cb1ccc2b6815 (patch) | |
| tree | 0ee0bfe10f064a942bd5bb7f99afd5311a1809dd /doc/src | |
| parent | 4b74c6a40e7ac9dad7cdeb4cfd2d51ea60cfdbb5 (diff) | |
Rethink \crosstabview's argument parsing logic.
\crosstabview interpreted its arguments in an unusual way, including
doing case-insensitive matching of unquoted column names, which is
surely not the right thing. Rip that out in favor of doing something
equivalent to the dequoting/case-folding rules used by other psql
commands. To keep it simple, change the syntax so that the optional
sort column is specified as a separate argument, instead of the
also-quite-unusual syntax that attached it to the colH argument with
a colon.
Also, rework the error messages to be closer to project style.
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/ref/psql-ref.sgml | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index b2b2adc3b62..41606658825 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -993,9 +993,10 @@ testdb=> <varlistentry id="APP-PSQL-meta-commands-crosstabview"> <term><literal>\crosstabview [ <replaceable class="parameter">colV</replaceable> - <replaceable class="parameter">colH</replaceable>[:<replaceable class="parameter">scolH</replaceable>] - [<replaceable class="parameter">colD</replaceable>] - ] </literal></term> + [ <replaceable class="parameter">colH</replaceable> + [ <replaceable class="parameter">colD</replaceable> + [ <replaceable class="parameter">sortcolH</replaceable> + ] ] ] ] </literal></term> <listitem> <para> Executes the current query buffer (like <literal>\g</literal>) and @@ -1004,16 +1005,11 @@ testdb=> The output column identified by <replaceable class="parameter">colV</> becomes a vertical header and the output column identified by <replaceable class="parameter">colH</replaceable> - becomes a horizontal header, optionally sorted by ranking data obtained - from column <replaceable class="parameter">scolH</replaceable>. + becomes a horizontal header. <replaceable class="parameter">colD</replaceable> identifies the output column to display within the grid. - If <replaceable class="parameter">colD</replaceable> is not - specified and there are exactly three columns in the result set, - the column that is neither - <replaceable class="parameter">colV</replaceable> nor - <replaceable class="parameter">colH</replaceable> - is displayed; if there are more columns, an error is reported. + <replaceable class="parameter">sortcolH</replaceable> identifies + an optional sort column for the horizontal header. </para> <para> @@ -1024,6 +1020,12 @@ testdb=> and <replaceable class="parameter">colH</replaceable> as column 2. <replaceable class="parameter">colH</replaceable> must differ from <replaceable class="parameter">colV</replaceable>. + If <replaceable class="parameter">colD</replaceable> is not + specified, then there must be exactly three columns in the query + result, and the column that is neither + <replaceable class="parameter">colV</replaceable> nor + <replaceable class="parameter">colH</replaceable> + is taken to be <replaceable class="parameter">colD</replaceable>. </para> <para> @@ -1037,11 +1039,11 @@ testdb=> found in column <replaceable class="parameter">colH</replaceable>, with duplicates removed. By default, these appear in the same order as in the query results. But if the - optional <replaceable class="parameter">scolH</> argument is given, it - identifies a column whose values must be integer numbers, and the + optional <replaceable class="parameter">sortcolH</> argument is given, + it identifies a column whose values must be integer numbers, and the values from <replaceable class="parameter">colH</replaceable> will appear in the horizontal header sorted according to the - corresponding <replaceable class="parameter">scolH</> values. + corresponding <replaceable class="parameter">sortcolH</> values. </para> <para> |