diff options
author | Andrew Dunstan <andrew@dunslane.net> | 2022-07-03 17:08:25 -0400 |
---|---|---|
committer | Andrew Dunstan <andrew@dunslane.net> | 2022-07-03 17:16:58 -0400 |
commit | 03cefe81484d563a7165e8fa57a03a33d4c5c188 (patch) | |
tree | c0aae3ba0324538dd1aa07ef78fe864ecf08e704 /src | |
parent | 97b005f3fb1b32581493e0e6e7fca028d9896207 (diff) | |
download | postgresql-03cefe81484d563a7165e8fa57a03a33d4c5c188.tar.gz postgresql-03cefe81484d563a7165e8fa57a03a33d4c5c188.zip |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/backend/utils/adt/jsonpath_gram.y | 1 | ||||
-rw-r--r-- | 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 9947fedfc19..6cbf441b936 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 e399fa96312..6dab98d03a9 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; ^ |