Commitbd406af

committed

psql: Improve \crosstabview error messages

1 parent562e449 commitbd406afCopy full SHA for bd406af

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ PrintResultsInCrosstab(const PGresult *res)`
`122`	`122`
`123`	`123`	`if (PQresultStatus(res)!=PGRES_TUPLES_OK)`
`124`	`124`	`{`
`125`		`-psql_error("\\crosstabview:query mustreturnresults to be shown in crosstab\n");`
	`125`	`+psql_error("\\crosstabview:statement did notreturna result set\n");`
`126`	`126`	`gotoerror_return;`
`127`	`127`	`}`
`128`	`128`
`@@ -643,7 +643,8 @@ indexOfColumn(char arg, const PGresult res)`
`643`	`643`	`idx=atoi(arg)-1;`
`644`	`644`	`if (idx<0\|\|idx >=PQnfields(res))`
`645`	`645`	`{`
`646`		`-psql_error("\\crosstabview: invalid column number: \"%s\"\n",arg);`
	`646`	`+psql_error("\\crosstabview: column number %d is out of range 1..%d\n",`
	`647`	`+idx+1,PQnfields(res));`
`647`	`648`	`return-1;`
`648`	`649`	`}`
`649`	`650`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ SELECT 1 as "22", 2 as b, 3 as "Foo"`
`188`	`188`	`-- error: bad column number`
`189`	`189`	`SELECT v,h,i,c FROM ctv_data`
`190`	`190`	`\crosstabview 2 1 5`
`191`		`-\crosstabview:invalidcolumn number: "5"`
	`191`	`+\crosstabview: column number 5 is out of range 1..4`
`192`	`192`	`-- error: same H and V columns`
`193`	`193`	`SELECT v,h,i,c FROM ctv_data`
`194`	`194`	`\crosstabview 2 h 4`

Comments

(0)