diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2024-01-03 21:02:49 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2024-01-03 21:02:49 +0100 |
| commit | 0958f8f6bf60639a1d22d78d5b49a6092b11833d (patch) | |
| tree | c9a83ecaaf3df63bc8a787cf280c9895e12b3776 /src/backend/utils/adt/jsonpath_gram.y | |
| parent | 76ba8a8b631454ad06b6d4dd186ef2a739f0f7ce (diff) | |
Revert "Reorganise jsonpath operators and methods"
This reverts commit 283a95da923605c1cc148155db2d865d0801b419.
The reordering of JsonPathItemType affects the binary on-disk
compatibility of the jsonpath type, so we must not change it. Revert
for now and consider.
Diffstat (limited to 'src/backend/utils/adt/jsonpath_gram.y')
| -rw-r--r-- | src/backend/utils/adt/jsonpath_gram.y | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/backend/utils/adt/jsonpath_gram.y b/src/backend/utils/adt/jsonpath_gram.y index 4233eedc1b4..adc259d5bf8 100644 --- a/src/backend/utils/adt/jsonpath_gram.y +++ b/src/backend/utils/adt/jsonpath_gram.y @@ -80,7 +80,7 @@ static bool makeItemLikeRegex(JsonPathParseItem *expr, %token <str> OR_P AND_P NOT_P %token <str> LESS_P LESSEQUAL_P EQUAL_P NOTEQUAL_P GREATEREQUAL_P GREATER_P %token <str> ANY_P STRICT_P LAX_P LAST_P STARTS_P WITH_P LIKE_REGEX_P FLAG_P -%token <str> TYPE_P SIZE_P DOUBLE_P ABS_P CEILING_P FLOOR_P KEYVALUE_P +%token <str> ABS_P SIZE_P TYPE_P FLOOR_P DOUBLE_P CEILING_P KEYVALUE_P %token <str> DATETIME_P %type <result> result @@ -206,10 +206,10 @@ accessor_expr: expr: accessor_expr { $$ = makeItemList($1); } | '(' expr ')' { $$ = $2; } - | expr '+' expr { $$ = makeItemBinary(jpiAdd, $1, $3); } | '+' expr %prec UMINUS { $$ = makeItemUnary(jpiPlus, $2); } - | expr '-' expr { $$ = makeItemBinary(jpiSub, $1, $3); } | '-' expr %prec UMINUS { $$ = makeItemUnary(jpiMinus, $2); } + | expr '+' expr { $$ = makeItemBinary(jpiAdd, $1, $3); } + | expr '-' expr { $$ = makeItemBinary(jpiSub, $1, $3); } | expr '*' expr { $$ = makeItemBinary(jpiMul, $1, $3); } | expr '/' expr { $$ = makeItemBinary(jpiDiv, $1, $3); } | expr '%' expr { $$ = makeItemBinary(jpiMod, $1, $3); } @@ -278,28 +278,28 @@ key_name: | EXISTS_P | STRICT_P | LAX_P - | LAST_P - | FLAG_P - | TYPE_P + | ABS_P | SIZE_P + | TYPE_P + | FLOOR_P | DOUBLE_P - | ABS_P | CEILING_P - | FLOOR_P | DATETIME_P | KEYVALUE_P + | LAST_P | STARTS_P | WITH_P | LIKE_REGEX_P + | FLAG_P ; method: - TYPE_P { $$ = jpiType; } + ABS_P { $$ = jpiAbs; } | SIZE_P { $$ = jpiSize; } + | TYPE_P { $$ = jpiType; } + | FLOOR_P { $$ = jpiFloor; } | DOUBLE_P { $$ = jpiDouble; } - | ABS_P { $$ = jpiAbs; } | CEILING_P { $$ = jpiCeiling; } - | FLOOR_P { $$ = jpiFloor; } | KEYVALUE_P { $$ = jpiKeyValue; } ; %% |