Skip to content

Commit b18c037

Browse files
committed
fix windows functions rule check error bug
1 parent b13f619 commit b18c037

15 files changed

Lines changed: 9342 additions & 8641 deletions

gen/.antlr/FlinkSQL.interp

Lines changed: 17 additions & 1 deletion
Large diffs are not rendered by default.

gen/.antlr/FlinkSQL.tokens

Lines changed: 232 additions & 224 deletions
Large diffs are not rendered by default.

gen/.antlr/FlinkSQLLexer.interp

Lines changed: 25 additions & 1 deletion
Large diffs are not rendered by default.

gen/.antlr/FlinkSQLLexer.java

Lines changed: 1767 additions & 1716 deletions
Large diffs are not rendered by default.

gen/.antlr/FlinkSQLLexer.tokens

Lines changed: 232 additions & 224 deletions
Large diffs are not rendered by default.

gen/.antlr/FlinkSQLParser.java

Lines changed: 1892 additions & 1673 deletions
Large diffs are not rendered by default.

gen/FlinkSQL.g4

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ projectItemDefinition
425425
;
426426

427427
overWindowItem
428-
: primaryExpression KW_OVER windowSpec KW_AS identifier
429-
| primaryExpression KW_OVER errorCapturingIdentifier KW_AS identifier
428+
: primaryExpression KW_OVER windowSpec KW_AS? identifier
429+
| primaryExpression KW_OVER errorCapturingIdentifier KW_AS? identifier
430430
;
431431

