Commit 2287b874 authored by Tom Lane's avatar Tom Lane

Further adjustment to psql's print_aligned_vertical() function.

We should ignore output_columns unless it's greater than zero.
A zero means we couldn't get any information from ioctl(TIOCGWINSZ);
in that case the expected behavior is to print the data at native width,
not to wrap it at the smallest possible value.  print_aligned_text()
gets this consideration right, but print_aligned_vertical() lost track
of this detail somewhere along the line.
parent e50cda78
...@@ -1424,7 +1424,8 @@ print_aligned_vertical(const printTableContent *cont, FILE *fout) ...@@ -1424,7 +1424,8 @@ print_aligned_vertical(const printTableContent *cont, FILE *fout)
if (rwidth > min_width) if (rwidth > min_width)
min_width = rwidth; min_width = rwidth;
if (width < min_width || output_columns < min_width) if (width < min_width ||
(output_columns > 0 && output_columns < min_width))
{ {
/* Set data width to match min_width */ /* Set data width to match min_width */
newdwidth = min_width - hwidth - swidth; newdwidth = min_width - hwidth - swidth;
......
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