From 2cf875a4b58d2bc2cce423b3c15fd01250966e40 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Sun, 3 Jul 2022 17:08:25 -0400 Subject: 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(-) (limited to 'src') diff --git a/src/backend/utils/adt/jsonpath_gram.y b/src/backend/utils/adt/jsonpath_gram.y index 4681f1f0d00..99a995d0b1c 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 fc971dc408e..096f325cde7 100644 --- a/src/test/regress/expected/jsonpath.out +++ b/src/test/regress/expected/jsonpath.out @@ -557,15 +557,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; @@ -623,15 +623,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; @@ -689,15 +689,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; @@ -755,15 +755,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; @@ -809,7 +809,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; @@ -935,18 +935,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; ^ -- cgit v1.2.3