fix(flink): fix flinksql syntax error about ROW and function using

DTStack · Jan 2, 2025 · 6c92b52 · 6c92b52
1 parent 64ed7e4
commit 6c92b52
Show file tree

Hide file tree

Showing 6 changed files with 2,296 additions and 2,122 deletions.
diff --git a/src/grammar/flink/FlinkSqlParser.g4 b/src/grammar/flink/FlinkSqlParser.g4
@@ -241,6 +241,7 @@ mapTypeDimension
 
 rowTypeDimension
     : LESS_SYMBOL columnName columnType (COMMA columnName columnType)* GREATER_SYMBOL
+    | LR_BRACKET columnName columnType (COMMA columnName columnType)* RR_BRACKET
     ;
 
 columnConstraint
@@ -647,7 +648,7 @@ limitClause
     ;
 
 partitionByClause
-    : KW_PARTITION KW_BY columnName (COMMA columnName)*
+    : KW_PARTITION KW_BY (columnName | primaryExpression) (COMMA (columnName | primaryExpression))*
     ;
 
 quantifiers
@@ -1216,4 +1217,4 @@ nonReservedKeywords
     | KW_WEEK
     | KW_YEARS
     | KW_ZONE
-    ;
+    ;
diff --git a/src/lib/flink/FlinkSqlParser.interp b/src/lib/flink/FlinkSqlParser.interp