dt-sql-parser 4.5.2-beta.0 → 4.5.2-beta.2

package/dist/lib/trino/TrinoSqlVisitor.d.ts

@@ -101,11 +101,7 @@ import { LikeClauseContext } from "./TrinoSqlParser.js";
 import { PropertiesContext } from "./TrinoSqlParser.js";
 import { PropertyAssignmentsContext } from "./TrinoSqlParser.js";
 import { PropertyContext } from "./TrinoSqlParser.js";
-import { DefaultPropertyValueContext } from "./TrinoSqlParser.js";
-import { NonDefaultPropertyValueContext } from "./TrinoSqlParser.js";
 import { QueryNoWithContext } from "./TrinoSqlParser.js";
-import { LimitRowCountContext } from "./TrinoSqlParser.js";
-import { RowCountContext } from "./TrinoSqlParser.js";
 import { QueryTermDefaultContext } from "./TrinoSqlParser.js";
 import { SetOperationContext } from "./TrinoSqlParser.js";
 import { QueryPrimaryDefaultContext } from "./TrinoSqlParser.js";
@@ -141,14 +137,10 @@ import { JoinCriteriaContext } from "./TrinoSqlParser.js";
 import { JoinColumnEqualityContext } from "./TrinoSqlParser.js";
 import { JoinColumnReferenceContext } from "./TrinoSqlParser.js";
 import { SampledRelationContext } from "./TrinoSqlParser.js";
-import { SampleTypeContext } from "./TrinoSqlParser.js";
-import { TrimsSpecificationContext } from "./TrinoSqlParser.js";
 import { ListAggOverflowBehaviorContext } from "./TrinoSqlParser.js";
-import { ListAggCountIndicationContext } from "./TrinoSqlParser.js";
 import { PatternRecognitionContext } from "./TrinoSqlParser.js";
 import { MeasureDefinitionContext } from "./TrinoSqlParser.js";
 import { RowsPerMatchContext } from "./TrinoSqlParser.js";
-import { EmptyMatchHandlingContext } from "./TrinoSqlParser.js";
 import { SkipToContext } from "./TrinoSqlParser.js";
 import { SubsetDefinitionContext } from "./TrinoSqlParser.js";
 import { VariableDefinitionContext } from "./TrinoSqlParser.js";
@@ -249,23 +241,17 @@ import { JsonPathInvocationContext } from "./TrinoSqlParser.js";
 import { JsonValueExpressionContext } from "./TrinoSqlParser.js";
 import { JsonRepresentationContext } from "./TrinoSqlParser.js";
 import { JsonArgumentContext } from "./TrinoSqlParser.js";
-import { JsonExistsErrorBehaviorContext } from "./TrinoSqlParser.js";
 import { JsonValueBehaviorContext } from "./TrinoSqlParser.js";
 import { JsonQueryWrapperBehaviorContext } from "./TrinoSqlParser.js";
 import { JsonQueryBehaviorContext } from "./TrinoSqlParser.js";
 import { JsonObjectMemberContext } from "./TrinoSqlParser.js";
 import { ProcessingModeContext } from "./TrinoSqlParser.js";
-import { NullTreatmentContext } from "./TrinoSqlParser.js";
 import { BasicStringLiteralContext } from "./TrinoSqlParser.js";
 import { UnicodeStringLiteralContext } from "./TrinoSqlParser.js";
-import { TimeZoneIntervalContext } from "./TrinoSqlParser.js";
-import { TimeZoneStringContext } from "./TrinoSqlParser.js";
 import { ComparisonOperatorContext } from "./TrinoSqlParser.js";
 import { ComparisonQuantifierContext } from "./TrinoSqlParser.js";
-import { BooleanValueContext } from "./TrinoSqlParser.js";
 import { IntervalContext } from "./TrinoSqlParser.js";
 import { IntervalFieldContext } from "./TrinoSqlParser.js";
-import { NormalFormContext } from "./TrinoSqlParser.js";
 import { RowTypeContext } from "./TrinoSqlParser.js";
 import { IntervalTypeContext } from "./TrinoSqlParser.js";
 import { ArrayTypeContext } from "./TrinoSqlParser.js";