432432
fromClause
@@ -1050,19 +1050,25 @@ reservedKeywordsUsedAsFuncName
10501050
| KW_COLLECT
10511051
| KW_COUNT
10521052
| KW_DATE
1053+
| KW_FIRST_VALUE
10531054
| KW_GROUPING
10541055
| KW_HOUR
10551056
| KW_IF
1057+
| KW_LEAD
10561058
| KW_LAG
1059+
| KW_LAST_VALUE
10571060
| KW_LEFT
1061+
| KW_NTILE
10581062
| KW_MAP
10591063
| KW_MINUTE
10601064
| KW_MONTH
10611065
| KW_OVERLAY
10621066
| KW_POSITION
1067+
| KW_PERCENT_RANK
10631068
| KW_POWER
10641069
| KW_QUARTER
10651070
| KW_RANK
1071+
| KW_ROW_NUMBER
10661072
| KW_RIGHT
10671073
| KW_SECOND
10681074
| KW_SUBSTRING
@@ -1124,6 +1130,7 @@ reservedKeywords
11241130
| KW_CREATE
11251131
| KW_CROSS
11261132
| KW_CUBE
1133+
| KW_CUME_DIST
11271134
| KW_CURRENT
11281135
| KW_CURSOR
11291136
| KW_CYCLE
@@ -1136,6 +1143,7 @@ reservedKeywords
11361143
| KW_DEFAULT
11371144
| KW_DEFINE
11381145
| KW_DELETE
1146+
| KW_DENSE_RANK
11391147
| KW_DESCRIBE
11401148
| KW_DISTINCT
11411149
| KW_DOUBLE
@@ -1152,6 +1160,7 @@ reservedKeywords
11521160
| KW_EXTRACT
11531161
| KW_FALSE
11541162
| KW_FLOAT
1163+
| KW_FIRST_VALUE
11551164
| KW_FOR
11561165
| KW_FROM
11571166
| KW_FULL
@@ -1177,9 +1186,11 @@ reservedKeywords
11771186
| KW_IS
11781187
| KW_JOIN
11791188
| KW_LAG
1189+
| KW_LAST_VALUE
11801190
| KW_LANGUAGE
11811191
| KW_LATERAL
11821192
| KW_LEADING
1193+
| KW_LEAD
11831194
| KW_LEFT
11841195
| KW_LIKE
11851196
| KW_LIMIT
@@ -1197,6 +1208,7 @@ reservedKeywords
11971208
| KW_MULTISET
11981209
| KW_NATURAL
11991210
| KW_NEXT
1211+
| KW_NTILE
12001212
| KW_NO
12011213
| KW_NONE
12021214
| KW_NOT
@@ -1216,11 +1228,13 @@ reservedKeywords
12161228
| KW_PATTERN
12171229
| KW_PER
12181230
| KW_PERCENT
1231+
| KW_PERCENT_RANK
12191232
| KW_PERIOD
12201233
| KW_POSITION
12211234
| KW_PRIMARY
12221235
| KW_RANGE
12231236
| KW_RANK
1237+
| KW_ROW_NUMBER
12241238
| KW_RESET
12251239
| KW_REVOKE
12261240
| KW_RIGHT
@@ -1692,6 +1706,7 @@ KW_COUNT: C O U N T;
16921706
KW_CREATE: C R E A T E;
16931707
KW_CROSS: C R O S S;
16941708
KW_CUBE: C U B E;
1709+
KW_CUME_DIST: C U M E'_'D I S T;
16951710
KW_CURRENT: C U R R E N T;
16961711
KW_CURSOR: C U R S O R;
16971712
KW_CYCLE: C Y C L E;
@@ -1705,6 +1720,7 @@ KW_DEFAULT: D E F A U L T;
17051720
KW_DEFINE: D E F I N E;
17061721
KW_DELETE: D E L E T E;
17071722
KW_DESCRIBE: D E S C R I B E;
1723+
KW_DENSE_RANK: D E N S E'_'R A N K;
17081724
KW_DISTINCT: D I S T I N C T;
17091725
KW_DOUBLE: D O U B L E;
17101726
KW_DROP: D R O P;
@@ -1719,6 +1735,7 @@ KW_EXISTS: E X I S T S;
17191735
KW_EXPLAIN: E X P L A I N;
17201736
KW_EXTERNAL: E X T E R N A L;
17211737
KW_EXTRACT: E X T R A C T;
1738+
KW_FIRST_VALUE: F I R S T'_'V A L U E;
17221739
KW_FALSE: F A L S E ;
17231740
KW_FLOAT: F L O A T;
17241741
KW_FOR: F O R;
@@ -1748,6 +1765,8 @@ KW_JOIN: J O I N;
17481765
KW_LAG: L A G;
17491766
KW_LANGUAGE: L A N G U A G E;
17501767
KW_LATERAL: L A T E R A L;
1768+
KW_LAST_VALUE: L A S T'_'V A L U E;
1769+
KW_LEAD: L E A D;
17511770
KW_LEADING: L E A D I N G;
17521771
KW_LEFT: L E F T;
17531772
KW_LIKE: L I K E;
@@ -1769,6 +1788,7 @@ KW_NEXT: N E X T ;
17691788
KW_NO: N O;
17701789
KW_NONE: N O N E;
17711790
KW_NOT: N O T;
1791+
KW_NTILE: N T I L E;
17721792
KW_NULL: N U L L;
17731793
KW_NUMERIC: N U M E R I C;
17741794
KW_OF: O F;
@@ -1785,11 +1805,13 @@ KW_PARTITION: P A R T I T I O N;
17851805
KW_PATTERN: P A T T E R N;
17861806
KW_PER: P E R;
17871807
KW_PERCENT: P E R C E N T;
1808+
KW_PERCENT_RANK: P E R C E N T'_'R A N K;
17881809
KW_PERIOD: P E R I O D;
17891810
KW_POSITION: P O S I T I O N;
17901811
KW_POWER: P O W E R;
17911812
KW_PRIMARY: P R I M A R Y;
17921813
KW_RANGE: R A N G E;
1814+
KW_ROW_NUMBER: R O W'_'N U M B E R;
17931815
KW_RANK: R A N K;
17941816
KW_RESET: R E S E T;
17951817
KW_REVOKE: R E V O K E;

gen/FlinkSQL.interp

Lines changed: 17 additions & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)