@@ -1752,7 +1752,7 @@ The following tokens are allowed as Names for Schema, Table, Column and Aliases
17521752String RelObjectNameWithoutValue() :
17531753{ Token tk = null; }
17541754{
1755- ( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> | tk=<K_TIME_KEY_EXPR>
1755+ ( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> | tk=<K_TIME_KEY_EXPR>
17561756 | tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="BEGIN" | tk="BINARY" | tk="BIT" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONFLICT" | tk="CONVERT" | tk="COSTS" | tk="CS" | tk="CYCLE" | tk="DATABASE" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GLOBAL" | tk="GRANT" | tk="GUARD" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MERGE" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERLAPS" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGISTER" | tk="RENAME" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RLIKE" | tk="ROLLBACK" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRING" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TO" | tk="TRUE" | tk="TRUNCATE" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLTEXT" | tk="YAML" | tk="YES" | tk="ZONE" )
17571757 { return tk.image; }
17581758}
@@ -4049,7 +4049,7 @@ JsonExpression JsonExpression() : {
40494049 |
40504050 LOOKAHEAD(FullTextSearch(), {!interrupted}) expr = FullTextSearch()
40514051 |
4052- LOOKAHEAD( 3 , {!interrupted && getAsBoolean(Feature.allowComplexParsing) } ) expr=SimpleFunction ()
4052+ LOOKAHEAD( 3 , {!interrupted && getAsBoolean(Feature.allowComplexParsing) } ) expr=Function ()
40534053 |
40544054 LOOKAHEAD( 2, {!interrupted} ) expr=Column()
40554055 |
@@ -4694,9 +4694,7 @@ Function InternalFunction(Function retval) :
46944694{
46954695 List<String> funcName;
46964696 Expression allColumnsExpression = null;
4697- List<Expression> expressions = new ArrayList<Expression>();
46984697 ExpressionList expressionList = null;
4699- NamedExpressionList namedExpressionList = null;
47004698 KeepExpression keep = null;
47014699 Select expr = null;
47024700 Token tk1 = null;
@@ -4709,19 +4707,27 @@ Function InternalFunction(Function retval) :
47094707{
47104708 funcName = RelObjectNameList()
47114709
4712- "(" [ LOOKAHEAD(2) [ LOOKAHEAD(2)(<K_DISTINCT> { retval.setDistinct(true); } | <K_ALL> { retval.setAllColumns(true); } | <K_UNIQUE> { retval.setUnique(true); }) ]
4713- ( LOOKAHEAD(4)
4714- "*" { allColumnsExpression = new AllColumns(); expressionList = new ExpressionList(allColumnsExpression); }
4710+ "("
4711+ [
4712+ LOOKAHEAD(2) [
4713+ LOOKAHEAD(2) (
4714+ <K_DISTINCT> { retval.setDistinct(true); }
4715+ | <K_ALL> { retval.setAllColumns(true); }
4716+ | <K_UNIQUE> { retval.setUnique(true); }
4717+ )
4718+ ]
4719+ (
4720+ "*" { expressionList = new ExpressionList(new AllColumns()); }
47154721 |
4716- LOOKAHEAD(AllTableColumns()) allColumnsExpression=AllTableColumns() { expressionList = new ExpressionList(allColumnsExpression); }
4722+ LOOKAHEAD( AllTableColumns() ) allColumnsExpression=AllTableColumns() { expressionList = new ExpressionList(allColumnsExpression); }
47174723 |
47184724 LOOKAHEAD(3) expressionList=ExpressionList() [ orderByList = OrderByElements() { retval.setOrderByElements(orderByList); } ]
47194725 |
47204726 expr = Select() { expressionList = new ExpressionList(expr); }
4721-
4722- ) ]
4723- [ <K_IGNORE> <K_NULLS> {retval.setIgnoreNulls(true); }]
4724- ")"
4727+ )
4728+ ]
4729+ [ <K_IGNORE> <K_NULLS> {retval.setIgnoreNulls(true); }]
4730+ ")"
47254731
47264732 [ "." (
47274733 // tricky lookahead since we do need to support the following constructs
@@ -4743,47 +4749,6 @@ Function InternalFunction(Function retval) :
47434749 }
47444750}
47454751
4746- Function SimpleFunction() #SimpleFunction :
4747- {
4748- Function retval = new Function();
4749- List<String> funcName;
4750- Expression allColumnsExpression = null;
4751- ExpressionList expressionList = null;
4752- KeepExpression keep = null;
4753- List<OrderByElement> orderByList;
4754- boolean ignoreNulls = false;
4755- }
4756- {
4757- funcName = RelObjectNameList()
4758-
4759- "("
4760- [
4761- LOOKAHEAD(2)
4762- [
4763- LOOKAHEAD(2)(<K_DISTINCT> { retval.setDistinct(true); }
4764- | <K_ALL> { retval.setAllColumns(true); }
4765- | <K_UNIQUE> { retval.setUnique(true); })
4766- ]
4767- (
4768- LOOKAHEAD(4) "*" { allColumnsExpression = new AllColumns(); expressionList = new ExpressionList(allColumnsExpression); }
4769- |
4770- LOOKAHEAD(AllTableColumns()) allColumnsExpression=AllTableColumns() { expressionList = new ExpressionList(allColumnsExpression); }
4771- |
4772- (expressionList=ExpressionList() [ orderByList = OrderByElements() { retval.setOrderByElements(orderByList); } ])
4773- )
4774- ]
4775- [ <K_IGNORE> <K_NULLS> {retval.setIgnoreNulls(true); } ]
4776- ")"
4777-
4778- [ LOOKAHEAD(2) keep = KeepExpression() ]
4779-
4780- {
4781- retval.setParameters(expressionList);
4782- retval.setName(funcName);
4783- return retval;
4784- }
4785- }
4786-
47874752XMLSerializeExpr XMLSerializeExpr(): {
47884753 XMLSerializeExpr result;
47894754 Expression expression;
0 commit comments