psql: Improve \crosstabview error messages

petere · petere · commit bd406af16841 · 2016-06-24T01:08:08.000-04:00
diff --git a/src/bin/psql/crosstabview.c b/src/bin/psql/crosstabview.c
@@ -122,7 +122,7 @@ PrintResultsInCrosstab(const PGresult *res)
 
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		psql_error("\\crosstabview: query must return results to be shown in crosstab\n");
+		psql_error("\\crosstabview: statement did not return a result set\n");
 		goto error_return;
 	}
 
@@ -643,7 +643,8 @@ indexOfColumn(char *arg, const PGresult *res)
 		idx = atoi(arg) - 1;
 		if (idx < 0 || idx >= PQnfields(res))
 		{
-			psql_error("\\crosstabview: invalid column number: \"%s\"\n", arg);
+			psql_error("\\crosstabview: column number %d is out of range 1..%d\n",
+					   idx + 1, PQnfields(res));
 			return -1;
 		}
 	}
diff --git a/src/test/regress/expected/psql_crosstab.out b/src/test/regress/expected/psql_crosstab.out
@@ -188,7 +188,7 @@ SELECT 1 as "22", 2 as b, 3 as "Foo"
 -- error: bad column number
 SELECT v,h,i,c FROM ctv_data
  \crosstabview 2 1 5
-\crosstabview: invalid column number: "5"
+\crosstabview: column number 5 is out of range 1..4
 -- error: same H and V columns
 SELECT v,h,i,c FROM ctv_data
  \crosstabview 2 h 4

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 must return results to be shown in crosstab\n");`
	`125`	`+ psql_error("\\crosstabview: statement did not return a result set\n");`
`126`	`126`	`goto error_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`	`}`