psql: Fix exit status when query is canceled

petere · petere · commit 2598b76bf2bc · 2022-10-22T09:42:52.000+02:00
Because of a small thinko in 7844c99, psql -c would exit successfully when a query is canceled. Fix this so that it exits with a nonzero status, just like for all other errors.
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
@@ -1114,7 +1114,7 @@ SendQuery(const char *query)
 			 pset.crosstab_flag || !is_select_command(query))
 	{
 		/* Default fetch-it-all-and-print mode */
-		OK = (ExecQueryAndProcessResults(query, &elapsed_msec, &svpt_gone, false, NULL, NULL) >= 0);
+		OK = (ExecQueryAndProcessResults(query, &elapsed_msec, &svpt_gone, false, NULL, NULL) > 0);
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -1114,7 +1114,7 @@ SendQuery(const char *query)`
`1114`	`1114`	`pset.crosstab_flag \|\| !is_select_command(query))`
`1115`	`1115`	`{`
`1116`	`1116`	`/* Default fetch-it-all-and-print mode */`
`1117`		`- OK = (ExecQueryAndProcessResults(query, &elapsed_msec, &svpt_gone, false, NULL, NULL) >= 0);`
	`1117`	`+ OK = (ExecQueryAndProcessResults(query, &elapsed_msec, &svpt_gone, false, NULL, NULL) > 0);`
`1118`	`1118`	`}`
`1119`	`1119`	`else`
`1120`	`1120`	`{`