Commited7e686

committed

psql: Tweak xheader_width and pager_min_lines input parsing

Don't throw away the previous value when an invalid value is proposed.Discussion:https://postgr.es/m/20230519110205.updpbjiuqgbox6gp@alvherre.pgsql

1 parent8e7912e commited7e686Copy full SHA for ed7e686

File tree

-5

lines changed

-5

lines changed

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4521,13 +4521,16 @@ do_pset(const char param, const char value, printQueryOpt *popt, bool quiet)`
`4521`	`4521`	`popt->topt.expanded_header_width_type=PRINT_XHEADER_PAGE;`
`4522`	`4522`	`else`
`4523`	`4523`	`{`
`4524`		`-popt->topt.expanded_header_width_type=PRINT_XHEADER_EXACT_WIDTH;`
`4525`		`-popt->topt.expanded_header_exact_width=atoi(value);`
`4526`		`-if (popt->topt.expanded_header_exact_width==0)`
	`4524`	`+intintval=atoi(value);`
	`4525`	`+`
	`4526`	`+if (intval==0)`
`4527`	`4527`	`{`
`4528`	`4528`	`pg_log_error("\\pset: allowed xheader_width values are \"%s\" (default), \"%s\", \"%s\", or a number specifying the exact width","full","column","page");`
`4529`	`4529`	`return false;`
`4530`	`4530`	`}`
	`4531`	`+`
	`4532`	`+popt->topt.expanded_header_width_type=PRINT_XHEADER_EXACT_WIDTH;`
	`4533`	`+popt->topt.expanded_header_exact_width=intval;`
`4531`	`4534`	`}`
`4532`	`4535`	`}`
`4533`	`4536`
`@@ -4660,8 +4663,9 @@ do_pset(const char param, const char value, printQueryOpt *popt, bool quiet)`
`4660`	`4663`	`/* set minimum lines for pager use */`
`4661`	`4664`	`elseif (strcmp(param,"pager_min_lines")==0)`
`4662`	`4665`	`{`
`4663`		`-if (value)`
`4664`		`-popt->topt.pager_min_lines=atoi(value);`
	`4666`	`+if (value&&`
	`4667`	`+!ParseVariableNum(value,"pager_min_lines",&popt->topt.pager_min_lines))`
	`4668`	`+return false;`
`4665`	`4669`	`}`
`4666`	`4670`
`4667`	`4671`	`/* disable "(x rows)" footer */`

Comments

(0)