oushu/lava-oushudb-dt-sql-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: #197 keyword rename like value more

Browse Source
This commit is contained in:
liuyi 2023-11-02 09:33:18 +08:00 committed by Hayden
parent fc4fdbfbf5
commit 56c410ebb1
8 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/grammar/spark/SparkSqlLexer.g4
View File

@ -180,7 +180,7 @@ KW_HAVING: 'HAVING';
KW_BINARY_HEX: 'X'; KW_BINARY_HEX: 'X';
KW_HOUR: 'HOUR'; KW_HOUR: 'HOUR';
KW_HOURS: 'HOURS'; KW_HOURS: 'HOURS';
KW_IDENTIFIER_KW: 'IDENTIFIER'; KW_IDENTIFIER: 'IDENTIFIER';
KW_IF: 'IF'; KW_IF: 'IF';
KW_IGNORE: 'IGNORE'; KW_IGNORE: 'IGNORE';
KW_IMPORT: 'IMPORT'; KW_IMPORT: 'IMPORT';
@ -309,7 +309,7 @@ KW_SERDE: 'SERDE';
KW_SERDEPROPERTIES: 'SERDEPROPERTIES'; KW_SERDEPROPERTIES: 'SERDEPROPERTIES';
KW_SESSION_USER: 'SESSION_USER'; KW_SESSION_USER: 'SESSION_USER';
KW_SET: 'SET'; KW_SET: 'SET';
KW_SETMINUS: 'MINUS'; KW_MINUS: 'MINUS';
KW_SETS: 'SETS'; KW_SETS: 'SETS';
KW_SHORT: 'SHORT'; KW_SHORT: 'SHORT';
KW_SHOW: 'SHOW'; KW_SHOW: 'SHOW';

18
src/grammar/spark/SparkSqlParser.g4
View File

@ -450,7 +450,7 @@ viewNameCreate : viewIdentifier;
viewName : viewIdentifier; viewName : viewIdentifier;
identifierReference identifierReference
: KW_IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN : KW_IDENTIFIER LEFT_PAREN expression RIGHT_PAREN
| multipartIdentifier | multipartIdentifier
; ;
@ -471,11 +471,11 @@ multiInsertQueryBody
queryTerm queryTerm
: queryPrimary : queryPrimary
| left=queryTerm {this.legacy_setops_precedence_enabled}? | left=queryTerm {this.legacy_setops_precedence_enabled}?
operator=(KW_INTERSECT | KW_UNION | KW_EXCEPT | KW_SETMINUS) setQuantifier? right=queryTerm operator=(KW_INTERSECT | KW_UNION | KW_EXCEPT | KW_MINUS) setQuantifier? right=queryTerm
| left=queryTerm {!this.legacy_setops_precedence_enabled}? | left=queryTerm {!this.legacy_setops_precedence_enabled}?
operator=KW_INTERSECT setQuantifier? right=queryTerm operator=KW_INTERSECT setQuantifier? right=queryTerm
| left=queryTerm {!this.legacy_setops_precedence_enabled}? | left=queryTerm {!this.legacy_setops_precedence_enabled}?
operator=(KW_UNION | KW_EXCEPT | KW_SETMINUS) setQuantifier? right=queryTerm operator=(KW_UNION | KW_EXCEPT | KW_MINUS) setQuantifier? right=queryTerm
; ;
queryPrimary queryPrimary
@ -968,7 +968,7 @@ primaryExpression
| qualifiedName DOT ASTERISK | qualifiedName DOT ASTERISK
| LEFT_PAREN namedExpression (COMMA namedExpression)+ RIGHT_PAREN | LEFT_PAREN namedExpression (COMMA namedExpression)+ RIGHT_PAREN
| LEFT_PAREN query RIGHT_PAREN | LEFT_PAREN query RIGHT_PAREN
| KW_IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN | KW_IDENTIFIER LEFT_PAREN expression RIGHT_PAREN
| functionName LEFT_PAREN (setQuantifier? functionArgument | functionName LEFT_PAREN (setQuantifier? functionArgument
(COMMA functionArgument)*)? RIGHT_PAREN (COMMA functionArgument)*)? RIGHT_PAREN
(KW_FILTER LEFT_PAREN KW_WHERE where=booleanExpression RIGHT_PAREN)? (KW_FILTER LEFT_PAREN KW_WHERE where=booleanExpression RIGHT_PAREN)?
@ -1200,7 +1200,7 @@ qualifiedNameList
; ;
functionName functionName
: KW_IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN : KW_IDENTIFIER LEFT_PAREN expression RIGHT_PAREN
| qualifiedName | qualifiedName
| KW_FILTER | KW_FILTER
| KW_LEFT | KW_LEFT
@ -1391,7 +1391,7 @@ ansiNonReserved
| KW_GROUPING | KW_GROUPING
| KW_HOUR | KW_HOUR
| KW_HOURS | KW_HOURS
| KW_IDENTIFIER_KW | KW_IDENTIFIER
| KW_IF | KW_IF
| KW_IGNORE | KW_IGNORE
| KW_IMPORT | KW_IMPORT
@ -1494,7 +1494,7 @@ ansiNonReserved
| KW_SERDE | KW_SERDE
| KW_SERDEPROPERTIES | KW_SERDEPROPERTIES
| KW_SET | KW_SET
| KW_SETMINUS | KW_MINUS
| KW_SETS | KW_SETS
| KW_SHORT | KW_SHORT
| KW_SHOW | KW_SHOW
@ -1586,7 +1586,7 @@ strictNonReserved
| KW_ON | KW_ON
| KW_RIGHT | KW_RIGHT
| KW_SEMI | KW_SEMI
| KW_SETMINUS | KW_MINUS
| KW_UNION | KW_UNION
| KW_USING | KW_USING
; ;
@ -1715,7 +1715,7 @@ nonReserved
| KW_HAVING | KW_HAVING
| KW_HOUR | KW_HOUR
| KW_HOURS | KW_HOURS
| KW_IDENTIFIER_KW | KW_IDENTIFIER
| KW_IF | KW_IF
| KW_IGNORE | KW_IGNORE
| KW_IMPORT | KW_IMPORT

