Improve/flink keywords (#195)

* refactor: improve flinksql keywords rule * test: correct flink sql unit test
DTStack · Oct 30, 2023 · 21dcb3f · 21dcb3f
1 parent 887de81
commit 21dcb3f
Show file tree

Hide file tree

Showing 12 changed files with 11,618 additions and 9,832 deletions.
diff --git a/src/grammar/flinksql/FlinkSqlLexer.g4 b/src/grammar/flinksql/FlinkSqlLexer.g4
diff --git a/src/grammar/flinksql/FlinkSqlParser.g4 b/src/grammar/flinksql/FlinkSqlParser.g4
diff --git a/src/lib/flinksql/FlinkSqlLexer.interp b/src/lib/flinksql/FlinkSqlLexer.interp
diff --git a/src/lib/flinksql/FlinkSqlLexer.tokens b/src/lib/flinksql/FlinkSqlLexer.tokens
diff --git a/src/lib/flinksql/FlinkSqlLexer.ts b/src/lib/flinksql/FlinkSqlLexer.ts
diff --git a/src/lib/flinksql/FlinkSqlParser.interp b/src/lib/flinksql/FlinkSqlParser.interp
diff --git a/src/lib/flinksql/FlinkSqlParser.tokens b/src/lib/flinksql/FlinkSqlParser.tokens
diff --git a/src/lib/flinksql/FlinkSqlParser.ts b/src/lib/flinksql/FlinkSqlParser.ts
diff --git a/src/lib/flinksql/FlinkSqlParserListener.ts b/src/lib/flinksql/FlinkSqlParserListener.ts
@@ -25,6 +25,7 @@ import { SubscriptContext } from "./FlinkSqlParser";
 import { ColumnReferenceContext } from "./FlinkSqlParser";
 import { DereferenceContext } from "./FlinkSqlParser";
 import { ParenthesizedExpressionContext } from "./FlinkSqlParser";
+import { DateFunctionExpressionContext } from "./FlinkSqlParser";
 import { ErrorIdentContext } from "./FlinkSqlParser";
 import { RealIdentContext } from "./FlinkSqlParser";
 import { IdentityTransformContext } from "./FlinkSqlParser";
@@ -181,7 +182,6 @@ import { MultiUnitsIntervalContext } from "./FlinkSqlParser";
 import { ErrorCapturingUnitToUnitIntervalContext } from "./FlinkSqlParser";
 import { UnitToUnitIntervalContext } from "./FlinkSqlParser";
 import { IntervalValueContext } from "./FlinkSqlParser";
-import { ColumnAliasContext } from "./FlinkSqlParser";
 import { TableAliasContext } from "./FlinkSqlParser";
 import { ErrorCapturingIdentifierContext } from "./FlinkSqlParser";
 import { ErrorCapturingIdentifierExtraContext } from "./FlinkSqlParser";
@@ -222,7 +222,6 @@ import { TimePointUnitContext } from "./FlinkSqlParser";
 import { TimeIntervalUnitContext } from "./FlinkSqlParser";
 import { ReservedKeywordsUsedAsFuncParamContext } from "./FlinkSqlParser";
 import { ReservedKeywordsUsedAsFuncNameContext } from "./FlinkSqlParser";
-import { ReservedKeywordsContext } from "./FlinkSqlParser";
 import { NonReservedKeywordsContext } from "./FlinkSqlParser";
 
 
@@ -517,6 +516,19 @@ export interface FlinkSqlParserListener extends ParseTreeListener {
 	 */
 	exitParenthesizedExpression?: (ctx: ParenthesizedExpressionContext) => void;
 
+	/**
+	 * Enter a parse tree produced by the `dateFunctionExpression`
+	 * labeled alternative in `FlinkSqlParser.primaryExpression`.
+	 * @param ctx the parse tree
+	 */
+	enterDateFunctionExpression?: (ctx: DateFunctionExpressionContext) => void;
+	/**
+	 * Exit a parse tree produced by the `dateFunctionExpression`
+	 * labeled alternative in `FlinkSqlParser.primaryExpression`.
+	 * @param ctx the parse tree
+	 */
+	exitDateFunctionExpression?: (ctx: DateFunctionExpressionContext) => void;
+
 	/**
 	 * Enter a parse tree produced by the `errorIdent`
 	 * labeled alternative in `FlinkSqlParser.errorCapturingIdentifierExtra`.
@@ -2251,17 +2263,6 @@ export interface FlinkSqlParserListener extends ParseTreeListener {
 	 */
 	exitIntervalValue?: (ctx: IntervalValueContext) => void;
 
-	/**
-	 * Enter a parse tree produced by `FlinkSqlParser.columnAlias`.
-	 * @param ctx the parse tree
-	 */
-	enterColumnAlias?: (ctx: ColumnAliasContext) => void;
-	/**
-	 * Exit a parse tree produced by `FlinkSqlParser.columnAlias`.
-	 * @param ctx the parse tree
-	 */
-	exitColumnAlias?: (ctx: ColumnAliasContext) => void;
-
 	/**
 	 * Enter a parse tree produced by `FlinkSqlParser.tableAlias`.
 	 * @param ctx the parse tree
@@ -2702,17 +2703,6 @@ export interface FlinkSqlParserListener extends ParseTreeListener {
 	 */
 	exitReservedKeywordsUsedAsFuncName?: (ctx: ReservedKeywordsUsedAsFuncNameContext) => void;
 
-	/**
-	 * Enter a parse tree produced by `FlinkSqlParser.reservedKeywords`.
-	 * @param ctx the parse tree
-	 */
-	enterReservedKeywords?: (ctx: ReservedKeywordsContext) => void;
-	/**
-	 * Exit a parse tree produced by `FlinkSqlParser.reservedKeywords`.
-	 * @param ctx the parse tree
-	 */
-	exitReservedKeywords?: (ctx: ReservedKeywordsContext) => void;
-
 	/**
 	 * Enter a parse tree produced by `FlinkSqlParser.nonReservedKeywords`.
 	 * @param ctx the parse tree

diff --git a/src/lib/flinksql/FlinkSqlParserVisitor.ts b/src/lib/flinksql/FlinkSqlParserVisitor.ts
@@ -25,6 +25,7 @@ import { SubscriptContext } from "./FlinkSqlParser";
 import { ColumnReferenceContext } from "./FlinkSqlParser";
 import { DereferenceContext } from "./FlinkSqlParser";
 import { ParenthesizedExpressionContext } from "./FlinkSqlParser";
+import { DateFunctionExpressionContext } from "./FlinkSqlParser";
 import { ErrorIdentContext } from "./FlinkSqlParser";
 import { RealIdentContext } from "./FlinkSqlParser";
 import { IdentityTransformContext } from "./FlinkSqlParser";
@@ -181,7 +182,6 @@ import { MultiUnitsIntervalContext } from "./FlinkSqlParser";
 import { ErrorCapturingUnitToUnitIntervalContext } from "./FlinkSqlParser";
 import { UnitToUnitIntervalContext } from "./FlinkSqlParser";
 import { IntervalValueContext } from "./FlinkSqlParser";
-import { ColumnAliasContext } from "./FlinkSqlParser";
 import { TableAliasContext } from "./FlinkSqlParser";
 import { ErrorCapturingIdentifierContext } from "./FlinkSqlParser";
 import { ErrorCapturingIdentifierExtraContext } from "./FlinkSqlParser";
@@ -222,7 +222,6 @@ import { TimePointUnitContext } from "./FlinkSqlParser";
 import { TimeIntervalUnitContext } from "./FlinkSqlParser";
 import { ReservedKeywordsUsedAsFuncParamContext } from "./FlinkSqlParser";
 import { ReservedKeywordsUsedAsFuncNameContext } from "./FlinkSqlParser";
-import { ReservedKeywordsContext } from "./FlinkSqlParser";
 import { NonReservedKeywordsContext } from "./FlinkSqlParser";
 
 
@@ -410,6 +409,14 @@ export interface FlinkSqlParserVisitor<Result> extends ParseTreeVisitor<Result>
 	 */
 	visitParenthesizedExpression?: (ctx: ParenthesizedExpressionContext) => Result;
 
+	/**
+	 * Visit a parse tree produced by the `dateFunctionExpression`
+	 * labeled alternative in `FlinkSqlParser.primaryExpression`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitDateFunctionExpression?: (ctx: DateFunctionExpressionContext) => Result;
+
 	/**
 	 * Visit a parse tree produced by the `errorIdent`
 	 * labeled alternative in `FlinkSqlParser.errorCapturingIdentifierExtra`.
@@ -1511,13 +1518,6 @@ export interface FlinkSqlParserVisitor<Result> extends ParseTreeVisitor<Result>
 	 */
 	visitIntervalValue?: (ctx: IntervalValueContext) => Result;
 
-	/**
-	 * Visit a parse tree produced by `FlinkSqlParser.columnAlias`.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	visitColumnAlias?: (ctx: ColumnAliasContext) => Result;
-
 	/**
 	 * Visit a parse tree produced by `FlinkSqlParser.tableAlias`.
 	 * @param ctx the parse tree
@@ -1798,13 +1798,6 @@ export interface FlinkSqlParserVisitor<Result> extends ParseTreeVisitor<Result>
 	 */
 	visitReservedKeywordsUsedAsFuncName?: (ctx: ReservedKeywordsUsedAsFuncNameContext) => Result;
 
-	/**
-	 * Visit a parse tree produced by `FlinkSqlParser.reservedKeywords`.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	visitReservedKeywords?: (ctx: ReservedKeywordsContext) => Result;
-
 	/**
 	 * Visit a parse tree produced by `FlinkSqlParser.nonReservedKeywords`.
 	 * @param ctx the parse tree

diff --git a/test/parser/flinksql/suggestion/tokenSuggestion.test.ts b/test/parser/flinksql/suggestion/tokenSuggestion.test.ts
@@ -53,8 +53,8 @@ describe('Flink SQL Token Suggestion', () => {
             'CURRENT',
             'CATALOGS',
             'DATABASES',
-            'JARS',
             'VIEWS',
+            'JARS',
         ]);
     });
 });
diff --git a/test/parser/flinksql/syntax/fixtures/createTable.sql b/test/parser/flinksql/syntax/fixtures/createTable.sql
@@ -109,7 +109,7 @@ CREATE TABLE catalog1.db1.table1 (
     attr17 MAP<INT, BIGINT>,
     name1 VARCHAR(64),
     message ROW<data ROW<UPO_TIMESTAMP VARCHAR(20)>>,
-    raw RAW('class', 'snapshot')
+    `raw` RAW('class', 'snapshot')
 ) WITH ('connector' = 'kafka');
 
 CREATE TABLE IF NOT EXISTS tbl1 (