Skip to content

Commit 56c410e

Browse files
liuxy0551HaydenOrz
liuxy0551
authored and
HaydenOrz
committed
fix: DTStack#197 keyword rename like value more
1 parent fc4fdbf commit 56c410e

File tree

8 files changed

+47
-47
lines changed

8 files changed

+47
-47
lines changed

‎src/grammar/spark/SparkSqlLexer.g4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ KW_HAVING: 'HAVING';
180180
KW_BINARY_HEX: 'X';
181181
KW_HOUR: 'HOUR';
182182
KW_HOURS: 'HOURS';
183-
KW_IDENTIFIER_KW: 'IDENTIFIER';
183+
KW_IDENTIFIER: 'IDENTIFIER';
184184
KW_IF: 'IF';
185185
KW_IGNORE: 'IGNORE';
186186
KW_IMPORT: 'IMPORT';
@@ -309,7 +309,7 @@ KW_SERDE: 'SERDE';
309309
KW_SERDEPROPERTIES: 'SERDEPROPERTIES';
310310
KW_SESSION_USER: 'SESSION_USER';
311311
KW_SET: 'SET';
312-
KW_SETMINUS: 'MINUS';
312+
KW_MINUS: 'MINUS';
313313
KW_SETS: 'SETS';
314314
KW_SHORT: 'SHORT';
315315
KW_SHOW: 'SHOW';

‎src/grammar/spark/SparkSqlParser.g4‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ viewNameCreate : viewIdentifier;
450450
viewName : viewIdentifier;
451451

452452
identifierReference
453-
: KW_IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN
453+
: KW_IDENTIFIER LEFT_PAREN expression RIGHT_PAREN
454454
| multipartIdentifier
455455
;
456456

@@ -471,11 +471,11 @@ multiInsertQueryBody
471471
queryTerm
472472
: queryPrimary
473473
| left=queryTerm {this.legacy_setops_precedence_enabled}?
474-
operator=(KW_INTERSECT | KW_UNION | KW_EXCEPT | KW_SETMINUS) setQuantifier? right=queryTerm
474+
operator=(KW_INTERSECT | KW_UNION | KW_EXCEPT | KW_MINUS) setQuantifier? right=queryTerm
475475
| left=queryTerm {!this.legacy_setops_precedence_enabled}?
476476
operator=KW_INTERSECT setQuantifier? right=queryTerm
477477
| left=queryTerm {!this.legacy_setops_precedence_enabled}?
478-
operator=(KW_UNION | KW_EXCEPT | KW_SETMINUS) setQuantifier? right=queryTerm
478+
operator=(KW_UNION | KW_EXCEPT | KW_MINUS) setQuantifier? right=queryTerm
479479
;
480480

481481
queryPrimary
@@ -968,7 +968,7 @@ primaryExpression
968968
| qualifiedName DOT ASTERISK
969969
| LEFT_PAREN namedExpression (COMMA namedExpression)+ RIGHT_PAREN
970970
| LEFT_PAREN query RIGHT_PAREN
971-
| KW_IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN
971+
| KW_IDENTIFIER LEFT_PAREN expression RIGHT_PAREN
972972
| functionName LEFT_PAREN (setQuantifier? functionArgument
973973
(COMMA functionArgument)*)? RIGHT_PAREN
974974
(KW_FILTER LEFT_PAREN KW_WHERE where=booleanExpression RIGHT_PAREN)?
@@ -1200,7 +1200,7 @@ qualifiedNameList
12001200
;
12011201

12021202
functionName
1203-
: KW_IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN
1203+
: KW_IDENTIFIER LEFT_PAREN expression RIGHT_PAREN
12041204
| qualifiedName
12051205
| KW_FILTER
12061206
| KW_LEFT
@@ -1391,7 +1391,7 @@ ansiNonReserved
13911391
| KW_GROUPING
13921392
| KW_HOUR
13931393
| KW_HOURS
1394-
| KW_IDENTIFIER_KW
1394+
| KW_IDENTIFIER
13951395
| KW_IF
13961396
| KW_IGNORE
13971397
| KW_IMPORT
@@ -1494,7 +1494,7 @@ ansiNonReserved
14941494
| KW_SERDE
14951495
| KW_SERDEPROPERTIES
14961496
| KW_SET
1497-
| KW_SETMINUS
1497+
| KW_MINUS
14981498
| KW_SETS
14991499
| KW_SHORT
15001500
| KW_SHOW
@@ -1586,7 +1586,7 @@ strictNonReserved
15861586
| KW_ON
15871587
| KW_RIGHT
15881588
| KW_SEMI
1589-
| KW_SETMINUS
1589+
| KW_MINUS
15901590
| KW_UNION
15911591
| KW_USING
15921592
;
@@ -1715,7 +1715,7 @@ nonReserved
17151715
| KW_HAVING
17161716
| KW_HOUR
17171717
| KW_HOURS
1718-
| KW_IDENTIFIER_KW
1718+
| KW_IDENTIFIER
17191719
| KW_IF
17201720
| KW_IGNORE
17211721
| KW_IMPORT

