fix(impala): update impala nonReserved and keywords use as functionName (#229)
This commit is contained in:
parent
484c881583
commit
8c594cf0f2
@ -382,7 +382,7 @@ tableNamePath: identifier (DOT identifier)*;
|
|||||||
|
|
||||||
viewNamePath: identifier (DOT identifier)*;
|
viewNamePath: identifier (DOT identifier)*;
|
||||||
|
|
||||||
functionNamePath: qualifiedName;
|
functionNamePath: reservedKeywordsUsedAsFuncName | qualifiedName;
|
||||||
|
|
||||||
columnNamePath: qualifiedName;
|
columnNamePath: qualifiedName;
|
||||||
|
|
||||||
@ -861,99 +861,59 @@ number
|
|||||||
| MINUS? INTEGER_VALUE #integerLiteral
|
| MINUS? INTEGER_VALUE #integerLiteral
|
||||||
;
|
;
|
||||||
|
|
||||||
|
reservedKeywordsUsedAsFuncName
|
||||||
|
: KW_TRUNCATE
|
||||||
|
| KW_CAST
|
||||||
|
| KW_CURRENT_DATE
|
||||||
|
| KW_CURRENT_TIMESTAMP
|
||||||
|
| KW_DAY
|
||||||
|
| KW_EXTRACT
|
||||||
|
| KW_HOUR
|
||||||
|
| KW_MINUTE
|
||||||
|
| KW_MONTH
|
||||||
|
| KW_SECOND
|
||||||
|
| KW_YEAR
|
||||||
|
| KW_CASE
|
||||||
|
| KW_LEFT
|
||||||
|
| KW_REPLACE
|
||||||
|
| KW_RIGHT
|
||||||
|
| KW_SUBSTRING
|
||||||
|
| KW_USER
|
||||||
|
;
|
||||||
|
|
||||||
nonReserved
|
nonReserved
|
||||||
// IMPORTANT: this rule must only contain tokens. Nested rules are not supported. See SqlParser.exitNonReserved
|
// IMPORTANT: this rule must only contain tokens. Nested rules are not supported. See SqlParser.exitNonReserved
|
||||||
: KW_ADD
|
: KW_BERNOULLI
|
||||||
| KW_ALL
|
|
||||||
| KW_ANY
|
|
||||||
| KW_ARRAY
|
|
||||||
| KW_ASC
|
|
||||||
| KW_AT
|
|
||||||
| KW_BERNOULLI
|
|
||||||
| KW_CASCADE
|
|
||||||
| KW_COLUMN
|
|
||||||
| KW_COLUMNS
|
|
||||||
| KW_COMMENT
|
|
||||||
| KW_CURRENT
|
|
||||||
| KW_DATA
|
|
||||||
| KW_DATABASE
|
|
||||||
| KW_DATABASES
|
|
||||||
| KW_DAY
|
| KW_DAY
|
||||||
| KW_DAYS
|
| KW_DAYS
|
||||||
| KW_DESC
|
|
||||||
| KW_EXCLUDING
|
| KW_EXCLUDING
|
||||||
| KW_EXPLAIN
|
|
||||||
| KW_FILTER
|
|
||||||
| KW_FIRST
|
|
||||||
| KW_FOLLOWING
|
|
||||||
| KW_FORMAT
|
|
||||||
| KW_FUNCTIONS
|
|
||||||
| KW_GRANT
|
|
||||||
| KW_HOUR
|
| KW_HOUR
|
||||||
| KW_IF
|
|
||||||
| KW_INCLUDING
|
| KW_INCLUDING
|
||||||
| KW_INTERVAL
|
|
||||||
| KW_LAST
|
|
||||||
| KW_LATERAL
|
|
||||||
| KW_LIMIT
|
|
||||||
| KW_MAP
|
|
||||||
| KW_MINUTE
|
| KW_MINUTE
|
||||||
|
| KW_MINUTES
|
||||||
| KW_MONTH
|
| KW_MONTH
|
||||||
|
| KW_MONTHS
|
||||||
| KW_NFC
|
| KW_NFC
|
||||||
| KW_NFD
|
| KW_NFD
|
||||||
| KW_NFKC
|
| KW_NFKC
|
||||||
| KW_NFKD
|
| KW_NFKD
|
||||||
| KW_NULLS
|
|
||||||
| KW_OFFSET
|
|
||||||
| KW_OPTION
|
| KW_OPTION
|
||||||
| KW_ORDINALITY
|
| KW_ORDINALITY
|
||||||
| KW_OVER
|
|
||||||
| KW_PARTITION
|
|
||||||
| KW_PARTITIONS
|
|
||||||
| KW_PARQUET
|
|
||||||
| KW_POSITION
|
|
||||||
| KW_PRECEDING
|
|
||||||
| KW_PRIVILEGES
|
| KW_PRIVILEGES
|
||||||
| KW_PROPERTIES
|
| KW_PROPERTIES
|
||||||
| KW_RANGE
|
|
||||||
| KW_RENAME
|
|
||||||
| KW_REPEATABLE
|
|
||||||
| KW_REPLACE
|
|
||||||
| KW_RESTRICT
|
|
||||||
| KW_REVOKE
|
|
||||||
| KW_ROLE
|
|
||||||
| KW_ROLES
|
|
||||||
| KW_ROW
|
|
||||||
| KW_ROWS
|
|
||||||
| KW_SCHEMA
|
|
||||||
| KW_SCHEMAS
|
|
||||||
| KW_SECOND
|
| KW_SECOND
|
||||||
| KW_SECONDS
|
| KW_SECONDS
|
||||||
| KW_SET
|
|
||||||
| KW_SHOW
|
|
||||||
| KW_SOME
|
|
||||||
| KW_STATS
|
|
||||||
| KW_SUBSTRING
|
| KW_SUBSTRING
|
||||||
| KW_SYSTEM
|
| KW_SYSTEM
|
||||||
| KW_TABLES
|
|
||||||
| KW_TABLESAMPLE
|
|
||||||
| KW_TRUNCATE
|
|
||||||
| KW_TO
|
|
||||||
| KW_TRY_CAST
|
| KW_TRY_CAST
|
||||||
| KW_UNBOUNDED
|
|
||||||
| KW_USE
|
|
||||||
| KW_USER
|
| KW_USER
|
||||||
| KW_UNKNOWN
|
|
||||||
| KW_VIEW
|
|
||||||
| KW_VIEWS
|
| KW_VIEWS
|
||||||
| KW_YEAR
|
| KW_YEAR
|
||||||
| KW_DEFAULT
|
|
||||||
| KW_TEXTFILE
|
|
||||||
| KW_ORC
|
| KW_ORC
|
||||||
| KW_AVRO
|
| KW_CURRENT_TIMESTAMP
|
||||||
| KW_SEQUENCEFILE
|
| KW_CURRENT_USER
|
||||||
| KW_RCFILE
|
| KW_EXTRACT
|
||||||
| KW_IREGEXP
|
| KW_KEY
|
||||||
| KW_ILIKE
|
| KW_LOCALTIME
|
||||||
|
| KW_SHUTDOWN
|
||||||
;
|
;
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -258,6 +258,7 @@ import { QualifiedNameContext } from "./ImpalaSqlParser";
|
|||||||
import { PrincipalContext } from "./ImpalaSqlParser";
|
import { PrincipalContext } from "./ImpalaSqlParser";
|
||||||
import { IdentifierContext } from "./ImpalaSqlParser";
|
import { IdentifierContext } from "./ImpalaSqlParser";
|
||||||
import { NumberContext } from "./ImpalaSqlParser";
|
import { NumberContext } from "./ImpalaSqlParser";
|
||||||
|
import { ReservedKeywordsUsedAsFuncNameContext } from "./ImpalaSqlParser";
|
||||||
import { NonReservedContext } from "./ImpalaSqlParser";
|
import { NonReservedContext } from "./ImpalaSqlParser";
|
||||||
|
|
||||||
|
|
||||||
@ -3217,6 +3218,17 @@ export interface ImpalaSqlParserListener extends ParseTreeListener {
|
|||||||
*/
|
*/
|
||||||
exitNumber?: (ctx: NumberContext) => void;
|
exitNumber?: (ctx: NumberContext) => void;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enter a parse tree produced by `ImpalaSqlParser.reservedKeywordsUsedAsFuncName`.
|
||||||
|
* @param ctx the parse tree
|
||||||
|
*/
|
||||||
|
enterReservedKeywordsUsedAsFuncName?: (ctx: ReservedKeywordsUsedAsFuncNameContext) => void;
|
||||||
|
/**
|
||||||
|
* Exit a parse tree produced by `ImpalaSqlParser.reservedKeywordsUsedAsFuncName`.
|
||||||
|
* @param ctx the parse tree
|
||||||
|
*/
|
||||||
|
exitReservedKeywordsUsedAsFuncName?: (ctx: ReservedKeywordsUsedAsFuncNameContext) => void;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enter a parse tree produced by `ImpalaSqlParser.nonReserved`.
|
* Enter a parse tree produced by `ImpalaSqlParser.nonReserved`.
|
||||||
* @param ctx the parse tree
|
* @param ctx the parse tree
|
||||||
|
@ -258,6 +258,7 @@ import { QualifiedNameContext } from "./ImpalaSqlParser";
|
|||||||
import { PrincipalContext } from "./ImpalaSqlParser";
|
import { PrincipalContext } from "./ImpalaSqlParser";
|
||||||
import { IdentifierContext } from "./ImpalaSqlParser";
|
import { IdentifierContext } from "./ImpalaSqlParser";
|
||||||
import { NumberContext } from "./ImpalaSqlParser";
|
import { NumberContext } from "./ImpalaSqlParser";
|
||||||
|
import { ReservedKeywordsUsedAsFuncNameContext } from "./ImpalaSqlParser";
|
||||||
import { NonReservedContext } from "./ImpalaSqlParser";
|
import { NonReservedContext } from "./ImpalaSqlParser";
|
||||||
|
|
||||||
|
|
||||||
@ -2127,6 +2128,13 @@ export interface ImpalaSqlParserVisitor<Result> extends ParseTreeVisitor<Result>
|
|||||||
*/
|
*/
|
||||||
visitNumber?: (ctx: NumberContext) => Result;
|
visitNumber?: (ctx: NumberContext) => Result;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Visit a parse tree produced by `ImpalaSqlParser.reservedKeywordsUsedAsFuncName`.
|
||||||
|
* @param ctx the parse tree
|
||||||
|
* @return the visitor result
|
||||||
|
*/
|
||||||
|
visitReservedKeywordsUsedAsFuncName?: (ctx: ReservedKeywordsUsedAsFuncNameContext) => Result;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Visit a parse tree produced by `ImpalaSqlParser.nonReserved`.
|
* Visit a parse tree produced by `ImpalaSqlParser.nonReserved`.
|
||||||
* @param ctx the parse tree
|
* @param ctx the parse tree
|
||||||
|
@ -83,13 +83,13 @@ insert into
|
|||||||
select
|
select
|
||||||
*
|
*
|
||||||
from
|
from
|
||||||
default.tab1;
|
default1.tab1;
|
||||||
|
|
||||||
insert overwrite table parquet_table
|
insert overwrite table parquet_table
|
||||||
select
|
select
|
||||||
*
|
*
|
||||||
from
|
from
|
||||||
default.tab1
|
default1.tab1
|
||||||
limit
|
limit
|
||||||
3;
|
3;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user