Improve error message about valid value for distance in phrase operator.

MasaoFujii · MasaoFujii · commit 81fa1bce2770 · 2021-08-25T11:45:15.000+09:00
The distance in phrase operator must be an integer value between zero and MAXENTRYPOS inclusive. But previously the error message about its valid value included the information about its upper limit but not lower limit (i.e., zero). This commit improves the error message so that it also includes the information about its lower limit. Back-patch to v9.6 where full-text phrase search was supported. Author: Kyotaro Horiguchi Reviewed-by: Fujii Masao Discussion: https://postgr.es/m/20210819.170315.1413060634876301811.horikyota.ntt@gmail.com
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
@@ -197,7 +197,7 @@ parse_phrase_operator(TSQueryParserState pstate, int16 *distance)
 				else if (errno == ERANGE || l < 0 || l > MAXENTRYPOS)
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-							 errmsg("distance in phrase operator should not be greater than %d",
+							 errmsg("distance in phrase operator must be an integer value between zero and %d inclusive",
 									MAXENTRYPOS)));
 				else
 				{

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ parse_phrase_operator(TSQueryParserState pstate, int16 *distance)`
`197`	`197`	`else if (errno == ERANGE \|\| l < 0 \|\| l > MAXENTRYPOS)`
`198`	`198`	`ereport(ERROR,`
`199`	`199`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`200`		`- errmsg("distance in phrase operator should not be greater than %d",`
	`200`	`+ errmsg("distance in phrase operator must be an integer value between zero and %d inclusive",`
`201`	`201`	`MAXENTRYPOS)));`
`202`	`202`	`else`
`203`	`203`	`{`