@@ -307,20 +293,13 @@ import { ExplainFormatContext } from "./TrinoSqlParser.js";
 import { ExplainTypeContext } from "./TrinoSqlParser.js";
 import { IsolationLevelContext } from "./TrinoSqlParser.js";
 import { TransactionAccessModeContext } from "./TrinoSqlParser.js";
-import { ReadUncommittedContext } from "./TrinoSqlParser.js";
-import { ReadCommittedContext } from "./TrinoSqlParser.js";
-import { RepeatableReadContext } from "./TrinoSqlParser.js";
-import { SerializableContext } from "./TrinoSqlParser.js";
 import { PositionalArgumentContext } from "./TrinoSqlParser.js";
 import { NamedArgumentContext } from "./TrinoSqlParser.js";
 import { QualifiedArgumentContext } from "./TrinoSqlParser.js";
 import { UnqualifiedArgumentContext } from "./TrinoSqlParser.js";
 import { PathSpecificationContext } from "./TrinoSqlParser.js";
 import { FunctionSpecificationContext } from "./TrinoSqlParser.js";
-import { FunctionDeclarationContext } from "./TrinoSqlParser.js";
-import { FunctionSignatureContext } from "./TrinoSqlParser.js";
 import { ParameterDeclarationContext } from "./TrinoSqlParser.js";
-import { ReturnsClauseContext } from "./TrinoSqlParser.js";
 import { LanguageCharacteristicContext } from "./TrinoSqlParser.js";
 import { DeterministicCharacteristicContext } from "./TrinoSqlParser.js";
 import { ReturnsNullOnNullInputCharacteristicContext } from "./TrinoSqlParser.js";
@@ -339,12 +318,9 @@ import { LoopStatementContext } from "./TrinoSqlParser.js";
 import { WhileStatementContext } from "./TrinoSqlParser.js";
 import { RepeatStatementContext } from "./TrinoSqlParser.js";
 import { CaseStatementWhenClauseContext } from "./TrinoSqlParser.js";
-import { ElseIfClauseContext } from "./TrinoSqlParser.js";
 import { ElseClauseContext } from "./TrinoSqlParser.js";
-import { VariableDeclarationContext } from "./TrinoSqlParser.js";
 import { SqlStatementListContext } from "./TrinoSqlParser.js";
 import { PrivilegeContext } from "./TrinoSqlParser.js";
-import { EntityKindContext } from "./TrinoSqlParser.js";
 import { GrantObjectContext } from "./TrinoSqlParser.js";
 import { TableOrViewNameContext } from "./TrinoSqlParser.js";
 import { TableRefContext } from "./TrinoSqlParser.js";
@@ -362,8 +338,6 @@ import { EmptyColumnContext } from "./TrinoSqlParser.js";
 import { ColumnNameContext } from "./TrinoSqlParser.js";
 import { ColumnNameCreateContext } from "./TrinoSqlParser.js";
 import { QualifiedNameContext } from "./TrinoSqlParser.js";
-import { QueryPeriodContext } from "./TrinoSqlParser.js";
-import { RangeTypeContext } from "./TrinoSqlParser.js";
 import { SpecifiedPrincipalContext } from "./TrinoSqlParser.js";
 import { CurrentUserGrantorContext } from "./TrinoSqlParser.js";
 import { CurrentRoleGrantorContext } from "./TrinoSqlParser.js";
@@ -379,8 +353,6 @@ import { DigitIdentifierContext } from "./TrinoSqlParser.js";
 import { DecimalLiteralContext } from "./TrinoSqlParser.js";
 import { DoubleLiteralContext } from "./TrinoSqlParser.js";
 import { IntegerLiteralContext } from "./TrinoSqlParser.js";