8
src/lib/spark/SparkSqlLexer.interp
View File

@ -521,7 +521,7 @@ KW_HAVING
KW_BINARY_HEX KW_BINARY_HEX
KW_HOUR KW_HOUR
KW_HOURS KW_HOURS
KW_IDENTIFIER_KW KW_IDENTIFIER
KW_IF KW_IF
KW_IGNORE KW_IGNORE
KW_IMPORT KW_IMPORT
@ -650,7 +650,7 @@ KW_SERDE
KW_SERDEPROPERTIES KW_SERDEPROPERTIES
KW_SESSION_USER KW_SESSION_USER
KW_SET KW_SET
KW_SETMINUS KW_MINUS
KW_SETS KW_SETS
KW_SHORT KW_SHORT
KW_SHOW KW_SHOW
@ -908,7 +908,7 @@ KW_HAVING
KW_BINARY_HEX KW_BINARY_HEX
KW_HOUR KW_HOUR
KW_HOURS KW_HOURS
KW_IDENTIFIER_KW KW_IDENTIFIER
KW_IF KW_IF
KW_IGNORE KW_IGNORE
KW_IMPORT KW_IMPORT
@ -1037,7 +1037,7 @@ KW_SERDE
KW_SERDEPROPERTIES KW_SERDEPROPERTIES
KW_SESSION_USER KW_SESSION_USER
KW_SET KW_SET
KW_SETMINUS KW_MINUS
KW_SETS KW_SETS
KW_SHORT KW_SHORT
KW_SHOW KW_SHOW

4
src/lib/spark/SparkSqlLexer.tokens
View File

