Merge branch 'main' into next

Author: zhaoge

CHANGELOG.md

@@ -6,6 +6,20 @@ All notable changes to this project will be documented in this file. See [standa
 ### [4.4.2](https://github.com/DTStack/dt-sql-parser/compare/v4.4.1...v4.4.2) (2026-03-06)
 
 
+### Bug Fixes
+
+* **flink:** [#455](https://github.com/DTStack/dt-sql-parser/issues/455) fix json functions' params problem in flink ([12ef949](https://github.com/DTStack/dt-sql-parser/commit/12ef949339ffb0889e428c97c54149cd567b6ae8))
+* **flink:** some grammar rules ([#465](https://github.com/DTStack/dt-sql-parser/issues/465)) ([20e352c](https://github.com/DTStack/dt-sql-parser/commit/20e352cb32142c825ee086e36051ff9797798e09)), closes [#464](https://github.com/DTStack/dt-sql-parser/issues/464) [#464](https://github.com/DTStack/dt-sql-parser/issues/464) [#464](https://github.com/DTStack/dt-sql-parser/issues/464)
+
+### [4.4.1](https://github.com/DTStack/dt-sql-parser/compare/v4.3.1...v4.4.1) (2025-12-22)
+
+
+### Features
+
+* mark as entityCollecting in getAllEntities context to allow empty column ([ba6fbbb](https://github.com/DTStack/dt-sql-parser/commit/ba6fbbbe90bee79a7bba22350c3d50d6c9205b0d))
+* remove noReserved keywords in completions ([cf1957e](https://github.com/DTStack/dt-sql-parser/commit/cf1957e66896fbcb587f6038242e8f174b7045ff))
+
+
 ### Bug Fixes
 
 * **flink:** [#455](https://github.com/DTStack/dt-sql-parser/issues/455) fix json functions' params problem in flink ([12ef949](https://github.com/DTStack/dt-sql-parser/commit/12ef949339ffb0889e428c97c54149cd567b6ae8))

src/grammar/spark/SparkSqlParser.g4

@@ -466,7 +466,6 @@ clusterOrDistributeBy
 
 queryTerm
     : queryPrimary
-    | left=queryTerm operator=(KW_INTERSECT | KW_UNION | KW_EXCEPT | KW_MINUS) setQuantifier? right=queryTerm
     | left=queryTerm operator=KW_INTERSECT setQuantifier? right=queryTerm
     | left=queryTerm operator=(KW_UNION | KW_EXCEPT | KW_MINUS) setQuantifier? right=queryTerm
     ;

src/grammar/trino/TrinoSql.g4

@@ -638,6 +638,7 @@ primaryExpression
     | KW_SUBSTRING '(' valueExpression KW_FROM valueExpression (KW_FOR valueExpression)? ')'              # substring
     | KW_NORMALIZE '(' valueExpression (',' normalForm)? ')'                                              # normalize
     | KW_EXTRACT '(' identifier KW_FROM valueExpression ')'                                               # extract
+    | KW_COALESCE '(' expression (',' expression)* ')'                                                    # coalesce
     | '(' expression ')'                                                                                  # parenthesizedExpression
     | KW_GROUPING '(' (qualifiedName (',' qualifiedName)*)? ')'                                           # groupingOperation
     | KW_JSON_EXISTS '(' jsonPathInvocation (jsonExistsErrorBehavior KW_ON KW_ERROR)? ')'                 # jsonExists
@@ -1125,6 +1126,7 @@ nonReserved
     | KW_CASCADE
     | KW_CATALOG
     | KW_CATALOGS
+    | KW_COALESCE
     | KW_COLUMN
     | KW_COLUMNS
     | KW_COMMENT
@@ -1358,6 +1360,7 @@ KW_CASE              : 'CASE';
 KW_CAST              : 'CAST';
 KW_CATALOG           : 'CATALOG';
 KW_CATALOGS          : 'CATALOGS';
+KW_COALESCE          : 'COALESCE';
 KW_COLUMN            : 'COLUMN';
 KW_COLUMNS           : 'COLUMNS';
 KW_COMMENT           : 'COMMENT';