‎src/lib/spark/SparkSqlLexer.interp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ KW_HAVING
521521
KW_BINARY_HEX
522522
KW_HOUR
523523
KW_HOURS
524-
KW_IDENTIFIER_KW
524+
KW_IDENTIFIER
525525
KW_IF
526526
KW_IGNORE
527527
KW_IMPORT
@@ -650,7 +650,7 @@ KW_SERDE
650650
KW_SERDEPROPERTIES
651651
KW_SESSION_USER
652652
KW_SET
653-
KW_SETMINUS
653+
KW_MINUS
654654
KW_SETS
655655
KW_SHORT
656656
KW_SHOW
@@ -908,7 +908,7 @@ KW_HAVING
908908
KW_BINARY_HEX
909909
KW_HOUR
910910
KW_HOURS
911-
KW_IDENTIFIER_KW
911+
KW_IDENTIFIER
912912
KW_IF
913913
KW_IGNORE
914914
KW_IMPORT
@@ -1037,7 +1037,7 @@ KW_SERDE
10371037
KW_SERDEPROPERTIES
10381038
KW_SESSION_USER
10391039
KW_SET
1040-
KW_SETMINUS
1040+
KW_MINUS
10411041
KW_SETS
10421042
KW_SHORT
10431043
KW_SHOW

‎src/lib/spark/SparkSqlLexer.tokens‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ KW_HAVING=130
131131
KW_BINARY_HEX=131
132132
KW_HOUR=132
133133
KW_HOURS=133
134-
KW_IDENTIFIER_KW=134
134+
KW_IDENTIFIER=134
135135
KW_IF=135
136136
KW_IGNORE=136
137137
KW_IMPORT=137
@@ -260,7 +260,7 @@ KW_SERDE=259
260260
KW_SERDEPROPERTIES=260
261261
KW_SESSION_USER=261
262262
KW_SET=262
263-
KW_SETMINUS=263
263+
KW_MINUS=263
264264
KW_SETS=264
265265
KW_SHORT=265
266266
KW_SHOW=266

