NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4d96e93

committed

Handle border = 3 in expanded mode

In psql, expanded mode was not being displayed correctly when usingthe normal ascii or unicode linestyles and border set to '3'. Now,per the documentation, border '3' is really only sensible for HTMLand LaTeX formats, however, that's no excuse for ascii/unicode tobreak in that case, and provisions had been made for psql to cleanlyhandle this case (and it did, in non-expanded mode).This was broken when ascii/unicode was initially added a good fiveyears ago because print_aligned_vertical_line wasn't passed in theborder setting being used by print_aligned_vertical but instead wasgiven the whole printTableContent. There really isn't a good reasonfor vertical_line to have the entire printTableContent structure, sojust pass in the printTextFormat and border setting (similar to howthis is handled in horizontal_line).Pointed out by Pavel Stehule, fix by me.Back-patch to all currently-supported versions.

1 parentcf5c20b commit4d96e93Copy full SHA for 4d96e93

File tree

1 file changed

-8

lines changed

src/bin/psql
- print.c

1 file changed

-8

lines changed

`‎src/bin/psql/print.c`

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1050,16 +1050,15 @@ print_aligned_text(const printTableContent cont, FILE fout)`
`1050`	`1050`
`1051`	`1051`
`1052`	`1052`	`staticvoid`
`1053`		`-print_aligned_vertical_line(constprintTableContent*cont,`
	`1053`	`+print_aligned_vertical_line(constprintTextFormat*format,`
	`1054`	`+constunsigned shortopt_border,`
`1054`	`1055`	`unsigned longrecord,`
`1055`	`1056`	`unsignedinthwidth,`
`1056`	`1057`	`unsignedintdwidth,`
`1057`	`1058`	`printTextRulepos,`
`1058`	`1059`	`FILE*fout)`
`1059`	`1060`	`{`
`1060`		`-constprintTextFormat*format=get_line_style(cont->opt);`
`1061`	`1061`	`constprintTextLineFormat*lformat=&format->lrule[pos];`
`1062`		`-unsigned shortopt_border=cont->opt->border;`
`1063`	`1062`	`unsignedinti;`
`1064`	`1063`	`intreclen=0;`
`1065`	`1064`
`@@ -1211,11 +1210,11 @@ print_aligned_vertical(const printTableContent cont, FILE fout)`
`1211`	`1210`	`if (i %cont->ncolumns==0)`
`1212`	`1211`	`{`
`1213`	`1212`	`if (!opt_tuples_only)`
`1214`		`-print_aligned_vertical_line(cont,record++,hwidth,dwidth,`
`1215`		`-pos,fout);`
	`1213`	`+print_aligned_vertical_line(format,opt_border,record++,`
	`1214`	`+hwidth,dwidth,pos,fout);`
`1216`	`1215`	`elseif (i!=0\|\| !cont->opt->start_table\|\|opt_border==2)`
`1217`		`-print_aligned_vertical_line(cont,0,hwidth,dwidth,`
`1218`		`-pos,fout);`
	`1216`	`+print_aligned_vertical_line(format,opt_border,0,hwidth,`
	`1217`	`+dwidth,pos,fout);`
`1219`	`1218`	`}`
`1220`	`1219`
`1221`	`1220`	`/* Format the header */`
`@@ -1274,7 +1273,7 @@ print_aligned_vertical(const printTableContent cont, FILE fout)`
`1274`	`1273`	`if (cont->opt->stop_table)`
`1275`	`1274`	`{`
`1276`	`1275`	`if (opt_border==2&& !cancel_pressed)`
`1277`		`-print_aligned_vertical_line(cont,0,hwidth,dwidth,`
	`1276`	`+print_aligned_vertical_line(format,opt_border,0,hwidth,dwidth,`
`1278`	`1277`	`PRINT_RULE_BOTTOM,fout);`
`1279`	`1278`
`1280`	`1279`	`/* print footers */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4d96e93

File tree

1 file changed

1 file changed

`‎src/bin/psql/print.c`

0 commit comments