@@ -183,6 +183,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
183
183
| <K_CONNECT:"CONNECT">
184
184
| <K_CONNECT_BY_ROOT: "CONNECT_BY_ROOT">
185
185
| <K_CONSTRAINT:"CONSTRAINT">
186
+ | <K_CONSTRAINTS:"CONSTRAINTS">
186
187
| <K_CONVERT:"CONVERT">
187
188
| <K_COSTS: "COSTS">
188
189
| <K_CREATE:"CREATE">
@@ -250,6 +251,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
250
251
| <K_GROUP_CONCAT:"GROUP_CONCAT">
251
252
| <K_GUARD:"GUARD">
252
253
| <K_HAVING:"HAVING">
254
+ | <K_HASH:"HASH">
253
255
| <K_HIGH_PRIORITY : "HIGH_PRIORITY">
254
256
| <K_HISTORY : "HISTORY">
255
257
| <K_HOPPING:"HOPPING">
@@ -270,6 +272,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
270
272
| <K_INTERSECT:"INTERSECT">
271
273
| <K_INTERVAL:"INTERVAL">
272
274
| <K_INTO:"INTO">
275
+ | <K_INVALIDATE:"INVALIDATE">
273
276
| <K_IS:"IS">
274
277
| <K_ISNULL:"ISNULL">
275
278
| <K_JOIN:"JOIN">
@@ -292,6 +295,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
292
295
| <K_LOCKED:"LOCKED">
293
296
| <K_LINK:"LINK">
294
297
| <K_LOG:"LOG">
298
+ | <K_LOOP:"LOOP">
295
299
| <K_LOW_PRIORITY : "LOW_PRIORITY">
296
300
| <K_MATCH: "MATCH">
297
301
| <K_MATCHED: "MATCHED">
@@ -363,6 +367,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
363
367
| <K_REGEXP: "REGEXP">
364
368
| <K_RLIKE: "RLIKE">
365
369
| <K_REGISTER: "REGISTER">
370
+ | <K_REMOTE: "REMOTE">
366
371
| <K_RENAME:"RENAME">
367
372
| <K_REPEATABLE: "REPEATABLE">
368
373
| <K_REPLACE:"REPLACE">
@@ -372,6 +377,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
372
377
| <K_RESUME: "RESUME">
373
378
| <K_RESTRICT: "RESTRICT">
374
379
| <K_RESTRICTED: "RESTRICTED">
380
+ | <K_RETURN: "RETURN">
375
381
| <K_RETURNING: "RETURNING">
376
382
| <K_RIGHT:"RIGHT">
377
383
| <K_ROLLBACK:"ROLLBACK">
@@ -1263,7 +1269,7 @@ ReturningClause ReturningClause():
1263
1269
List<Object> dataItems = null;
1264
1270
}
1265
1271
{
1266
- ( keyword=<K_RETURNING> | keyword="RETURN" )
1272
+ ( keyword=<K_RETURNING> | keyword=<K_RETURN> )
1267
1273
selectItems = SelectItemsList()
1268
1274
1269
1275
[
@@ -1752,8 +1758,8 @@ The following tokens are allowed as Names for Schema, Table, Column and Aliases
1752
1758
String RelObjectNameWithoutValue() :
1753
1759
{ Token tk = null; }
1754
1760
{
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>
1756
- | 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="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | 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="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | 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="INTERPRET" | 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="MEMBER" | 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="NOTNULL" | 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="RAW" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGISTER" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RLIKE" | tk="ROLLBACK" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEED" | 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="TRIGGER" | 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="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
1761
+ ( 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>
1762
+ | 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="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | 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="CONSTRAINTS" | 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="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | 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="HASH" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOCKED" | tk="LOG" | tk="LOOP" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MEMBER" | 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="NOTNULL" | 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="RAW" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEED" | 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="TRIGGER" | 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="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
1757
1763
{ return tk.image; }
1758
1764
}
1759
1765
@@ -2704,6 +2710,24 @@ List<Join> JoinsList():
2704
2710
}
2705
2711
}
2706
2712
2713
+ JoinHint JoinHint():
2714
+ {
2715
+ Token token;
2716
+ }
2717
+ {
2718
+ (
2719
+ token = <K_LOOP>
2720
+ |
2721
+ token = <K_HASH>
2722
+ |
2723
+ token = <K_MERGE>
2724
+ |
2725
+ token = <K_REMOTE>
2726
+ )
2727
+ {
2728
+ return new JoinHint(token.image);
2729
+ }
2730
+ }
2707
2731
2708
2732
Join JoinerExpression() #JoinerExpression:
2709
2733
{
@@ -2713,7 +2737,7 @@ Join JoinerExpression() #JoinerExpression:
2713
2737
Column tableColumn;
2714
2738
List<Column> columns = null;
2715
2739
KSQLJoinWindow joinWindow = null;
2716
-
2740
+ JoinHint joinHint = null;
2717
2741
}
2718
2742
{
2719
2743
[ <K_GLOBAL> { join.setGlobal(true); } ]
@@ -2738,7 +2762,7 @@ Join JoinerExpression() #JoinerExpression:
2738
2762
]
2739
2763
2740
2764
(
2741
- <K_JOIN>
2765
+ ( [ joinHint=JoinHint() {join.setJoinHint(joinHint); } ] <K_JOIN> )
2742
2766
|
2743
2767
"," { join.setSimple(true); } (<K_OUTER> { join.setOuter(true); } )?
2744
2768
|
@@ -5700,7 +5724,7 @@ List<String> CreateParameter():
5700
5724
| tk=<K_TEMP> | tk=<K_TEMPORARY> | tk=<K_PARTITION> | tk=<K_BY> | tk=<K_IN>
5701
5725
| tk=<K_TYPE> | tk=<K_COMMENT> | tk=<K_USING> | tk=<K_COLLATE> | tk=<K_ASC>
5702
5726
| tk=<K_DESC> | tk=<K_TRUE> | tk=<K_FALSE> | tk=<K_PARALLEL> | tk=<K_BINARY> | tk=<K_START>
5703
- | tk=<K_TIME_KEY_EXPR> | tk=<K_RAW>
5727
+ | tk=<K_TIME_KEY_EXPR> | tk=<K_RAW> | tk=<K_HASH> | tk=<K_FIRST> | tk=<K_LAST>
5704
5728
| tk="="
5705
5729
)
5706
5730
{ param.add(tk.image); }
@@ -6513,7 +6537,7 @@ AlterSystemStatement AlterSystemStatement():
6513
6537
)
6514
6538
|
6515
6539
(
6516
- "UNQUIESCE" { operation = AlterSystemOperation.UNQUIESCE; }
6540
+ <K_UNQIESCE> { operation = AlterSystemOperation.UNQUIESCE; }
6517
6541
)
6518
6542
|
6519
6543
(
0 commit comments