Skip to content

Commit 6c9ac43

Browse files
committed
Merge branch 'next' into feat/columnEntity
2 parents 0cfbecb + 821957c commit 6c9ac43

File tree

63 files changed

+6337
-5250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+6337
-5250
lines changed

CHANGELOG.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,55 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [4.4.0](https://github.com/DTStack/dt-sql-parser/compare/v4.4.0-beta.0...v4.4.0) (2025-11-26)
6+
7+
## [4.4.0-beta.0](https://github.com/DTStack/dt-sql-parser/compare/v4.3.1...v4.4.0-beta.0) (2025-11-18)
8+
9+
10+
### Features
11+
12+
* mark as entityCollecting in getAllEntities context to allow empty column ([ba6fbbb](https://github.com/DTStack/dt-sql-parser/commit/ba6fbbbe90bee79a7bba22350c3d50d6c9205b0d))
13+
* remove noReserved keywords in completions ([cf1957e](https://github.com/DTStack/dt-sql-parser/commit/cf1957e66896fbcb587f6038242e8f174b7045ff))
14+
15+
16+
### Bug Fixes
17+
18+
* [#438](https://github.com/DTStack/dt-sql-parser/issues/438) syntaxContextType not duplicate ([4705620](https://github.com/DTStack/dt-sql-parser/commit/47056209150ef6aaade7c612700b7a289c279208))
19+
* **flink:** [#442](https://github.com/DTStack/dt-sql-parser/issues/442) fix flink's insert values() can't support function problem ([98ab7d4](https://github.com/DTStack/dt-sql-parser/commit/98ab7d459b189b7ef07cc1bf820524594a0cc78c))
20+
* **postgresql:** [#432](https://github.com/DTStack/dt-sql-parser/issues/432) remove error rule ([3684ae7](https://github.com/DTStack/dt-sql-parser/commit/3684ae71e92cefe4bac18174b757e162d3f89457))
21+
22+
### [4.3.1](https://github.com/DTStack/dt-sql-parser/compare/v4.3.0...v4.3.1) (2025-06-05)
23+
24+
25+
### Bug Fixes
26+
27+
* **common:** [#424](https://github.com/DTStack/dt-sql-parser/issues/424) allTokens slice when caretTokenIndex use tokenIndexOffset ([#426](https://github.com/DTStack/dt-sql-parser/issues/426)) ([616dc11](https://github.com/DTStack/dt-sql-parser/commit/616dc1126d742bcdd902752ddaedab9b352a8927))
28+
29+
## [4.3.0](https://github.com/DTStack/dt-sql-parser/compare/v4.2.0...v4.3.0) (2025-05-16)
30+
31+
32+
### Features
33+
34+
* [#410](https://github.com/DTStack/dt-sql-parser/issues/410) optimize processCandidates tokenIndexOffset ([#411](https://github.com/DTStack/dt-sql-parser/issues/411)) ([5fccaa1](https://github.com/DTStack/dt-sql-parser/commit/5fccaa1ac6724419e3f4799b4e4f8fcdba8c049d))
35+
* **all sql:** add all sql expression column ([#358](https://github.com/DTStack/dt-sql-parser/issues/358)) ([26219b8](https://github.com/DTStack/dt-sql-parser/commit/26219b8eb2086f560670d2a72469f1f6cb77fb44))
36+
* collect entity's attribute([#333](https://github.com/DTStack/dt-sql-parser/issues/333)) ([ab60b14](https://github.com/DTStack/dt-sql-parser/commit/ab60b144bcdb74383c3f0064531282d89bf46f75))
37+
* complete after error syntax ([#334](https://github.com/DTStack/dt-sql-parser/issues/334)) ([99b01e5](https://github.com/DTStack/dt-sql-parser/commit/99b01e5310597dc373c3d1589c1dcca2094c22c2))
38+
* **flinksql:** collect comment, type attribute for entity ([#319](https://github.com/DTStack/dt-sql-parser/issues/319)) ([1f1dd19](https://github.com/DTStack/dt-sql-parser/commit/1f1dd19ff1ef3b062ffbb99f60e8539b41ad1401)), closes [#305](https://github.com/DTStack/dt-sql-parser/issues/305)
39+
* improve errorListener msg ([#281](https://github.com/DTStack/dt-sql-parser/issues/281)) ([ff49c91](https://github.com/DTStack/dt-sql-parser/commit/ff49c91623ae05f389bb0d9205bc485acbf7e0fb))
40+
* **merge conflict:** merge main solve conflict ([f17f19f](https://github.com/DTStack/dt-sql-parser/commit/f17f19f57a546aad9b9c8440ad6cfb4721f93f5c))
41+
* support semantic context of isNewStatement ([#361](https://github.com/DTStack/dt-sql-parser/issues/361)) ([042477d](https://github.com/DTStack/dt-sql-parser/commit/042477d363e7a3f7cdb7adb0a49625346506b4c5))
42+
* unify variables in lexer ([#366](https://github.com/DTStack/dt-sql-parser/issues/366)) ([07ff5dc](https://github.com/DTStack/dt-sql-parser/commit/07ff5dc5a1455efda434f71536b4fef38e45b5f0))
43+
44+
45+
### Bug Fixes
46+
47+
* [#362](https://github.com/DTStack/dt-sql-parser/issues/362) set hiveVar value ([#369](https://github.com/DTStack/dt-sql-parser/issues/369)) ([ba9e3d6](https://github.com/DTStack/dt-sql-parser/commit/ba9e3d67cd43ccf07059e369cad7157931723221))
48+
* [#371](https://github.com/DTStack/dt-sql-parser/issues/371) export EntityContext types ([#372](https://github.com/DTStack/dt-sql-parser/issues/372)) ([c0a2854](https://github.com/DTStack/dt-sql-parser/commit/c0a28546a0dfa3b42e7a94e81db8b833a62d3f9e))
49+
* **flink:** fix flinksql syntax error about ROW and function using ([#383](https://github.com/DTStack/dt-sql-parser/issues/383)) ([188d42d](https://github.com/DTStack/dt-sql-parser/commit/188d42da72ad81d5e1f96c453e9e8238692cdb9f))
50+
* **flink:** resolve conflicts ([ec65d4e](https://github.com/DTStack/dt-sql-parser/commit/ec65d4e21ff0a4ca8e2997b42ccc887b3bba763b))
51+
* minimum collect candidates boundary to fix parse performance ([#378](https://github.com/DTStack/dt-sql-parser/issues/378)) ([64ed7e4](https://github.com/DTStack/dt-sql-parser/commit/64ed7e4cd30ed12238390d113f202d4122ef9d73))
52+
* spell check ([#337](https://github.com/DTStack/dt-sql-parser/issues/337)) ([fb55c99](https://github.com/DTStack/dt-sql-parser/commit/fb55c999542a11b197d33b35c25bd5801eff6fa7))
53+
554
## [4.2.0](https://github.com/DTStack/dt-sql-parser/compare/v4.1.1...v4.2.0) (2025-05-09)
655

756

jest.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,7 @@ module.exports = {
184184
// watchman: true
185185

186186
transformIgnorePatterns: ['dist/', '<rootDir>/node_modules/.pnpm/(?!(antlr4ng|antlr4-c3)@)'],
187+
188+
// Disable console output in tests
189+
silent: true,
187190
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dt-sql-parser",
3-
"version": "4.2.0",
3+
"version": "4.4.0",
44
"authors": "DTStack Corporation",
55
"description": "SQL Parsers for BigData, built with antlr4",
66
"keywords": [

src/grammar/flink/FlinkSqlParser.g4

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,12 @@ valuesDefinition
439439
;
440440

441441
valuesRowDefinition
442-
: LR_BRACKET constant (COMMA constant)* RR_BRACKET
442+
: LR_BRACKET valueDefinition (COMMA valueDefinition)* RR_BRACKET
443+
;
444+
445+
valueDefinition
446+
: constant
447+
| functionCallExpression
443448
;
444449

445450
insertMulStatementCompatibility

src/grammar/postgresql/PostgreSqlParser.g4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2380,7 +2380,6 @@ primaryExpression
23802380
| OPEN_PAREN expression COMMA exprList CLOSE_PAREN
23812381
| row KW_OVERLAPS row
23822382
| columnNamePath
2383-
| qualifiedName
23842383
| primaryExpression TYPECAST typename
23852384
| (PLUS | MINUS) primaryExpression
23862385
| primaryExpression qualOp primaryExpression?

src/lib/flink/FlinkSqlParser.interp

Lines changed: 2 additions & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)