dt-sql-parser 4.5.1-beta.3 → 4.5.2-beta.0

package/dist/parser/generic/genericEntityCollector.js

@@ -1,13 +1,32 @@
-import { ColumnDefinitionContext, CreateTableStatementContext, SelectItemContext, } from '../../lib/generic/GenericSqlParser';
-import { AttrName, ColumnDeclareType, EntityCollector, StmtContextType, TableDeclareType, } from '../common/entityCollector';
+import { ColumnDefinitionContext, AliasedRelationContext, CreateTableStatementContext, } from '../../lib/generic/GenericSqlParser';
+import { AttrName, ColumnDeclareType, EntityCollector, isColumnEntityContext, isCommonEntityContext, StmtContextType, TableDeclareType, } from '../common/entityCollector';
 import { EntityContextType } from '../common/types';
+import { tokenToWord } from '../common/textAndWord';
 export class GenericEntityCollector extends EntityCollector {
+    constructor() {
+        super(...arguments);
+        /** Select-list source text for each query result. The result itself keeps the full statement. */
+        this.selectListText = new Map();
+    }
+    enterProgram() {
+        this.selectListText.clear();
+        super.enterProgram();
+    }
     /** ====== Entity Begin */
     exitTableName(ctx) {
-        this.pushEntity(ctx, EntityContextType.TABLE, [], {
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [AliasedRelationContext.name],
+            },
+        ], {
             declareType: TableDeclareType.LITERAL,
         });
     }