@ -131,7 +131,7 @@ KW_HAVING=130
KW_BINARY_HEX=131 KW_BINARY_HEX=131
KW_HOUR=132 KW_HOUR=132
KW_HOURS=133 KW_HOURS=133
KW_IDENTIFIER_KW=134 KW_IDENTIFIER=134
KW_IF=135 KW_IF=135
KW_IGNORE=136 KW_IGNORE=136
KW_IMPORT=137 KW_IMPORT=137
@ -260,7 +260,7 @@ KW_SERDE=259
KW_SERDEPROPERTIES=260 KW_SERDEPROPERTIES=260
KW_SESSION_USER=261 KW_SESSION_USER=261
KW_SET=262 KW_SET=262
KW_SETMINUS=263 KW_MINUS=263
KW_SETS=264 KW_SETS=264
KW_SHORT=265 KW_SHORT=265
KW_SHOW=266 KW_SHOW=266

12
src/lib/spark/SparkSqlLexer.ts
View File

@ -149,7 +149,7 @@ export class SparkSqlLexer extends Lexer {
public static readonly KW_BINARY_HEX = 131; public static readonly KW_BINARY_HEX = 131;
public static readonly KW_HOUR = 132; public static readonly KW_HOUR = 132;
public static readonly KW_HOURS = 133; public static readonly KW_HOURS = 133;
public static readonly KW_IDENTIFIER_KW = 134; public static readonly KW_IDENTIFIER = 134;
public static readonly KW_IF = 135; public static readonly KW_IF = 135;
public static readonly KW_IGNORE = 136; public static readonly KW_IGNORE = 136;
public static readonly KW_IMPORT = 137; public static readonly KW_IMPORT = 137;
@ -278,7 +278,7 @@ export class SparkSqlLexer extends Lexer {
public static readonly KW_SERDEPROPERTIES = 260; public static readonly KW_SERDEPROPERTIES = 260;
public static readonly KW_SESSION_USER = 261; public static readonly KW_SESSION_USER = 261;
public static readonly KW_SET = 262; public static readonly KW_SET = 262;
public static readonly KW_SETMINUS = 263; public static readonly KW_MINUS = 263;
public static readonly KW_SETS = 264; public static readonly KW_SETS = 264;
public static readonly KW_SHORT = 265; public static readonly KW_SHORT = 265;
public static readonly KW_SHOW = 266; public static readonly KW_SHOW = 266;
@ -436,7 +436,7 @@ export class SparkSqlLexer extends Lexer {
"KW_FIRST", "KW_FLOAT", "KW_FOLLOWING", "KW_FOR", "KW_FOREIGN", "KW_FORMAT", "KW_FIRST", "KW_FLOAT", "KW_FOLLOWING", "KW_FOR", "KW_FOREIGN", "KW_FORMAT",
"KW_FORMATTED", "KW_FROM", "KW_FULL", "KW_FUNCTION", "KW_FUNCTIONS", "KW_GENERATED", "KW_FORMATTED", "KW_FROM", "KW_FULL", "KW_FUNCTION", "KW_FUNCTIONS", "KW_GENERATED",
"KW_GLOBAL", "KW_GRANT", "KW_GROUP", "KW_GROUPING", "KW_HAVING", "KW_BINARY_HEX", "KW_GLOBAL", "KW_GRANT", "KW_GROUP", "KW_GROUPING", "KW_HAVING", "KW_BINARY_HEX",
"KW_HOUR", "KW_HOURS", "KW_IDENTIFIER_KW", "KW_IF", "KW_IGNORE", "KW_IMPORT", "KW_HOUR", "KW_HOURS", "KW_IDENTIFIER", "KW_IF", "KW_IGNORE", "KW_IMPORT",
"KW_IN", "KW_INCLUDE", "KW_INDEX", "KW_INDEXES", "KW_INNER", "KW_INPATH", "KW_IN", "KW_INCLUDE", "KW_INDEX", "KW_INDEXES", "KW_INNER", "KW_INPATH",
"KW_INPUTFORMAT", "KW_INSERT", "KW_INTERSECT", "KW_INTERVAL", "KW_INT", "KW_INPUTFORMAT", "KW_INSERT", "KW_INTERSECT", "KW_INTERVAL", "KW_INT",
"KW_INTEGER", "KW_INTO", "KW_IS", "KW_ITEMS", "KW_JOIN", "KW_KEYS", "KW_LAST", "KW_INTEGER", "KW_INTO", "KW_IS", "KW_ITEMS", "KW_JOIN", "KW_KEYS", "KW_LAST",
@ -459,7 +459,7 @@ export class SparkSqlLexer extends Lexer {
"KW_REVOKE", "KW_RIGHT", "KW_RLIKE", "KW_REGEXP", "KW_ROLE", "KW_ROLES", "KW_REVOKE", "KW_RIGHT", "KW_RLIKE", "KW_REGEXP", "KW_ROLE", "KW_ROLES",
"KW_ROLLBACK", "KW_ROLLUP", "KW_ROW", "KW_ROWS", "KW_SECOND", "KW_SECONDS", "KW_ROLLBACK", "KW_ROLLUP", "KW_ROW", "KW_ROWS", "KW_SECOND", "KW_SECONDS",
"KW_SCHEMA", "KW_SCHEMAS", "KW_SELECT", "KW_SEMI", "KW_SEPARATED", "KW_SERDE", "KW_SCHEMA", "KW_SCHEMAS", "KW_SELECT", "KW_SEMI", "KW_SEPARATED", "KW_SERDE",
"KW_SERDEPROPERTIES", "KW_SESSION_USER", "KW_SET", "KW_SETMINUS", "KW_SETS", "KW_SERDEPROPERTIES", "KW_SESSION_USER", "KW_SET", "KW_MINUS", "KW_SETS",
"KW_SHORT", "KW_SHOW", "KW_SINGLE", "KW_SKEWED", "KW_SMALLINT", "KW_SOME", "KW_SHORT", "KW_SHOW", "KW_SINGLE", "KW_SKEWED", "KW_SMALLINT", "KW_SOME",
"KW_SORT", "KW_SORTED", "KW_SOURCE", "KW_START", "KW_STATISTICS", "KW_STORED", "KW_SORT", "KW_SORTED", "KW_SOURCE", "KW_START", "KW_STATISTICS", "KW_STORED",
"KW_STRATIFY", "KW_STRING", "KW_STRUCT", "KW_SUBSTR", "KW_SUBSTRING", "KW_STRATIFY", "KW_STRING", "KW_STRUCT", "KW_SUBSTR", "KW_SUBSTRING",
@ -570,7 +570,7 @@ export class SparkSqlLexer extends Lexer {
"KW_FIRST", "KW_FLOAT", "KW_FOLLOWING", "KW_FOR", "KW_FOREIGN", "KW_FORMAT", "KW_FIRST", "KW_FLOAT", "KW_FOLLOWING", "KW_FOR", "KW_FOREIGN", "KW_FORMAT",
"KW_FORMATTED", "KW_FROM", "KW_FULL", "KW_FUNCTION", "KW_FUNCTIONS", "KW_GENERATED", "KW_FORMATTED", "KW_FROM", "KW_FULL", "KW_FUNCTION", "KW_FUNCTIONS", "KW_GENERATED",
"KW_GLOBAL", "KW_GRANT", "KW_GROUP", "KW_GROUPING", "KW_HAVING", "KW_BINARY_HEX", "KW_GLOBAL", "KW_GRANT", "KW_GROUP", "KW_GROUPING", "KW_HAVING", "KW_BINARY_HEX",
"KW_HOUR", "KW_HOURS", "KW_IDENTIFIER_KW", "KW_IF", "KW_IGNORE", "KW_IMPORT", "KW_HOUR", "KW_HOURS", "KW_IDENTIFIER", "KW_IF", "KW_IGNORE", "KW_IMPORT",
"KW_IN", "KW_INCLUDE", "KW_INDEX", "KW_INDEXES", "KW_INNER", "KW_INPATH", "KW_IN", "KW_INCLUDE", "KW_INDEX", "KW_INDEXES", "KW_INNER", "KW_INPATH",
"KW_INPUTFORMAT", "KW_INSERT", "KW_INTERSECT", "KW_INTERVAL", "KW_INT", "KW_INPUTFORMAT", "KW_INSERT", "KW_INTERSECT", "KW_INTERVAL", "KW_INT",
"KW_INTEGER", "KW_INTO", "KW_IS", "KW_ITEMS", "KW_JOIN", "KW_KEYS", "KW_LAST", "KW_INTEGER", "KW_INTO", "KW_IS", "KW_ITEMS", "KW_JOIN", "KW_KEYS", "KW_LAST",
@ -593,7 +593,7 @@ export class SparkSqlLexer extends Lexer {
"KW_REVOKE", "KW_RIGHT", "KW_RLIKE", "KW_REGEXP", "KW_ROLE", "KW_ROLES", "KW_REVOKE", "KW_RIGHT", "KW_RLIKE", "KW_REGEXP", "KW_ROLE", "KW_ROLES",
"KW_ROLLBACK", "KW_ROLLUP", "KW_ROW", "KW_ROWS", "KW_SECOND", "KW_SECONDS", "KW_ROLLBACK", "KW_ROLLUP", "KW_ROW", "KW_ROWS", "KW_SECOND", "KW_SECONDS",
"KW_SCHEMA", "KW_SCHEMAS", "KW_SELECT", "KW_SEMI", "KW_SEPARATED", "KW_SERDE", "KW_SCHEMA", "KW_SCHEMAS", "KW_SELECT", "KW_SEMI", "KW_SEPARATED", "KW_SERDE",
"KW_SERDEPROPERTIES", "KW_SESSION_USER", "KW_SET", "KW_SETMINUS", "KW_SETS", "KW_SERDEPROPERTIES", "KW_SESSION_USER", "KW_SET", "KW_MINUS", "KW_SETS",
"KW_SHORT", "KW_SHOW", "KW_SINGLE", "KW_SKEWED", "KW_SMALLINT", "KW_SOME", "KW_SHORT", "KW_SHOW", "KW_SINGLE", "KW_SKEWED", "KW_SMALLINT", "KW_SOME",
"KW_SORT", "KW_SORTED", "KW_SOURCE", "KW_START", "KW_STATISTICS", "KW_STORED", "KW_SORT", "KW_SORTED", "KW_SOURCE", "KW_START", "KW_STATISTICS", "KW_STORED",
"KW_STRATIFY", "KW_STRING", "KW_STRUCT", "KW_SUBSTR", "KW_SUBSTRING", "KW_STRATIFY", "KW_STRING", "KW_STRUCT", "KW_SUBSTR", "KW_SUBSTRING",

4
src/lib/spark/SparkSqlParser.interp
View File

@ -521,7 +521,7 @@ KW_HAVING
KW_BINARY_HEX KW_BINARY_HEX
KW_HOUR KW_HOUR
KW_HOURS KW_HOURS
KW_IDENTIFIER_KW KW_IDENTIFIER
KW_IF KW_IF
KW_IGNORE KW_IGNORE
KW_IMPORT KW_IMPORT
@ -650,7 +650,7 @@ KW_SERDE
KW_SERDEPROPERTIES KW_SERDEPROPERTIES
KW_SESSION_USER KW_SESSION_USER
KW_SET KW_SET
KW_SETMINUS KW_MINUS
KW_SETS KW_SETS
KW_SHORT KW_SHORT
KW_SHOW KW_SHOW

4
src/lib/spark/SparkSqlParser.tokens
View File

@ -131,7 +131,7 @@ KW_HAVING=130
KW_BINARY_HEX=131 KW_BINARY_HEX=131
KW_HOUR=132 KW_HOUR=132
KW_HOURS=133 KW_HOURS=133
KW_IDENTIFIER_KW=134 KW_IDENTIFIER=134
KW_IF=135 KW_IF=135
KW_IGNORE=136 KW_IGNORE=136
KW_IMPORT=137 KW_IMPORT=137
@ -260,7 +260,7 @@ KW_SERDE=259
KW_SERDEPROPERTIES=260 KW_SERDEPROPERTIES=260
KW_SESSION_USER=261 KW_SESSION_USER=261
KW_SET=262 KW_SET=262
KW_SETMINUS=263 KW_MINUS=263
KW_SETS=264 KW_SETS=264
KW_SHORT=265 KW_SHORT=265
KW_SHOW=266 KW_SHOW=266

40
src/lib/spark/SparkSqlParser.ts
View File

File diff suppressed because one or more lines are too long