Further adjustment to psql's print_aligned_vertical() function.

tglsfdc · tglsfdc · commit 2287b8745469 · 2015-12-01T11:07:51.000-05:00
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.
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
@@ -1424,7 +1424,8 @@ print_aligned_vertical(const printTableContent *cont, FILE *fout)
 			if (rwidth > min_width)
 				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 */
 				newdwidth = min_width - hwidth - swidth;

Original file line number	Diff line number	Diff line change
`@@ -1424,7 +1424,8 @@ print_aligned_vertical(const printTableContent cont, FILE fout)`
`1424`	`1424`	`if (rwidth > min_width)`
`1425`	`1425`	`min_width = rwidth;`
`1426`	`1426`
`1427`		`- if (width < min_width \|\| output_columns < min_width)`
	`1427`	`+ if (width < min_width \|\|`
	`1428`	`+ (output_columns > 0 && output_columns < min_width))`
`1428`	`1429`	`{`
`1429`	`1430`	`/* Set data width to match min_width */`
`1430`	`1431`	`newdwidth = min_width - hwidth - swidth;`