Merge branch 'next' into feat/emptyColumn

Author: zhaoge

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 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.
 
+## [4.5.0-beta.0](https://github.com/DTStack/dt-sql-parser/compare/v4.4.1...v4.5.0-beta.0) (2025-12-30)
+
+
+### Features
+
+* support query result and derived table entity collecting ([#434](https://github.com/DTStack/dt-sql-parser/issues/434)) ([a176253](https://github.com/DTStack/dt-sql-parser/commit/a176253799b514fcd169c82f2706c2fe2810d85c))
+
+### [4.4.1](https://github.com/DTStack/dt-sql-parser/compare/v4.4.0...v4.4.1) (2025-12-22)
+
+### Bug Fixes
+
+* **trino:** add selectItem rule to candidates for column suggestions ([81a361f](https://github.com/DTStack/dt-sql-parser/commit/81a361fb8e45e81c8826cba212f0007443bf12b5))
+
 ## [4.4.0](https://github.com/DTStack/dt-sql-parser/compare/v4.4.0-beta.0...v4.4.0) (2025-11-26)
 
 ## [4.4.0-beta.0](https://github.com/DTStack/dt-sql-parser/compare/v4.3.1...v4.4.0-beta.0) (2025-11-18)

package.json

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

src/parser/common/basicSQL.ts

@@ -1,33 +1,34 @@
+import { CandidatesCollection, CodeCompletionCore } from 'antlr4-c3';
 import {
-    Lexer,
-    Token,
+    ANTLRErrorListener,
+    CharStream,
     CharStreams,
     CommonTokenStream,
-    CharStream,
+    Lexer,
+    Parser,
     ParserRuleContext,
-    ParseTreeWalker,
     ParseTreeListener,
+    ParseTreeWalker,
     PredictionMode,
-    ANTLRErrorListener,
-    Parser,
+    Token,
 } from 'antlr4ng';
-import { CandidatesCollection, CodeCompletionCore } from 'antlr4-c3';
+
 import { SQLParserBase } from '../../lib/SQLParserBase';
+import type { EntityCollector } from './entityCollector';
+import { EntityContext } from './entityCollector';
+import { ErrorStrategy } from './errorStrategy';
 import { findCaretTokenIndex } from './findCaretTokenIndex';
-import { ctxToText, tokenToWord, WordRange, TextSlice } from './textAndWord';
+import { ErrorListener, ParseError } from './parseErrorListener';
+import SemanticContextCollector from './semanticContextCollector';
+import type { SplitListener } from './splitListener';
+import { ctxToText, TextSlice, tokenToWord, WordRange } from './textAndWord';
 import {
     CaretPosition,
     LOCALE_TYPE,
     SemanticCollectOptions,
     Suggestions,
     SyntaxSuggestion,
 } from './types';
-import { ParseError, ErrorListener } from './parseErrorListener';
-import { ErrorStrategy } from './errorStrategy';
-import type { SplitListener } from './splitListener';
-import type { EntityCollector } from './entityCollector';
-import { EntityContext } from './entityCollector';
-import SemanticContextCollector from './semanticContextCollector';
 
 export const SQL_SPLIT_SYMBOL_TEXT = ';';
 

src/parser/trino/index.ts

@@ -136,6 +136,7 @@ export class TrinoSQL extends BasicSQL<TrinoSqlLexer, ProgramContext, TrinoSqlPa
                 }
                 case TrinoSqlParser.RULE_columnName: {
                     if (
+                        candidateRule.ruleList.includes(TrinoSqlParser.RULE_selectItem) ||
                         candidateRule.ruleList.includes(TrinoSqlParser.RULE_groupBy) ||
                         candidateRule.ruleList.includes(TrinoSqlParser.RULE_sortItem) ||
                         candidateRule.ruleList.includes(TrinoSqlParser.RULE_whereClause) ||

test/parser/trino/suggestion/fixtures/syntaxSuggestion.sql

@@ -61,3 +61,5 @@ SELECT * FROM users CROSS JOIN UNNEST(friends) WITH ordinality;
 SELECT  FROM tb1;
 
 SELECT age FROM tb1;
+
+SELECT a. FROM tb1 a;

test/parser/trino/suggestion/syntaxSuggestion.test.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
-import { TrinoSQL } from 'src/parser/trino';
 import { CaretPosition, EntityContextType } from 'src/parser/common/types';
+import { TrinoSQL } from 'src/parser/trino';
 import { commentOtherLine } from 'test/helper';
 
 const syntaxSql = fs.readFileSync(
@@ -598,6 +598,25 @@ describe('Trino SQL Syntax Suggestion', () => {
         ).toEqual([['age'], ['age']]);
     });
 
+    test('Select alias column', () => {
+        const pos: CaretPosition = {
+            lineNumber: 65,
+            column: 10,
+        };
+        const syntaxes = trino.getSuggestionAtCaretPosition(
+            commentOtherLine(syntaxSql, pos.lineNumber),
+            pos
+        )?.syntax;
+
+        const wordRangesArr = syntaxes?.map((syn) => syn.wordRanges);
+
+        expect(wordRangesArr).not.toBeUndefined();
+        expect(wordRangesArr.length).toBe(1);
+        expect(
+            wordRangesArr.map((wordRanges) => wordRanges.map((wordRange) => wordRange.text))
+        ).toEqual([['a', '.']]);
+    });
+
     test('Syntax suggestion after a comment', () => {
         const sql = `-- the comment\nSELECT * FROM db.`;
         const pos: CaretPosition = {