DTStack · Cythia828 · Jun 11, 2026
diff --git a/src/grammar/mysql/MySqlParser.g4 b/src/grammar/mysql/MySqlParser.g4
@@ -1071,7 +1071,7 @@ orderByClause
     ;
 
 orderByExpression
-    : expression order=(KW_ASC | KW_DESC)?
+    : (expression | columnNamePathAllowEmpty) order=(KW_ASC | KW_DESC)?
     ;
 
 tableSources
@@ -1258,15 +1258,15 @@ groupByClause
     ;
 
 havingClause
-    : KW_HAVING havingExpr=expression
+    : KW_HAVING (havingExpr=expression | columnNamePathAllowEmpty)
     ;
 
 windowClause
     : KW_WINDOW windowName KW_AS '(' windowSpec ')' (',' windowName KW_AS '(' windowSpec ')')*
     ;
 
 groupByItem
-    : expression order=(KW_ASC | KW_DESC)?
+    : (expression | columnNamePathAllowEmpty) order=(KW_ASC | KW_DESC)?
     ;
 
 limitClause
@@ -2431,13 +2431,14 @@ columnName
     ;
 
 columnNamePath
-    : uid (dottedId dottedId?)?
-    | .? dottedId dottedId?
+    : uid (dottedId dottedId?)?                      # columnNamePath_default
+    | .? dottedId dottedId?                          # columnNamePath_dotted
+    | uid DOT {this.shouldMatchEmpty()}? emptyColumn # columnNamePath_dot_empty
     ;
 
 columnNamePathAllowEmpty
-    : {this.shouldMatchEmpty()}? emptyColumn
-    | uid (dottedId dottedId?)?
+    : columnNamePath
+    | {this.shouldMatchEmpty()}? emptyColumn
     ;
 
 tableSpaceNameCreate

diff --git a/src/grammar/postgresql/PostgreSqlParser.g4 b/src/grammar/postgresql/PostgreSqlParser.g4
@@ -40,6 +40,17 @@ options {
     superClass=SQLParserBase;
 }
 
+@parser::members {
+    isFollowedByInto(): boolean {
+        return this.tokenStream.LA(1) === PostgreSqlParser.KW_INTO;
+    }
+
+    isFollowedByEnd(): boolean {
+        const la = this.tokenStream.LA(1);
+        return la === PostgreSqlParser.SEMI || la === PostgreSqlParser.EOF;
+    }
+}
+
 @header {
 import { SQLParserBase } from '../SQLParserBase';
 }
@@ -2629,7 +2640,8 @@ optIndirection
     ;
 
 targetList
-    : targetEl (COMMA targetEl)*
+    : {this.isFollowedByInto() || this.isFollowedByEnd()}?
+    | targetEl (COMMA targetEl)*
     ;
 
 targetEl
@@ -2735,7 +2747,8 @@ columnName
     ;
 
 columnNamePath
-    : colId optIndirection
+    : colId optIndirection                             # columnNamePath_default
+    | colId DOT {this.shouldMatchEmpty()}? emptyColumn # columnNamePath_dot_empty
     ;
 
 columnNameCreate
@@ -3628,5 +3641,5 @@ anyIdentifier
     ;
 
 sqlExpression
-    : targetList? intoClause? fromClause? whereClause? groupClause? havingClause? windowClause?
+    : targetList intoClause? fromClause? whereClause? groupClause? havingClause? windowClause?
     ;
diff --git a/src/grammar/trino/TrinoSql.g4 b/src/grammar/trino/TrinoSql.g4
@@ -29,6 +29,12 @@ options {
     superClass=SQLParserBase;
 }
 
+@parser::members {
+    notEntityCollecting(): boolean {
+        return !this.entityCollecting;
+    }
+}
+
 @header {
 import { SQLParserBase } from '../SQLParserBase';
 }
@@ -380,10 +386,19 @@ joinType
     ;
 
 joinCriteria
-    : KW_ON booleanExpression
+    : KW_ON (joinColumnEquality | {this.notEntityCollecting()}? booleanExpression)
     | KW_USING '(' identifier (',' identifier)* ')'
     ;
 
+joinColumnEquality
+    : left=joinColumnReference EQ right=joinColumnReference
+    ;
+
+joinColumnReference
+    : identifier DOT {this.entityCollecting}? emptyColumn
+    | columnName
+    ;
+
 sampledRelation
     : patternRecognition (KW_TABLESAMPLE sampleType '(' percentage=expression ')')?
     ;
@@ -1039,6 +1054,10 @@ columnRef
     | {this.shouldMatchEmpty()}?
     ;
 
+emptyColumn
+    :
+    ;
+
 columnName
     : qualifiedName
     ;

diff --git a/src/lib/mysql/MySqlParser.interp b/src/lib/mysql/MySqlParser.interp