feat: #445 support CTE entity collection

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-sql-parser",
-  "version": "4.5.1",
+  "version": "4.5.2-beta.0",
   "authors": "DTStack Corporation",
   "description": "SQL Parsers for BigData, built with antlr4",
   "keywords": [

src/grammar/generic/GenericSql.g4

@@ -56,7 +56,11 @@ withClause
     ;
 
 namedQuery
-    : name=identifier KW_AS '(' queryStatement ')'
+    : name=identifier cteColumnList? KW_AS '(' queryStatement ')'
+    ;
+
+cteColumnList
+    : '(' identifier (',' identifier)* ')'
     ;
 
 queryNoWith
@@ -82,7 +86,7 @@ setQuantifier
     ;
 
 selectItem
-    : expression (KW_AS? identifier)?
+    : expression (KW_AS? alias=identifier)?
     | qualifiedName '.' ASTERISK
     | ASTERISK
     ;
@@ -105,7 +109,7 @@ joinType
     ;
 
 aliasedRelation
-    : relationPrimary (KW_AS? identifier)?
+    : relationPrimary (KW_AS? alias=identifier)?
     ;
 
 relationPrimary

src/grammar/mysql/MySqlParser.g4

@@ -1122,7 +1122,7 @@ joinPart
     ;
 
 joinSpec
-    : (KW_ON (expression | columnNamePathAllowEmpty))
+    : (KW_ON ( expression | columnNamePathAllowEmpty (EQUAL_SYMBOL columnNamePathAllowEmpty)?))
     | KW_USING '(' columnNames ')'
     ;
 

src/grammar/postgresql/PostgreSqlParser.g4

@@ -2128,12 +2128,12 @@ tableRef
         | OPEN_PAREN tableRef (
             KW_CROSS KW_JOIN tableRef
             | KW_NATURAL joinType? KW_JOIN tableRef
-            | joinType? KW_JOIN tableRef joinQual
+            | joinType? KW_JOIN tableRef joinCondition
         )? CLOSE_PAREN aliasClause?
     ) (
         KW_CROSS KW_JOIN tableRef
         | KW_NATURAL joinType? KW_JOIN tableRef
-        | joinType? KW_JOIN tableRef joinQual
+        | joinType? KW_JOIN tableRef joinCondition
     )*
     ;
 
@@ -2156,9 +2156,20 @@ joinType
     : (KW_FULL | KW_LEFT | KW_RIGHT | KW_INNER) KW_OUTER?
     ;
 
+// A finished JOIN needs ON or USING. The empty alternative is only for a
+// caret sitting after the joined table, so validation still rejects `JOIN b`.
+joinCondition
+    : joinQual
+    | {this.caretTokenIndex >= 0 && this.shouldMatchEmpty()}? emptyColumn
+    ;
+
 joinQual
     : KW_USING optColumnList
-    | KW_ON expression
+    | KW_ON (
+        expression
+        | columnNamePath (EQUAL columnNamePath)?
+        | {this.shouldMatchEmpty()}? emptyColumn
+    )
     ;
 
 relationExpr

src/grammar/trino/TrinoSql.g4

@@ -639,6 +639,7 @@ primaryExpression
     | value=primaryExpression '[' index=valueExpression ']'                                               # subscript
     | columnName                                                                                          # columnReference
     | base=primaryExpression '.' fieldName=identifier                                                     # dereference
+    | base=primaryExpression '.' {this.caretTokenIndex >= 0 && this.shouldMatchEmpty()}? emptyColumn      # dereference
     | name=KW_CURRENT_DATE                                                                                # currentDate
     | name=KW_CURRENT_TIME ('(' precision=INTEGER_VALUE ')')?                                             # currentTime
     | name=KW_CURRENT_TIMESTAMP ('(' precision=INTEGER_VALUE ')')?                                        # currentTimestamp

src/lib/generic/GenericSqlListener.ts

@@ -21,6 +21,7 @@ import { DropTableContext } from "./GenericSqlParser.js";
 import { QueryStatementContext } from "./GenericSqlParser.js";
 import { WithClauseContext } from "./GenericSqlParser.js";
 import { NamedQueryContext } from "./GenericSqlParser.js";
+import { CteColumnListContext } from "./GenericSqlParser.js";
 import { QueryNoWithContext } from "./GenericSqlParser.js";
 import { QueryTermContext } from "./GenericSqlParser.js";
 import { QueryPrimaryContext } from "./GenericSqlParser.js";
@@ -249,6 +250,16 @@ export class GenericSqlListener implements ParseTreeListener {
      * @param ctx the parse tree
      */
     exitNamedQuery?: (ctx: NamedQueryContext) => void;
+    /**
+     * Enter a parse tree produced by `GenericSqlParser.cteColumnList`.
+     * @param ctx the parse tree
+     */
+    enterCteColumnList?: (ctx: CteColumnListContext) => void;
+    /**
+     * Exit a parse tree produced by `GenericSqlParser.cteColumnList`.
+     * @param ctx the parse tree
+     */
+    exitCteColumnList?: (ctx: CteColumnListContext) => void;
     /**
      * Enter a parse tree produced by `GenericSqlParser.queryNoWith`.
      * @param ctx the parse tree