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

DTStack · Jan 2, 2025 · ffd5aef · ffd5aef
1 parent c5da167
commit ffd5aef
Show file tree

Hide file tree

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