+    exitNamedQuery(ctx) {
+        var _a, _b;
+        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.cteColumnList());
+    }
     exitTableNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.TABLE_CREATE, [
             {
@@ -20,21 +39,51 @@ export class GenericEntityCollector extends EntityCollector {
         this.pushEntity(ctx, EntityContextType.COLUMN);
     }
     exitColumnDefinition(ctx) {
-        this.pushEntity(ctx, EntityContextType.COLUMN_CREATE, [
-            {
-                attrName: AttrName.colType,
-                endContextList: [ColumnDefinitionContext.name],
-            },
+        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, [
             {
                 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) {
-        this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
+        var _a, _b;
+        const entity = this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
+        const items = ctx.selectItem();
+        const first = (_a = items[0]) === null || _a === void 0 ? void 0 : _a.start;
+        const last = (_b = items[items.length - 1]) === null || _b === void 0 ? void 0 : _b.stop;
+        if (entity && isCommonEntityContext(entity) && first && last) {
+            this.selectListText.set(entity, this.sourceSlice(first.start, last.stop));
+        }
+    }
+    adaptOutwardQueryResult(entity) {
+        const text = this.selectListText.get(entity);
+        if (text == null)
+            return entity;
+        return Object.assign(Object.assign({}, entity), { text });
     }
     exitSelectItem(ctx) {
+        var _a;
         if (ctx.ASTERISK()) {
             this.pushEntity(ctx, EntityContextType.COLUMN, [], {
                 declareType: ColumnDeclareType.ALL,
@@ -42,16 +91,17 @@ export class GenericEntityCollector extends EntityCollector {
         }
         else {
             const isSimpleColumn = this.isSimpleColumnReference(ctx);
-            this.pushEntity(ctx, EntityContextType.COLUMN, [
-                {
-                    attrName: AttrName.alias,
-                    endContextList: [SelectItemContext.name],
-                },
-            ], {
+            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, '');
+            }
         }
     }
     isSimpleColumnReference(ctx) {

package/dist/parser/generic/index.js

@@ -19,6 +19,7 @@ export class GenericSQL extends BasicSQL {
             GenericSqlParser.RULE_tableName,
             GenericSqlParser.RULE_tableNameCreate,
             GenericSqlParser.RULE_columnRef,
+            GenericSqlParser.RULE_qualifiedName,
             ...this.excludeKeywordRules,
         ]);
         this._diagnostics = (options === null || options === void 0 ? void 0 : options.diagnostics) !== false;
@@ -53,7 +54,7 @@ export class GenericSQL extends BasicSQL {
         const keywords = [];
         for (const candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case GenericSqlParser.RULE_tableName: {
@@ -68,6 +69,17 @@ 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;
+                    }
+                    break;
+                }
                 default:
                     break;
             }

package/dist/parser/hive/hiveEntityCollector.d.ts

@@ -1,5 +1,5 @@
 import { HiveSqlParserListener } from '../../lib';
-import { AtomPartitionedTableFunctionContext, AtomValuesClauseContext, ColumnNameCreateContext, CreateDatabaseStatementContext, CreateFunctionStatementContext, CreateMaterializedViewStatementContext, CreateTableStatementContext, CreateViewStatementContext, DbSchemaNameContext, DbSchemaNameCreateContext, FromInsertStmtContext, FromSelectStmtContext, FunctionNameCreateContext, InsertStmtContext, QueryStatementExpressionContext, SelectExpressionColumnNameContext, SelectListContext, SelectLiteralColumnNameContext, SelectStatementContext, StatementContext, TableAllColumnsContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext } from '../../lib/hive/HiveSqlParser';
+import { AtomPartitionedTableFunctionContext, AtomValuesClauseContext, ColumnNameCreateContext, CreateDatabaseStatementContext, CreateFunctionStatementContext, CreateMaterializedViewStatementContext, CreateTableStatementContext, CreateViewStatementContext, CteStatementContext, DbSchemaNameContext, DbSchemaNameCreateContext, FromInsertStmtContext, FromSelectStmtContext, FunctionNameCreateContext, InsertStmtContext, QueryStatementExpressionContext, SelectExpressionColumnNameContext, SelectListContext, SelectLiteralColumnNameContext, SelectStatementContext, StatementContext, TableAllColumnsContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext } from '../../lib/hive/HiveSqlParser';
 import { EntityCollector } from '../common/entityCollector';
 export declare class HiveEntityCollector extends EntityCollector implements HiveSqlParserListener {
     /** ====== Entity Begin */
@@ -19,6 +19,7 @@ export declare class HiveEntityCollector extends EntityCollector implements Hive
     exitTableAllColumns(ctx: TableAllColumnsContext): void;
     exitViewNameCreate(ctx: ViewNameCreateContext): void;
     exitSelectList(ctx: SelectListContext): void;
+    exitCteStatement(ctx: CteStatementContext): void;
     exitViewName(ctx: ViewNameContext): void;
     exitDbSchemaNameCreate(ctx: DbSchemaNameCreateContext): void;
     exitDbSchemaName(ctx: DbSchemaNameContext): void;

package/dist/parser/hive/hiveEntityCollector.js

@@ -116,6 +116,11 @@ export class HiveEntityCollector extends EntityCollector {
     exitSelectList(ctx) {
         this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
     }
+    exitCteStatement(ctx) {
+        var _a, _b, _c, _d;
+        const columns = (_b = (_a = ctx.columnNameList()) === null || _a === void 0 ? void 0 : _a.columnName()) !== null && _b !== void 0 ? _b : [];
+        this.collectCte(ctx, ctx.id_(), ctx.queryStatementExpression(), (_d = (_c = ctx.stop) === null || _c === void 0 ? void 0 : _c.tokenIndex) !== null && _d !== void 0 ? _d : -1, columns);
+    }
     exitViewName(ctx) {
         this.pushEntity(ctx, EntityContextType.VIEW);
     }

package/dist/parser/hive/index.js

@@ -55,7 +55,7 @@ export class HiveSQL extends BasicSQL {
         const keywords = [];
         for (let candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case HiveSqlParser.RULE_dbSchemaName: {

package/dist/parser/impala/impalaEntityCollector.d.ts

@@ -1,5 +1,5 @@
 import { ImpalaSqlParserListener } from '../../lib';
-import { AtomSubQueryTableSourceContext, ColumnNamePathCreateContext, CreateAggregateFunctionContext, CreateFunctionContext, CreateKuduTableAsSelectContext, CreateSchemaContext, CreateTableLikeContext, CreateTableSelectContext, CreateViewContext, DatabaseNameCreateContext, DatabaseNamePathContext, FunctionNameCreateContext, InsertStatementContext, QueryStatementContext, SelectExpressionColumnNameContext, SelectListContext, SelectLiteralColumnNameContext, SingleStatementContext, TableAllColumnsContext, TableNameCreateContext, TableNamePathContext, UnnestContext, ViewNameCreateContext, ViewNamePathContext } from '../../lib/impala/ImpalaSqlParser';
+import { AtomSubQueryTableSourceContext, ColumnNamePathCreateContext, CreateAggregateFunctionContext, CreateFunctionContext, CreateKuduTableAsSelectContext, CreateSchemaContext, CreateTableLikeContext, CreateTableSelectContext, CreateViewContext, DatabaseNameCreateContext, DatabaseNamePathContext, FunctionNameCreateContext, InsertStatementContext, NamedQueryContext, QueryStatementContext, SelectExpressionColumnNameContext, SelectListContext, SelectLiteralColumnNameContext, SingleStatementContext, TableAllColumnsContext, TableNameCreateContext, TableNamePathContext, UnnestContext, ViewNameCreateContext, ViewNamePathContext } from '../../lib/impala/ImpalaSqlParser';
 import { EntityCollector } from '../common/entityCollector';
 export declare class ImpalaEntityCollector extends EntityCollector implements ImpalaSqlParserListener {
     /** ===== Entity begin */
@@ -9,6 +9,7 @@ export declare class ImpalaEntityCollector extends EntityCollector implements Im
     exitUnnest(ctx: UnnestContext): void;
     exitColumnNamePathCreate(ctx: ColumnNamePathCreateContext): void;
     exitViewNameCreate(ctx: ViewNameCreateContext): void;
+    exitNamedQuery(ctx: NamedQueryContext): void;
     exitViewNamePath(ctx: ViewNamePathContext): void;
     exitDatabaseNamePath(ctx: DatabaseNamePathContext): void;
     exitDatabaseNameCreate(ctx: DatabaseNameCreateContext): void;

package/dist/parser/impala/impalaEntityCollector.js

@@ -72,6 +72,10 @@ export class ImpalaEntityCollector extends EntityCollector {
             },
         ]);
     }
+    exitNamedQuery(ctx) {
+        var _a, _b;
+        this.collectCte(ctx, ctx.identifier(), ctx.subQueryRelation(), (_b = (_a = ctx.stop) === null || _a === void 0 ? void 0 : _a.tokenIndex) !== null && _b !== void 0 ? _b : -1, [], ctx.columnAliases());
+    }
     exitViewNamePath(ctx) {
         this.pushEntity(ctx, EntityContextType.VIEW);
     }

package/dist/parser/impala/index.js

@@ -54,7 +54,7 @@ export class ImpalaSQL extends BasicSQL {
         const keywords = [];
         for (let candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case ImpalaSqlParser.RULE_functionNameCreate: {

package/dist/parser/mysql/index.js

@@ -8,6 +8,13 @@ import { MysqlErrorListener } from './mysqlErrorListener';
 import { MysqlSplitListener } from './mysqlSplitListener';
 import { MySqlSemanticContextCollector } from '../mysql/mysqlSemanticContextCollector';
 export { MySqlEntityCollector, MysqlSplitListener };
+const ALLOW_EMPTY_COLUMN_PARENT_RULES = new Set([
+    MySqlParser.RULE_joinSpec,
+    MySqlParser.RULE_fromClause,
+    MySqlParser.RULE_orderByExpression,
+    MySqlParser.RULE_groupByItem,
+    MySqlParser.RULE_havingClause,
+]);
 export class MySQL extends BasicSQL {
     constructor() {
         super(...arguments);
@@ -26,6 +33,7 @@ export class MySQL extends BasicSQL {
             MySqlParser.RULE_functionNameCreate,
             MySqlParser.RULE_columnName,
             MySqlParser.RULE_columnNamePath,
+            MySqlParser.RULE_columnNamePathAllowEmpty,
             MySqlParser.RULE_columnNameCreate,
             ...this.excludeKeywordRules,
         ]);
@@ -54,7 +62,7 @@ export class MySQL extends BasicSQL {
         const keywords = [];
         for (const candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case MySqlParser.RULE_databaseName: {
@@ -94,6 +102,12 @@ export class MySQL extends BasicSQL {
                     syntaxContextType = EntityContextType.COLUMN;
                     break;
                 }
+                case MySqlParser.RULE_columnNamePathAllowEmpty: {
+                    if (candidateRule.ruleList.some((rule) => ALLOW_EMPTY_COLUMN_PARENT_RULES.has(rule))) {
+                        syntaxContextType = EntityContextType.COLUMN;
+                    }
+                    break;
+                }
                 case MySqlParser.RULE_columnNameCreate: {
                     syntaxContextType = EntityContextType.COLUMN_CREATE;
                     break;

package/dist/parser/mysql/mysqlEntityCollector.d.ts

@@ -1,4 +1,4 @@
-import { ColumnCreateTableContext, ColumnNameCreateContext, CopyCreateTableContext, CreateDatabaseContext, CreateFunctionContext, CreateFunctionLoadableContext, CreateViewContext, DatabaseNameContext, DatabaseNameCreateContext, FunctionNameCreateContext, InsertStatementContext, QueryCreateTableContext, SelectElementsContext, SelectExpressionElementContext, SelectLiteralColumnNameContext, SelectStatementContext, SingleStatementContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext, TableAllColumnsContext, AtomSubQueryTableSourceContext, PureAllColumnsContext, SelectElement_dot_emptyContext } from '../../lib/mysql/MySqlParser';
+import { ColumnCreateTableContext, ColumnNameCreateContext, CopyCreateTableContext, CreateDatabaseContext, CreateFunctionContext, CreateFunctionLoadableContext, CreateViewContext, DatabaseNameContext, DatabaseNameCreateContext, FunctionNameCreateContext, InsertStatementContext, QueryCreateTableContext, SelectElementsContext, SelectExpressionElementContext, SelectLiteralColumnNameContext, SelectStatementContext, SingleStatementContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext, TableAllColumnsContext, AtomSubQueryTableSourceContext, CommonTableExpressionsContext, PureAllColumnsContext, SelectElement_dot_emptyContext, ColumnNamePath_dot_emptyContext } from '../../lib/mysql/MySqlParser';
 import type { MySqlParserListener } from '../../lib/mysql/MySqlParserListener';
 import { EntityCollector } from '../common/entityCollector';
 export declare class MySqlEntityCollector extends EntityCollector implements MySqlParserListener {
@@ -7,6 +7,7 @@ export declare class MySqlEntityCollector extends EntityCollector implements MyS
     exitDatabaseNameCreate(ctx: DatabaseNameCreateContext): void;
     /** Table Entity Rules */
     exitTableName(ctx: TableNameContext): void;
+    exitCommonTableExpressions(ctx: CommonTableExpressionsContext): void;
     /** SubQuery Table Entity Rules */
     exitAtomSubQueryTableSource(ctx: AtomSubQueryTableSourceContext): void;
     exitTableNameCreate(ctx: TableNameCreateContext): void;
@@ -19,6 +20,7 @@ export declare class MySqlEntityCollector extends EntityCollector implements MyS
     exitPureAllColumns(ctx: PureAllColumnsContext): void;
     exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
     exitSelectElement_dot_empty(ctx: SelectElement_dot_emptyContext): void;
+    exitColumnNamePath_dot_empty(ctx: ColumnNamePath_dot_emptyContext): void;
     exitSelectExpressionElement(ctx: SelectExpressionElementContext): void;
     /** ===== Statement begin */
     enterSingleStatement(ctx: SingleStatementContext): void;

package/dist/parser/mysql/mysqlEntityCollector.js

@@ -1,3 +1,4 @@
+import { TerminalNode } from 'antlr4ng';
 import { ColumnCreateTableContext, CreateDefinitionContext, CreateFunctionContext, TableSourceItemContext, AtomTableItemContext, SubqueryTableItemContext, SelectElement_labelContext, SelectElement_exprContext, } from '../../lib/mysql/MySqlParser';
 import { AttrName, ColumnDeclareType, EntityCollector, StmtContextType, TableDeclareType, } from '../common/entityCollector';
 import { EntityContextType } from '../common/types';
@@ -20,6 +21,24 @@ export class MySqlEntityCollector extends EntityCollector {
             declareType: TableDeclareType.LITERAL,
         });
     }
+    exitCommonTableExpressions(ctx) {
+        var _a, _b, _c;
+        const names = ctx.uid();
+        if (!(names === null || names === void 0 ? void 0 : names.length))
+            return;
+        const bodyEnd = (_c = (_b = (_a = ctx.dmlStatement()) === null || _a === void 0 ? void 0 : _a.stop) === null || _b === void 0 ? void 0 : _b.tokenIndex) !== null && _c !== void 0 ? _c : -1;
+        let endTokenIndex = bodyEnd;
+        for (let i = 0; i < ctx.getChildCount(); i++) {
+            const child = ctx.getChild(i);
+            if (!(child instanceof TerminalNode))
+                continue;
+            if (child.symbol.text === ')' && child.symbol.tokenIndex > bodyEnd) {
+                endTokenIndex = child.symbol.tokenIndex;
+                break;
+            }
+        }
+        this.collectCte(ctx, names[0], ctx.dmlStatement(), endTokenIndex, names.slice(1));
+    }
     /** SubQuery Table Entity Rules */
     exitAtomSubQueryTableSource(ctx) {
         this.pushEntity(ctx, EntityContextType.TABLE, [
@@ -98,6 +117,11 @@ export class MySqlEntityCollector extends EntityCollector {
             declareType: ColumnDeclareType.LITERAL,
         });
     }
+    exitColumnNamePath_dot_empty(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
     exitSelectExpressionElement(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN, [
             {

package/dist/parser/postgresql/index.js

@@ -64,7 +64,7 @@ export class PostgreSQL extends BasicSQL {
         const keywords = [];
         for (let candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case PostgreSqlParser.RULE_tableNameCreate: {
@@ -130,7 +130,8 @@ export class PostgreSQL extends BasicSQL {
                         candidateRule.ruleList.includes(PostgreSqlParser.RULE_whereClause) ||
                         candidateRule.ruleList.includes(PostgreSqlParser.RULE_havingClause) ||
                         candidateRule.ruleList.includes(PostgreSqlParser.RULE_windowClause) ||
-                        candidateRule.ruleList.includes(PostgreSqlParser.RULE_triggerWhen)) {
+                        candidateRule.ruleList.includes(PostgreSqlParser.RULE_triggerWhen) ||
+                        candidateRule.ruleList.includes(PostgreSqlParser.RULE_joinQual)) {
                         syntaxContextType = EntityContextType.COLUMN;
                     }
                     break;

package/dist/parser/postgresql/postgreEntityCollector.d.ts

@@ -1,4 +1,4 @@
-import { type AlterTableStmtContext, type ColumnCreateTableContext, type ColumnNameCreateContext, type CreateDatabaseContext, type CreateForeignTableContext, type CreateFunctionStmtContext, type CreateMaterializedViewContext, type CreatePartitionForeignTableContext, type CreateViewContext, type DatabaseNameContext, type DatabaseNameCreateContext, FuncTableContext, type FunctionNameCreateContext, type InsertStatementContext, type ProcedureNameContext, type ProcedureNameCreateContext, type QueryCreateTableContext, SelectExpressionColumnNameContext, SelectLiteralColumnNameContext, SelectNoParensContext, type SelectStatementContext, SelectWithParensContext, type SingleStmtContext, TableAllColumnsContext, type TableNameContext, type TableNameCreateContext, Target_dot_emptyContext, Target_emptyContext, TargetListContext, type ViewNameContext, type ViewNameCreateContext, XmlTableContext } from '../../lib/postgresql/PostgreSqlParser';
+import { type AlterTableStmtContext, type ColumnCreateTableContext, type CommonTableExprContext, type ColumnNameCreateContext, type CreateDatabaseContext, type CreateForeignTableContext, type CreateFunctionStmtContext, type CreateMaterializedViewContext, type CreatePartitionForeignTableContext, type CreateViewContext, type DatabaseNameContext, type DatabaseNameCreateContext, FuncTableContext, type FunctionNameCreateContext, type InsertStatementContext, type ProcedureNameContext, type ProcedureNameCreateContext, type QueryCreateTableContext, SelectExpressionColumnNameContext, SelectLiteralColumnNameContext, SelectNoParensContext, type SelectStatementContext, SelectWithParensContext, type SingleStmtContext, TableAllColumnsContext, type TableNameContext, type TableNameCreateContext, Target_dot_emptyContext, Target_emptyContext, ColumnNamePath_dot_emptyContext, TargetListContext, type ViewNameContext, type ViewNameCreateContext, XmlTableContext } from '../../lib/postgresql/PostgreSqlParser';
 import type { PostgreSqlParserListener } from '../../lib/postgresql/PostgreSqlParserListener';
 import { EntityCollector } from '../common/entityCollector';
 export declare class PostgreSqlEntityCollector extends EntityCollector implements PostgreSqlParserListener {
@@ -10,6 +10,7 @@ export declare class PostgreSqlEntityCollector extends EntityCollector implement
     exitFuncTable(ctx: FuncTableContext): void;
     exitSelectWithParens(ctx: SelectWithParensContext): void;
     exitTableNameCreate(ctx: TableNameCreateContext): void;
+    exitCommonTableExpr(ctx: CommonTableExprContext): void;
     exitViewName(ctx: ViewNameContext): void;
     exitViewNameCreate(ctx: ViewNameCreateContext): void;
     exitFunctionNameCreate(ctx: FunctionNameCreateContext): void;
@@ -18,6 +19,7 @@ export declare class PostgreSqlEntityCollector extends EntityCollector implement
     exitTableAllColumns(ctx: TableAllColumnsContext): void;
     exitTarget_empty(ctx: Target_emptyContext): void;
     exitTarget_dot_empty(ctx: Target_dot_emptyContext): void;
+    exitColumnNamePath_dot_empty(ctx: ColumnNamePath_dot_emptyContext): void;
     exitSelectExpressionColumnName(ctx: SelectExpressionColumnNameContext): void;
     exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
     exitProcedureName(ctx: ProcedureNameContext): void;

package/dist/parser/postgresql/postgreEntityCollector.js

@@ -54,6 +54,11 @@ export class PostgreSqlEntityCollector extends EntityCollector {
     exitTableNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.TABLE_CREATE);
     }
+    exitCommonTableExpr(ctx) {
+        var _a, _b, _c, _d, _e;
+        const columns = (_c = (_b = (_a = ctx.optColumnList()) === null || _a === void 0 ? void 0 : _a.columnList()) === null || _b === void 0 ? void 0 : _b.columnName()) !== null && _c !== void 0 ? _c : [];
+        this.collectCte(ctx, ctx.colId(), ctx.preParableStmt(), (_e = (_d = ctx.stop) === null || _d === void 0 ? void 0 : _d.tokenIndex) !== null && _e !== void 0 ? _e : -1, columns);
+    }
     exitViewName(ctx) {
         this.pushEntity(ctx, EntityContextType.VIEW, [
             {
@@ -105,6 +110,11 @@ export class PostgreSqlEntityCollector extends EntityCollector {
             declareType: ColumnDeclareType.LITERAL,
         });
     }
+    exitColumnNamePath_dot_empty(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
     exitSelectExpressionColumnName(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN, [
             {

package/dist/parser/spark/index.js

@@ -59,7 +59,7 @@ export class SparkSQL extends BasicSQL {
         const keywords = [];
         for (const candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case SparkSqlParser.RULE_namespaceName: {

package/dist/parser/spark/sparkEntityCollector.d.ts

@@ -1,4 +1,4 @@
-import { AtomSubQueryTableSourceContext, ColumnNameCreateContext, CreateFunctionContext, CreateNamespaceContext, CreateTableContext, CreateTableLikeContext, CreateTempViewUsingContext, CreateViewContext, FunctionNameCreateContext, FunctionTableSourceContext, InlineTableSourceContext, InsertFromQueryContext, MultipleInsertContext, NamespaceNameContext, NamespaceNameCreateContext, QueryStatementContext, ReplaceTableContext, SelectExpressionColumnNameContext, SelectListContext, SelectLiteralColumnNameContext, SingleStatementContext, TableAllColumnsContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext } from '../../lib/spark/SparkSqlParser';
+import { AtomSubQueryTableSourceContext, ColumnNameCreateContext, CreateFunctionContext, CreateNamespaceContext, CreateTableContext, CreateTableLikeContext, CreateTempViewUsingContext, CreateViewContext, FunctionNameCreateContext, FunctionTableSourceContext, InlineTableSourceContext, InsertFromQueryContext, MultipleInsertContext, NamedQueryContext, NamespaceNameContext, NamespaceNameCreateContext, QueryStatementContext, ReplaceTableContext, SelectExpressionColumnNameContext, SelectListContext, SelectLiteralColumnNameContext, SingleStatementContext, TableAllColumnsContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext } from '../../lib/spark/SparkSqlParser';
 import type { SparkSqlParserListener } from '../../lib/spark/SparkSqlParserListener';
 import { EntityCollector } from '../common/entityCollector';
 export declare class SparkEntityCollector extends EntityCollector implements SparkSqlParserListener {
@@ -14,6 +14,7 @@ export declare class SparkEntityCollector extends EntityCollector implements Spa
     /** SubQuery Table Entity Rules */
     exitAtomSubQueryTableSource(ctx: AtomSubQueryTableSourceContext): void;
     exitTableNameCreate(ctx: TableNameCreateContext): void;
+    exitNamedQuery(ctx: NamedQueryContext): void;
     exitViewName(ctx: ViewNameContext): void;
     exitSelectList(ctx: SelectListContext): void;
     exitViewNameCreate(ctx: ViewNameCreateContext): void;

package/dist/parser/spark/sparkEntityCollector.js

@@ -70,6 +70,11 @@ export class SparkEntityCollector extends EntityCollector {
             },
         ]);
     }
+    exitNamedQuery(ctx) {
+        var _a, _b, _c, _d, _e;
+        const columns = (_c = (_b = (_a = ctx.identifierList()) === null || _a === void 0 ? void 0 : _a.identifierSeq()) === null || _b === void 0 ? void 0 : _b.errorCapturingIdentifier()) !== null && _c !== void 0 ? _c : [];
+        this.collectCte(ctx, ctx.errorCapturingIdentifier(), ctx.query(), (_e = (_d = ctx.stop) === null || _d === void 0 ? void 0 : _d.tokenIndex) !== null && _e !== void 0 ? _e : -1, columns);
+    }
     exitViewName(ctx) {
         this.pushEntity(ctx, EntityContextType.VIEW);
     }

package/dist/parser/trino/index.js

@@ -56,7 +56,7 @@ export class TrinoSQL extends BasicSQL {
         const keywords = [];
         for (let candidate of candidates.rules) {
             const [ruleType, candidateRule] = candidate;
-            const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
+            const tokenRanges = this.getCandidateTokenRanges(candidates, candidateRule.startTokenIndex, allTokens, caretTokenIndex);
             let syntaxContextType = void 0;
             switch (ruleType) {
                 case TrinoSqlParser.RULE_catalogRef: {
@@ -115,9 +115,11 @@ export class TrinoSQL extends BasicSQL {
                         candidateRule.ruleList.includes(TrinoSqlParser.RULE_havingClause) ||
                         candidateRule.ruleList.includes(TrinoSqlParser.RULE_partitionBy) ||
                         candidateRule.ruleList.includes(TrinoSqlParser.RULE_whenClause) ||
-                        candidateRule.ruleList.includes(TrinoSqlParser.RULE_relation)) {
+                        candidateRule.ruleList.includes(TrinoSqlParser.RULE_relation) ||
+                        candidateRule.ruleList.includes(TrinoSqlParser.RULE_joinCriteria)) {
                         syntaxContextType = EntityContextType.COLUMN;
                     }
+                    break;
                 }
                 default:
                     break;

package/dist/parser/trino/trinoEntityCollector.d.ts

@@ -1,5 +1,5 @@
 import type { TrinoSqlListener } from '../../lib/trino/TrinoSqlListener';
-import { CatalogNameCreateContext, CatalogRefContext, ColumnNameCreateContext, CreateMaterializedViewContext, CreateSchemaContext, CreateTableAsSelectContext, CreateTableContext, CreateViewContext, ExpressionSourceTableContext, InsertIntoContext, QueryStatementContext, SchemaNameCreateContext, SchemaRefContext, SelectAllWithoutTableContext, SelectExpressionColumnNameContext, SelectListContext, SelectLiteralColumnNameContext, SingleStatementContext, TableAllColumnsContext, TableNameCreateContext, TableRefContext, ViewNameCreateContext, ViewRefContext } from '../../lib/trino/TrinoSqlParser';
+import { CatalogNameCreateContext, CatalogRefContext, ColumnNameCreateContext, CreateMaterializedViewContext, CreateSchemaContext, CreateTableAsSelectContext, CreateTableContext, CreateViewContext, ExpressionSourceTableContext, InsertIntoContext, NamedQueryContext, QueryStatementContext, SchemaNameCreateContext, SchemaRefContext, SelectAllWithoutTableContext, SelectExpressionColumnNameContext, SelectListContext, SelectLiteralColumnNameContext, SingleStatementContext, TableAllColumnsContext, TableNameCreateContext, TableRefContext, ViewNameCreateContext, ViewRefContext } from '../../lib/trino/TrinoSqlParser';
 import { EntityCollector } from '../common/entityCollector';
 export declare class TrinoEntityCollector extends EntityCollector implements TrinoSqlListener {
     /** ====== Entity Begin */
@@ -10,6 +10,7 @@ export declare class TrinoEntityCollector extends EntityCollector implements Tri
     exitTableRef(ctx: TableRefContext): void;
     exitExpressionSourceTable(ctx: ExpressionSourceTableContext): void;
     exitTableNameCreate(ctx: TableNameCreateContext): void;
+    exitNamedQuery(ctx: NamedQueryContext): void;
     exitViewRef(ctx: ViewRefContext): void;
     exitViewNameCreate(ctx: ViewNameCreateContext): void;
     exitSelectList(ctx: SelectListContext): void;

package/dist/parser/trino/trinoEntityCollector.js

@@ -43,6 +43,11 @@ export class TrinoEntityCollector extends EntityCollector {
             },
         ]);
     }
+    exitNamedQuery(ctx) {
+        var _a, _b, _c, _d;
+        const columns = (_b = (_a = ctx.columnAliases()) === null || _a === void 0 ? void 0 : _a.identifier()) !== null && _b !== void 0 ? _b : [];
+        this.collectCte(ctx, ctx.identifier(), ctx.query(), (_d = (_c = ctx.stop) === null || _c === void 0 ? void 0 : _c.tokenIndex) !== null && _d !== void 0 ? _d : -1, columns);
+    }
     exitViewRef(ctx) {
         this.pushEntity(ctx, EntityContextType.VIEW);
     }

package/package.json

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