make 'element' and 'value' synonyms, along with 'index' and 'key'

This commit is contained in:
Gavin King 2022-01-10 13:53:15 +01:00
parent e6128551b3
commit 2e8bf3d1df
1 changed files with 10 additions and 9 deletions

View File

@ -421,7 +421,7 @@ treatedNavigablePath
* A 'value()' function that "breaks" a path expression
*/
collectionValueNavigablePath
: VALUE LEFT_PAREN path RIGHT_PAREN pathContinuation?
: (VALUE|ELEMENT) LEFT_PAREN path RIGHT_PAREN pathContinuation?
;
/**
@ -1008,10 +1008,10 @@ jpaCollectionFunction
indexAggregateFunction
: MAXINDEX LEFT_PAREN path RIGHT_PAREN
| MININDEX LEFT_PAREN path RIGHT_PAREN
| MAX LEFT_PAREN INDEX path RIGHT_PAREN
| MIN LEFT_PAREN INDEX path RIGHT_PAREN
| SUM LEFT_PAREN INDEX path RIGHT_PAREN
| AVG LEFT_PAREN ELEMENT path RIGHT_PAREN
| MAX LEFT_PAREN (INDEX|KEY) path RIGHT_PAREN
| MIN LEFT_PAREN (INDEX|KEY) path RIGHT_PAREN
| SUM LEFT_PAREN (INDEX|KEY) path RIGHT_PAREN
| AVG LEFT_PAREN (INDEX|KEY) path RIGHT_PAREN
;
/**
@ -1020,10 +1020,10 @@ indexAggregateFunction
elementAggregateFunction
: MAXELEMENT LEFT_PAREN path RIGHT_PAREN
| MINELEMENT LEFT_PAREN path RIGHT_PAREN
| MAX LEFT_PAREN ELEMENT path RIGHT_PAREN
| MIN LEFT_PAREN ELEMENT path RIGHT_PAREN
| SUM LEFT_PAREN ELEMENT path RIGHT_PAREN
| AVG LEFT_PAREN ELEMENT path RIGHT_PAREN
| MAX LEFT_PAREN (ELEMENT|VALUE) path RIGHT_PAREN
| MIN LEFT_PAREN (ELEMENT|VALUE) path RIGHT_PAREN
| SUM LEFT_PAREN (ELEMENT|VALUE) path RIGHT_PAREN
| AVG LEFT_PAREN (ELEMENT|VALUE) path RIGHT_PAREN
;
/**
@ -1400,6 +1400,7 @@ identifier
| DELETE
| DESC
| DISTINCT
| ELEMENT
| ELEMENTS
| ELSE
| EMPTY