database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

psql: Don't automatically use expanded format when there's 1 column.

Browse Source 
Andreas Karlsson and Robert Haas
This commit is contained in:
Robert Haas
2016-03-11 08:04:01 -05:00
parent 481c76abf4
commit 69ab7b9d6c
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/src/sgml/ref/psql-ref.sgml
View File

@ -2119,8 +2119,9 @@ lo_import 152801
column name on the left and the data on the right. This mode is column name on the left and the data on the right. This mode is
useful if the data wouldn't fit on the screen in the useful if the data wouldn't fit on the screen in the
normal <quote>horizontal</quote> mode. In the auto setting, the normal <quote>horizontal</quote> mode. In the auto setting, the
expanded mode is used whenever the query output is wider than the expanded mode is used whenever the query output has more than one
screen, otherwise the regular mode is used. The auto setting is only column and is wider than the screen; otherwise, the regular mode is
used. The auto setting is only
effective in the aligned and wrapped formats. In other formats, it effective in the aligned and wrapped formats. In other formats, it
always behaves as if the expanded mode is off. always behaves as if the expanded mode is off.
</para> </para>

6
src/bin/psql/print.c
View File

@ -816,9 +816,11 @@ print_aligned_text(const printTableContent *cont, FILE *fout, bool is_pager)
/* /*
* If in expanded auto mode, we have now calculated the expected width, so * If in expanded auto mode, we have now calculated the expected width, so
* we can now escape to vertical mode if necessary. * we can now escape to vertical mode if necessary. If the output has
* only one column, the expanded format would be wider than the regular
* format, so don't use it in that case.
*/ */
if (cont->opt->expanded == 2 && output_columns > 0 && if (cont->opt->expanded == 2 && output_columns > 0 && cont->ncolumns > 1 &&
(output_columns < total_header_width || output_columns < width_total)) (output_columns < total_header_width || output_columns < width_total))
{ {
print_aligned_vertical(cont, fout, is_pager); print_aligned_vertical(cont, fout, is_pager);