‎src/lib/spark/SparkSqlLexer.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export class SparkSqlLexer extends Lexer {
149149
public static readonly KW_BINARY_HEX = 131;
150150
public static readonly KW_HOUR = 132;
151151
public static readonly KW_HOURS = 133;
152-
public static readonly KW_IDENTIFIER_KW = 134;
152+
public static readonly KW_IDENTIFIER = 134;
153153
public static readonly KW_IF = 135;
154154
public static readonly KW_IGNORE = 136;
155155
public static readonly KW_IMPORT = 137;
@@ -278,7 +278,7 @@ export class SparkSqlLexer extends Lexer {
278278
public static readonly KW_SERDEPROPERTIES = 260;
279279
public static readonly KW_SESSION_USER = 261;
280280
public static readonly KW_SET = 262;
281-
public static readonly KW_SETMINUS = 263;
281+
public static readonly KW_MINUS = 263;
282282
public static readonly KW_SETS = 264;
283283
public static readonly KW_SHORT = 265;
284284
public static readonly KW_SHOW = 266;
@@ -436,7 +436,7 @@ export class SparkSqlLexer extends Lexer {
436436
"KW_FIRST", "KW_FLOAT", "KW_FOLLOWING", "KW_FOR", "KW_FOREIGN", "KW_FORMAT",
437437
"KW_FORMATTED", "KW_FROM", "KW_FULL", "KW_FUNCTION", "KW_FUNCTIONS", "KW_GENERATED",
438438
"KW_GLOBAL", "KW_GRANT", "KW_GROUP", "KW_GROUPING", "KW_HAVING", "KW_BINARY_HEX",
439-
"KW_HOUR", "KW_HOURS", "KW_IDENTIFIER_KW", "KW_IF", "KW_IGNORE", "KW_IMPORT",
439+
"KW_HOUR", "KW_HOURS", "KW_IDENTIFIER", "KW_IF", "KW_IGNORE", "KW_IMPORT",
440440
"KW_IN", "KW_INCLUDE", "KW_INDEX", "KW_INDEXES", "KW_INNER", "KW_INPATH",
441441
"KW_INPUTFORMAT", "KW_INSERT", "KW_INTERSECT", "KW_INTERVAL", "KW_INT",
442442
"KW_INTEGER", "KW_INTO", "KW_IS", "KW_ITEMS", "KW_JOIN", "KW_KEYS", "KW_LAST",
@@ -459,7 +459,7 @@ export class SparkSqlLexer extends Lexer {
459459
"KW_REVOKE", "KW_RIGHT", "KW_RLIKE", "KW_REGEXP", "KW_ROLE", "KW_ROLES",
460460
"KW_ROLLBACK", "KW_ROLLUP", "KW_ROW", "KW_ROWS", "KW_SECOND", "KW_SECONDS",
461461
"KW_SCHEMA", "KW_SCHEMAS", "KW_SELECT", "KW_SEMI", "KW_SEPARATED", "KW_SERDE",
462-
"KW_SERDEPROPERTIES", "KW_SESSION_USER", "KW_SET", "KW_SETMINUS", "KW_SETS",
462+
"KW_SERDEPROPERTIES", "KW_SESSION_USER", "KW_SET", "KW_MINUS", "KW_SETS",
463463
"KW_SHORT", "KW_SHOW", "KW_SINGLE", "KW_SKEWED", "KW_SMALLINT", "KW_SOME",
464464
"KW_SORT", "KW_SORTED", "KW_SOURCE", "KW_START", "KW_STATISTICS", "KW_STORED",
465465
"KW_STRATIFY", "KW_STRING", "KW_STRUCT", "KW_SUBSTR", "KW_SUBSTRING",
@@ -570,7 +570,7 @@ export class SparkSqlLexer extends Lexer {
570570
"KW_FIRST", "KW_FLOAT", "KW_FOLLOWING", "KW_FOR", "KW_FOREIGN", "KW_FORMAT",
571571
"KW_FORMATTED", "KW_FROM", "KW_FULL", "KW_FUNCTION", "KW_FUNCTIONS", "KW_GENERATED",
572572
"KW_GLOBAL", "KW_GRANT", "KW_GROUP", "KW_GROUPING", "KW_HAVING", "KW_BINARY_HEX",
573-
"KW_HOUR", "KW_HOURS", "KW_IDENTIFIER_KW", "KW_IF", "KW_IGNORE", "KW_IMPORT",
573+
"KW_HOUR", "KW_HOURS", "KW_IDENTIFIER", "KW_IF", "KW_IGNORE", "KW_IMPORT",
574574
"KW_IN", "KW_INCLUDE", "KW_INDEX", "KW_INDEXES", "KW_INNER", "KW_INPATH",
575575
"KW_INPUTFORMAT", "KW_INSERT", "KW_INTERSECT", "KW_INTERVAL", "KW_INT",
576576
"KW_INTEGER", "KW_INTO", "KW_IS", "KW_ITEMS", "KW_JOIN", "KW_KEYS", "KW_LAST",
@@ -593,7 +593,7 @@ export class SparkSqlLexer extends Lexer {
593593
"KW_REVOKE", "KW_RIGHT", "KW_RLIKE", "KW_REGEXP", "KW_ROLE", "KW_ROLES",
594594
"KW_ROLLBACK", "KW_ROLLUP", "KW_ROW", "KW_ROWS", "KW_SECOND", "KW_SECONDS",
595595
"KW_SCHEMA", "KW_SCHEMAS", "KW_SELECT", "KW_SEMI", "KW_SEPARATED", "KW_SERDE",
596-
"KW_SERDEPROPERTIES", "KW_SESSION_USER", "KW_SET", "KW_SETMINUS", "KW_SETS",
596+
"KW_SERDEPROPERTIES", "KW_SESSION_USER", "KW_SET", "KW_MINUS", "KW_SETS",
597597
"KW_SHORT", "KW_SHOW", "KW_SINGLE", "KW_SKEWED", "KW_SMALLINT", "KW_SOME",
598598
"KW_SORT", "KW_SORTED", "KW_SOURCE", "KW_START", "KW_STATISTICS", "KW_STORED",
599599
"KW_STRATIFY", "KW_STRING", "KW_STRUCT", "KW_SUBSTR", "KW_SUBSTRING",

‎src/lib/spark/SparkSqlParser.interp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ KW_HAVING
521521
KW_BINARY_HEX
522522
KW_HOUR
523523
KW_HOURS
524-
KW_IDENTIFIER_KW
524+
KW_IDENTIFIER
525525
KW_IF
526526
KW_IGNORE
527527
KW_IMPORT
@@ -650,7 +650,7 @@ KW_SERDE
650650
KW_SERDEPROPERTIES
651651
KW_SESSION_USER
652652
KW_SET
653-
KW_SETMINUS
653+
KW_MINUS
654654
KW_SETS
655655
KW_SHORT
656656
KW_SHOW

‎src/lib/spark/SparkSqlParser.tokens‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ KW_HAVING=130
131131
KW_BINARY_HEX=131
132132
KW_HOUR=132
133133
KW_HOURS=133
134-
KW_IDENTIFIER_KW=134
134+
KW_IDENTIFIER=134
135135
KW_IF=135
136136
KW_IGNORE=136
137137
KW_IMPORT=137
@@ -260,7 +260,7 @@ KW_SERDE=259
260260
KW_SERDEPROPERTIES=260
261261
KW_SESSION_USER=261
262262
KW_SET=262
263-
KW_SETMINUS=263
263+
KW_MINUS=263
264264
KW_SETS=264
265265
KW_SHORT=265
266266
KW_SHOW=266

‎src/lib/spark/SparkSqlParser.ts‎

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

0 commit comments

Comments
 (0)