From 7fd43684fc9e3f2da9c646dea04a531bd6f50cee Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Sun, 3 Jul 2022 17:08:25 -0400 Subject: [PATCH] Remove %error-verbose directive from jsonpath parser None of the other bison parsers contains this directive, and it gives rise to some unfortunate and impenetrable messages, so just remove it. Backpatch to release 12, where it was introduced. Per gripe from Erik Rijkers Discussion: https://postgr.es/m/ba069ce2-a98f-dc70-dc17-2ccf2a9bf7c7@xs4all.nl --- src/backend/utils/adt/jsonpath_gram.y | 1 - src/test/regress/expected/jsonpath.out | 34 +++++++++++++------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/backend/utils/adt/jsonpath_gram.y b/src/backend/utils/adt/jsonpath_gram.y index de3d97931e..b5cf865f3c 100644 --- a/src/backend/utils/adt/jsonpath_gram.y +++ b/src/backend/utils/adt/jsonpath_gram.y @@ -74,7 +74,6 @@ static JsonPathParseItem *makeItemLikeRegex(JsonPathParseItem *expr, %pure-parser %expect 0 %name-prefix="jsonpath_yy" -%error-verbose %parse-param {JsonPathParseResult **result} %union { diff --git a/src/test/regress/expected/jsonpath.out b/src/test/regress/expected/jsonpath.out index e399fa9631..6dab98d03a 100644 --- a/src/test/regress/expected/jsonpath.out +++ b/src/test/regress/expected/jsonpath.out @@ -569,15 +569,15 @@ select '$ ? (@.a < +1)'::jsonpath; (1 row) select '$ ? (@.a < .1)'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '$ ? (@.a < .1)'::jsonpath; ^ select '$ ? (@.a < -.1)'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '$ ? (@.a < -.1)'::jsonpath; ^ select '$ ? (@.a < +.1)'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '$ ? (@.a < +.1)'::jsonpath; ^ select '$ ? (@.a < 0.1)'::jsonpath; @@ -635,15 +635,15 @@ select '$ ? (@.a < +1e1)'::jsonpath; (1 row) select '$ ? (@.a < .1e1)'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '$ ? (@.a < .1e1)'::jsonpath; ^ select '$ ? (@.a < -.1e1)'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '$ ? (@.a < -.1e1)'::jsonpath; ^ select '$ ? (@.a < +.1e1)'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '$ ? (@.a < +.1e1)'::jsonpath; ^ select '$ ? (@.a < 0.1e1)'::jsonpath; @@ -701,15 +701,15 @@ select '$ ? (@.a < +1e-1)'::jsonpath; (1 row) select '$ ? (@.a < .1e-1)'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '$ ? (@.a < .1e-1)'::jsonpath; ^ select '$ ? (@.a < -.1e-1)'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '$ ? (@.a < -.1e-1)'::jsonpath; ^ select '$ ? (@.a < +.1e-1)'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '$ ? (@.a < +.1e-1)'::jsonpath; ^ select '$ ? (@.a < 0.1e-1)'::jsonpath; @@ -767,15 +767,15 @@ select '$ ? (@.a < +1e+1)'::jsonpath; (1 row) select '$ ? (@.a < .1e+1)'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '$ ? (@.a < .1e+1)'::jsonpath; ^ select '$ ? (@.a < -.1e+1)'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '$ ? (@.a < -.1e+1)'::jsonpath; ^ select '$ ? (@.a < +.1e+1)'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '$ ? (@.a < +.1e+1)'::jsonpath; ^ select '$ ? (@.a < 0.1e+1)'::jsonpath; @@ -821,7 +821,7 @@ select '0'::jsonpath; (1 row) select '00'::jsonpath; -ERROR: syntax error, unexpected IDENT_P at end of jsonpath input +ERROR: syntax error at end of jsonpath input LINE 1: select '00'::jsonpath; ^ select '0.0'::jsonpath; @@ -947,18 +947,18 @@ select '(1.2).e3'::jsonpath; (1 row) select '1..e'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '1..e'::jsonpath; ^ select '1..e3'::jsonpath; -ERROR: syntax error, unexpected '.' at or near "." of jsonpath input +ERROR: syntax error at or near "." of jsonpath input LINE 1: select '1..e3'::jsonpath; ^ select '(1.).e'::jsonpath; -ERROR: syntax error, unexpected ')' at or near ")" of jsonpath input +ERROR: syntax error at or near ")" of jsonpath input LINE 1: select '(1.).e'::jsonpath; ^ select '(1.).e3'::jsonpath; -ERROR: syntax error, unexpected ')' at or near ")" of jsonpath input +ERROR: syntax error at or near ")" of jsonpath input LINE 1: select '(1.).e3'::jsonpath; ^