-import { IdentifierUserContext } from "./TrinoSqlParser.js";
-import { StringUserContext } from "./TrinoSqlParser.js";
 import { NonReservedContext } from "./TrinoSqlParser.js";
 /**
  * This interface defines a complete generic visitor for a parse tree produced
@@ -1087,38 +1059,12 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitProperty?: (ctx: PropertyContext) => Result;
-    /**
-     * Visit a parse tree produced by the `defaultPropertyValue`
-     * labeled alternative in `TrinoSqlParser.propertyValue`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitDefaultPropertyValue?: (ctx: DefaultPropertyValueContext) => Result;
-    /**
-     * Visit a parse tree produced by the `nonDefaultPropertyValue`
-     * labeled alternative in `TrinoSqlParser.propertyValue`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitNonDefaultPropertyValue?: (ctx: NonDefaultPropertyValueContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.queryNoWith`.
      * @param ctx the parse tree
      * @return the visitor result
      */
     visitQueryNoWith?: (ctx: QueryNoWithContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.limitRowCount`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitLimitRowCount?: (ctx: LimitRowCountContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.rowCount`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitRowCount?: (ctx: RowCountContext) => Result;
     /**
      * Visit a parse tree produced by the `queryTermDefault`
      * labeled alternative in `TrinoSqlParser.queryTerm`.
@@ -1341,30 +1287,12 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitSampledRelation?: (ctx: SampledRelationContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.sampleType`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitSampleType?: (ctx: SampleTypeContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.trimsSpecification`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitTrimsSpecification?: (ctx: TrimsSpecificationContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.listAggOverflowBehavior`.
      * @param ctx the parse tree
      * @return the visitor result
      */
     visitListAggOverflowBehavior?: (ctx: ListAggOverflowBehaviorContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.listAggCountIndication`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitListAggCountIndication?: (ctx: ListAggCountIndicationContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.patternRecognition`.
      * @param ctx the parse tree
@@ -1383,12 +1311,6 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitRowsPerMatch?: (ctx: RowsPerMatchContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.emptyMatchHandling`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitEmptyMatchHandling?: (ctx: EmptyMatchHandlingContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.skipTo`.
      * @param ctx the parse tree
@@ -2068,12 +1990,6 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitJsonArgument?: (ctx: JsonArgumentContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.jsonExistsErrorBehavior`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitJsonExistsErrorBehavior?: (ctx: JsonExistsErrorBehaviorContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.jsonValueBehavior`.
      * @param ctx the parse tree
@@ -2104,12 +2020,6 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitProcessingMode?: (ctx: ProcessingModeContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.nullTreatment`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitNullTreatment?: (ctx: NullTreatmentContext) => Result;
     /**
      * Visit a parse tree produced by the `basicStringLiteral`
      * labeled alternative in `TrinoSqlParser.string`.
@@ -2124,20 +2034,6 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitUnicodeStringLiteral?: (ctx: UnicodeStringLiteralContext) => Result;
-    /**
-     * Visit a parse tree produced by the `timeZoneInterval`
-     * labeled alternative in `TrinoSqlParser.timeZoneSpecifier`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitTimeZoneInterval?: (ctx: TimeZoneIntervalContext) => Result;
-    /**
-     * Visit a parse tree produced by the `timeZoneString`
-     * labeled alternative in `TrinoSqlParser.timeZoneSpecifier`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitTimeZoneString?: (ctx: TimeZoneStringContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.comparisonOperator`.
      * @param ctx the parse tree
@@ -2150,12 +2046,6 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitComparisonQuantifier?: (ctx: ComparisonQuantifierContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.booleanValue`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitBooleanValue?: (ctx: BooleanValueContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.interval`.
      * @param ctx the parse tree
@@ -2168,12 +2058,6 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitIntervalField?: (ctx: IntervalFieldContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.normalForm`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitNormalForm?: (ctx: NormalFormContext) => Result;
     /**
      * Visit a parse tree produced by the `rowType`
      * labeled alternative in `TrinoSqlParser.type`.
@@ -2453,34 +2337,6 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitTransactionAccessMode?: (ctx: TransactionAccessModeContext) => Result;
-    /**
-     * Visit a parse tree produced by the `readUncommitted`
-     * labeled alternative in `TrinoSqlParser.levelOfIsolation`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitReadUncommitted?: (ctx: ReadUncommittedContext) => Result;
-    /**
-     * Visit a parse tree produced by the `readCommitted`
-     * labeled alternative in `TrinoSqlParser.levelOfIsolation`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitReadCommitted?: (ctx: ReadCommittedContext) => Result;
-    /**
-     * Visit a parse tree produced by the `repeatableRead`
-     * labeled alternative in `TrinoSqlParser.levelOfIsolation`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitRepeatableRead?: (ctx: RepeatableReadContext) => Result;
-    /**
-     * Visit a parse tree produced by the `serializable`
-     * labeled alternative in `TrinoSqlParser.levelOfIsolation`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitSerializable?: (ctx: SerializableContext) => Result;
     /**
      * Visit a parse tree produced by the `positionalArgument`
      * labeled alternative in `TrinoSqlParser.callArgument`.
@@ -2521,30 +2377,12 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitFunctionSpecification?: (ctx: FunctionSpecificationContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.functionDeclaration`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitFunctionDeclaration?: (ctx: FunctionDeclarationContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.functionSignature`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitFunctionSignature?: (ctx: FunctionSignatureContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.parameterDeclaration`.
      * @param ctx the parse tree
      * @return the visitor result
      */
     visitParameterDeclaration?: (ctx: ParameterDeclarationContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.returnsClause`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitReturnsClause?: (ctx: ReturnsClauseContext) => Result;
     /**
      * Visit a parse tree produced by the `languageCharacteristic`
      * labeled alternative in `TrinoSqlParser.routineCharacteristic`.
@@ -2670,24 +2508,12 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitCaseStatementWhenClause?: (ctx: CaseStatementWhenClauseContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.elseIfClause`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitElseIfClause?: (ctx: ElseIfClauseContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.elseClause`.
      * @param ctx the parse tree
      * @return the visitor result
      */
     visitElseClause?: (ctx: ElseClauseContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.variableDeclaration`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitVariableDeclaration?: (ctx: VariableDeclarationContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.sqlStatementList`.
      * @param ctx the parse tree
@@ -2700,12 +2526,6 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitPrivilege?: (ctx: PrivilegeContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.entityKind`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitEntityKind?: (ctx: EntityKindContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.grantObject`.
      * @param ctx the parse tree
@@ -2808,18 +2628,6 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitQualifiedName?: (ctx: QualifiedNameContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.queryPeriod`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitQueryPeriod?: (ctx: QueryPeriodContext) => Result;
-    /**
-     * Visit a parse tree produced by `TrinoSqlParser.rangeType`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitRangeType?: (ctx: RangeTypeContext) => Result;
     /**
      * Visit a parse tree produced by the `specifiedPrincipal`
      * labeled alternative in `TrinoSqlParser.grantor`.
@@ -2923,20 +2731,6 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitIntegerLiteral?: (ctx: IntegerLiteralContext) => Result;
-    /**
-     * Visit a parse tree produced by the `identifierUser`
-     * labeled alternative in `TrinoSqlParser.authorizationUser`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitIdentifierUser?: (ctx: IdentifierUserContext) => Result;
-    /**
-     * Visit a parse tree produced by the `stringUser`
-     * labeled alternative in `TrinoSqlParser.authorizationUser`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitStringUser?: (ctx: StringUserContext) => Result;
     /**
      * Visit a parse tree produced by `TrinoSqlParser.nonReserved`.
      * @param ctx the parse tree

package/dist/parser/common/entityCollector.js

@@ -233,6 +233,11 @@ const CTE_CLAUSE_CONTEXT_NAMES = new Set([
     'CtesContext',
     'WithContext',
 ]);
+/**
+ * Strip outer quotes/brackets and lowercase for CTE name matching.
+ * Quoted forms are lowercased too on purpose — loose match for completion UX
+ * across dialects, not dialect-accurate case folding (e.g. PostgreSQL quoted ids).
+ */
 function normalizeIdent(text) {
     let value = text.trim();
     if ((value.startsWith('`') && value.endsWith('`') && value.length >= 2) ||

package/dist/parser/flink/flinkEntityCollector.js

@@ -60,7 +60,7 @@ export class FlinkEntityCollector extends EntityCollector {
     }
     exitWithItem(ctx) {
         var _a, _b;
-        this.collectCte(ctx, ctx.withItemName(), ctx.queryStatement(), (_b = (_a = ctx.stop) === null || _a === void 0 ? void 0 : _a.tokenIndex) !== null && _b !== void 0 ? _b : -1, ctx.columnName());
+        this.collectCte(ctx, ctx.identifier(), ctx.queryStatement(), (_b = (_a = ctx.stop) === null || _a === void 0 ? void 0 : _a.tokenIndex) !== null && _b !== void 0 ? _b : -1, ctx.columnName());
     }
     exitViewPath(ctx) {
         this.pushEntity(ctx, EntityContextType.VIEW);

package/dist/parser/generic/genericEntityCollector.d.ts

@@ -1,5 +1,5 @@
 import type { GenericSqlListener } from '../../lib/generic/GenericSqlListener';
-import { AlterTableContext, ColumnDefinitionContext, ColumnRefContext, CreateTableContext, DeleteContext, DropTableContext, InsertContext, NamedQueryContext, QuerySpecificationContext, QueryStatementContext, SelectItemContext, SingleStatementContext, TableNameContext, TableNameCreateContext, UpdateContext } from '../../lib/generic/GenericSqlParser';
+import { AlterTableContext, ColumnRefContext, ColumnRefCreateContext, CreateTableContext, DeleteContext, DropTableContext, InsertContext, NamedQueryContext, QuerySpecificationContext, QueryStatementContext, SelectAllElementContext, SelectEmptyElementContext, SelectExpressionElementContext, SelectStarElementContext, SingleStatementContext, TableNameContext, TableNameCreateContext, UpdateContext } from '../../lib/generic/GenericSqlParser';
 import { CommonEntityContext, EntityCollector } from '../common/entityCollector';
 export declare class GenericEntityCollector extends EntityCollector implements GenericSqlListener {
     /** Select-list source text for each query result. The result itself keeps the full statement. */
@@ -10,10 +10,13 @@ export declare class GenericEntityCollector extends EntityCollector implements G
     exitNamedQuery(ctx: NamedQueryContext): void;
     exitTableNameCreate(ctx: TableNameCreateContext): void;
     exitColumnRef(ctx: ColumnRefContext): void;
-    exitColumnDefinition(ctx: ColumnDefinitionContext): void;
+    exitColumnRefCreate(ctx: ColumnRefCreateContext): void;
     exitQuerySpecification(ctx: QuerySpecificationContext): void;
     protected adaptOutwardQueryResult(entity: CommonEntityContext): CommonEntityContext;
-    exitSelectItem(ctx: SelectItemContext): void;
+    exitSelectExpressionElement(ctx: SelectExpressionElementContext): void;
+    exitSelectStarElement(ctx: SelectStarElementContext): void;
+    exitSelectAllElement(ctx: SelectAllElementContext): void;
+    exitSelectEmptyElement(ctx: SelectEmptyElementContext): void;
     private isSimpleColumnReference;
     /** ===== Statement begin */
     enterSingleStatement(ctx: SingleStatementContext): void;

package/dist/parser/generic/genericEntityCollector.js

@@ -1,5 +1,5 @@
 import { ColumnDefinitionContext, AliasedRelationContext, CreateTableStatementContext, } from '../../lib/generic/GenericSqlParser';
-import { AttrName, ColumnDeclareType, EntityCollector, isColumnEntityContext, isCommonEntityContext, StmtContextType, TableDeclareType, } from '../common/entityCollector';
+import { AttrName, ColumnDeclareType, EntityCollector, isCommonEntityContext, StmtContextType, TableDeclareType, } from '../common/entityCollector';
 import { EntityContextType } from '../common/types';
 import { tokenToWord } from '../common/textAndWord';
 export class GenericEntityCollector extends EntityCollector {
@@ -38,33 +38,17 @@ export class GenericEntityCollector extends EntityCollector {
     exitColumnRef(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN);
     }
-    exitColumnDefinition(ctx) {
-        var _a, _b;
-        // The name is only `columnRef`. Pushing the whole definition made the
-        // completion label `age int` and inserted the type into the SQL.
-        const entity = this.pushEntity(ctx.columnRef(), EntityContextType.COLUMN_CREATE, [
+    exitColumnRefCreate(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN_CREATE, [
+            {
+                attrName: AttrName.colType,
+                endContextList: [ColumnDefinitionContext.name],
+            },
             {
                 attrName: AttrName.comment,
                 endContextList: [ColumnDefinitionContext.name],
             },
         ]);
-        const dataType = ctx.dataType();
-        if (entity && isColumnEntityContext(entity) && (dataType === null || dataType === void 0 ? void 0 : dataType.start) && dataType.stop) {
-            const startIndex = dataType.start.start;
-            const endIndex = dataType.stop.stop;
-            const typeText = this.sourceSlice(startIndex, endIndex);
-            const startColumn = dataType.start.column + 1;
-            entity[AttrName.colType] = {
-                text: typeText,
-                line: dataType.start.line,
-                startIndex,
-                endIndex,
-                startColumn,
-                endColumn: dataType.stop.line === dataType.start.line
-                    ? startColumn + typeText.length
-                    : dataType.stop.column + 1 + ((_b = (_a = dataType.stop.text) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0),
-            };
-        }
     }
     exitQuerySpecification(ctx) {
         var _a, _b;
@@ -82,28 +66,32 @@ export class GenericEntityCollector extends EntityCollector {
             return entity;
         return Object.assign(Object.assign({}, entity), { text });
     }
-    exitSelectItem(ctx) {
+    exitSelectExpressionElement(ctx) {
         var _a;
-        if (ctx.ASTERISK()) {
-            this.pushEntity(ctx, EntityContextType.COLUMN, [], {
-                declareType: ColumnDeclareType.ALL,
-            });
-        }
-        else {
-            const isSimpleColumn = this.isSimpleColumnReference(ctx);
-            const entity = this.pushEntity(ctx, EntityContextType.COLUMN, [], {
-                declareType: isSimpleColumn
-                    ? ColumnDeclareType.LITERAL
-                    : ColumnDeclareType.EXPRESSION,
-            });
-            // The alias sits on this select item. Searching parents would pick a
-            // later item's alias and label every column with that name.
-            const aliasToken = (_a = ctx._alias) === null || _a === void 0 ? void 0 : _a.start;
-            if (entity && aliasToken) {
-                entity[AttrName.alias] = tokenToWord(aliasToken, '');
-            }
+        const isSimpleColumn = this.isSimpleColumnReference(ctx);
+        const entity = this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: isSimpleColumn ? ColumnDeclareType.LITERAL : ColumnDeclareType.EXPRESSION,
+        });
+        const aliasToken = (_a = ctx._alias) === null || _a === void 0 ? void 0 : _a.start;
+        if (entity && aliasToken) {
+            entity[AttrName.alias] = tokenToWord(aliasToken, '');
         }
     }
+    exitSelectStarElement(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.ALL,
+        });
+    }
+    exitSelectAllElement(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.ALL,
+        });
+    }
+    exitSelectEmptyElement(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
     isSimpleColumnReference(ctx) {
         const text = ctx.getText();
         // Simple column reference: no parentheses, no operators, no spaces

package/dist/parser/generic/index.js

@@ -19,7 +19,9 @@ export class GenericSQL extends BasicSQL {
             GenericSqlParser.RULE_tableName,
             GenericSqlParser.RULE_tableNameCreate,
             GenericSqlParser.RULE_columnRef,
-            GenericSqlParser.RULE_qualifiedName,
+            GenericSqlParser.RULE_columnRefCreate,
+            GenericSqlParser.RULE_columnName,
+            GenericSqlParser.RULE_functionName,
             ...this.excludeKeywordRules,
         ]);
         this._diagnostics = (options === null || options === void 0 ? void 0 : options.diagnostics) !== false;
@@ -69,15 +71,16 @@ export class GenericSQL extends BasicSQL {
                     syntaxContextType = EntityContextType.COLUMN;
                     break;
                 }
-                case GenericSqlParser.RULE_qualifiedName: {
-                    // Expressions use qualifiedName for columns. Table names use the same
-                    // rule through tableName, and those stay TABLE suggestions.
-                    const rules = candidateRule.ruleList;
-                    if (!rules.includes(GenericSqlParser.RULE_tableName) &&
-                        !rules.includes(GenericSqlParser.RULE_tableNameCreate) &&
-                        rules.includes(GenericSqlParser.RULE_expression)) {
-                        syntaxContextType = EntityContextType.COLUMN;
-                    }
+                case GenericSqlParser.RULE_columnRefCreate: {
+                    syntaxContextType = EntityContextType.COLUMN_CREATE;
+                    break;
+                }
+                case GenericSqlParser.RULE_columnName: {
+                    syntaxContextType = EntityContextType.COLUMN;
+                    break;
+                }
+                case GenericSqlParser.RULE_functionName: {
+                    syntaxContextType = EntityContextType.FUNCTION;
                     break;
                 }
                 default:

package/package.json

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