dt-sql-parser 4.5.0-beta.0 → 4.5.0-beta.1

package/dist/lib/spark/SparkSqlParserListener.d.ts

@@ -131,8 +131,10 @@ import { TableNameCreateContext } from "./SparkSqlParser.js";
 import { TableNameContext } from "./SparkSqlParser.js";
 import { ViewNameCreateContext } from "./SparkSqlParser.js";
 import { ViewNameContext } from "./SparkSqlParser.js";
+import { EmptyColumnContext } from "./SparkSqlParser.js";
 import { ColumnNameContext } from "./SparkSqlParser.js";
 import { ColumnNamePathContext } from "./SparkSqlParser.js";
+import { ColumnNamePathAllowEmptyContext } from "./SparkSqlParser.js";
 import { ColumnNameSeqContext } from "./SparkSqlParser.js";
 import { ColumnNameCreateContext } from "./SparkSqlParser.js";
 import { IdentifierReferenceContext } from "./SparkSqlParser.js";
@@ -206,6 +208,7 @@ import { TableAliasContext } from "./SparkSqlParser.js";
 import { RowFormatContext } from "./SparkSqlParser.js";
 import { MultipartIdentifierListContext } from "./SparkSqlParser.js";
 import { MultipartIdentifierContext } from "./SparkSqlParser.js";
+import { MultipartIdentifierAllowEmptyContext } from "./SparkSqlParser.js";
 import { MultipartIdentifierPropertyListContext } from "./SparkSqlParser.js";
 import { MultipartIdentifierPropertyContext } from "./SparkSqlParser.js";
 import { TableIdentifierContext } from "./SparkSqlParser.js";
@@ -1796,6 +1799,16 @@ export declare class SparkSqlParserListener implements ParseTreeListener {
      * @param ctx the parse tree
      */
     exitViewName?: (ctx: ViewNameContext) => void;
+    /**
+     * Enter a parse tree produced by `SparkSqlParser.emptyColumn`.
+     * @param ctx the parse tree
+     */
+    enterEmptyColumn?: (ctx: EmptyColumnContext) => void;
+    /**
+     * Exit a parse tree produced by `SparkSqlParser.emptyColumn`.
+     * @param ctx the parse tree
+     */
+    exitEmptyColumn?: (ctx: EmptyColumnContext) => void;
     /**
      * Enter a parse tree produced by `SparkSqlParser.columnName`.
      * @param ctx the parse tree
@@ -1816,6 +1829,16 @@ export declare class SparkSqlParserListener implements ParseTreeListener {
      * @param ctx the parse tree
      */
     exitColumnNamePath?: (ctx: ColumnNamePathContext) => void;
+    /**
+     * Enter a parse tree produced by `SparkSqlParser.columnNamePathAllowEmpty`.
+     * @param ctx the parse tree
+     */
+    enterColumnNamePathAllowEmpty?: (ctx: ColumnNamePathAllowEmptyContext) => void;
+    /**
+     * Exit a parse tree produced by `SparkSqlParser.columnNamePathAllowEmpty`.
+     * @param ctx the parse tree
+     */
+    exitColumnNamePathAllowEmpty?: (ctx: ColumnNamePathAllowEmptyContext) => void;
     /**
      * Enter a parse tree produced by `SparkSqlParser.columnNameSeq`.
      * @param ctx the parse tree
@@ -2556,6 +2579,16 @@ export declare class SparkSqlParserListener implements ParseTreeListener {
      * @param ctx the parse tree
      */
     exitMultipartIdentifier?: (ctx: MultipartIdentifierContext) => void;
+    /**
+     * Enter a parse tree produced by `SparkSqlParser.multipartIdentifierAllowEmpty`.
+     * @param ctx the parse tree
+     */
+    enterMultipartIdentifierAllowEmpty?: (ctx: MultipartIdentifierAllowEmptyContext) => void;
+    /**
+     * Exit a parse tree produced by `SparkSqlParser.multipartIdentifierAllowEmpty`.
+     * @param ctx the parse tree
+     */
+    exitMultipartIdentifierAllowEmpty?: (ctx: MultipartIdentifierAllowEmptyContext) => void;
     /**
      * Enter a parse tree produced by `SparkSqlParser.multipartIdentifierPropertyList`.
      * @param ctx the parse tree

package/dist/lib/spark/SparkSqlParserVisitor.d.ts

@@ -131,8 +131,10 @@ import { TableNameCreateContext } from "./SparkSqlParser.js";
 import { TableNameContext } from "./SparkSqlParser.js";
 import { ViewNameCreateContext } from "./SparkSqlParser.js";
 import { ViewNameContext } from "./SparkSqlParser.js";
+import { EmptyColumnContext } from "./SparkSqlParser.js";
 import { ColumnNameContext } from "./SparkSqlParser.js";
 import { ColumnNamePathContext } from "./SparkSqlParser.js";
+import { ColumnNamePathAllowEmptyContext } from "./SparkSqlParser.js";
 import { ColumnNameSeqContext } from "./SparkSqlParser.js";
 import { ColumnNameCreateContext } from "./SparkSqlParser.js";
 import { IdentifierReferenceContext } from "./SparkSqlParser.js";
@@ -206,6 +208,7 @@ import { TableAliasContext } from "./SparkSqlParser.js";
 import { RowFormatContext } from "./SparkSqlParser.js";
 import { MultipartIdentifierListContext } from "./SparkSqlParser.js";
 import { MultipartIdentifierContext } from "./SparkSqlParser.js";
+import { MultipartIdentifierAllowEmptyContext } from "./SparkSqlParser.js";
 import { MultipartIdentifierPropertyListContext } from "./SparkSqlParser.js";
 import { MultipartIdentifierPropertyContext } from "./SparkSqlParser.js";
 import { TableIdentifierContext } from "./SparkSqlParser.js";
@@ -1175,6 +1178,12 @@ export declare class SparkSqlParserVisitor<Result> extends AbstractParseTreeVisi
      * @return the visitor result
      */
     visitViewName?: (ctx: ViewNameContext) => Result;
+    /**
+     * Visit a parse tree produced by `SparkSqlParser.emptyColumn`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitEmptyColumn?: (ctx: EmptyColumnContext) => Result;
     /**
      * Visit a parse tree produced by `SparkSqlParser.columnName`.
      * @param ctx the parse tree
@@ -1187,6 +1196,12 @@ export declare class SparkSqlParserVisitor<Result> extends AbstractParseTreeVisi
      * @return the visitor result
      */
     visitColumnNamePath?: (ctx: ColumnNamePathContext) => Result;
+    /**
+     * Visit a parse tree produced by `SparkSqlParser.columnNamePathAllowEmpty`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitColumnNamePathAllowEmpty?: (ctx: ColumnNamePathAllowEmptyContext) => Result;
     /**
      * Visit a parse tree produced by `SparkSqlParser.columnNameSeq`.
      * @param ctx the parse tree
@@ -1630,6 +1645,12 @@ export declare class SparkSqlParserVisitor<Result> extends AbstractParseTreeVisi
      * @return the visitor result
      */
     visitMultipartIdentifier?: (ctx: MultipartIdentifierContext) => Result;
+    /**
+     * Visit a parse tree produced by `SparkSqlParser.multipartIdentifierAllowEmpty`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitMultipartIdentifierAllowEmpty?: (ctx: MultipartIdentifierAllowEmptyContext) => Result;
     /**
      * Visit a parse tree produced by `SparkSqlParser.multipartIdentifierPropertyList`.
      * @param ctx the parse tree

package/dist/parser/common/basicSQL.d.ts

@@ -1,13 +1,13 @@
-import { Lexer, Token, CommonTokenStream, CharStream, ParserRuleContext, ParseTreeListener, ANTLRErrorListener, Parser } from 'antlr4ng';
 import { CandidatesCollection } from 'antlr4-c3';
+import { ANTLRErrorListener, CharStream, CommonTokenStream, Lexer, Parser, ParserRuleContext, ParseTreeListener, Token } from 'antlr4ng';
 import { SQLParserBase } from '../../lib/SQLParserBase';
-import { TextSlice } from './textAndWord';
-import { CaretPosition, LOCALE_TYPE, SemanticCollectOptions, Suggestions } from './types';
-import { ParseError, ErrorListener } from './parseErrorListener';
-import type { SplitListener } from './splitListener';
 import type { EntityCollector } from './entityCollector';
 import { EntityContext } from './entityCollector';
+import { ErrorListener, ParseError } from './parseErrorListener';
 import SemanticContextCollector from './semanticContextCollector';
+import type { SplitListener } from './splitListener';
+import { TextSlice } from './textAndWord';
+import { CaretPosition, LOCALE_TYPE, SemanticCollectOptions, Suggestions } from './types';
 export declare const SQL_SPLIT_SYMBOL_TEXT = ";";
 /**
  * Basic SQL class, every sql needs extends it.

package/dist/parser/common/basicSQL.js

@@ -1,8 +1,8 @@
-import { CharStreams, CommonTokenStream, ParseTreeWalker, PredictionMode, } from 'antlr4ng';
 import { CodeCompletionCore } from 'antlr4-c3';
+import { CharStreams, CommonTokenStream, ParseTreeWalker, PredictionMode, } from 'antlr4ng';
+import { ErrorStrategy } from './errorStrategy';
 import { findCaretTokenIndex } from './findCaretTokenIndex';
 import { ctxToText, tokenToWord } from './textAndWord';
-import { ErrorStrategy } from './errorStrategy';
 export const SQL_SPLIT_SYMBOL_TEXT = ';';
 /**
  * Basic SQL class, every sql needs extends it.
@@ -360,7 +360,7 @@ export class BasicSQL {
         const core = new CodeCompletionCore(sqlParserIns);
         core.preferredRules = this.preferredRules;
         // core.showRuleStack = true;
-        //  core.showResult = true;
+        // core.showResult = true;
         const candidates = core.collectCandidates(caretTokenIndex, parseTree);
         const originalSuggestions = this.processCandidates(candidates, allTokens, caretTokenIndex);
         const syntaxSuggestions = originalSuggestions.syntax.map((syntaxCtx) => {

package/dist/parser/common/entityCollector.js

@@ -436,8 +436,20 @@ export class EntityCollector {
         }
         else {
             // Do not collect column and queryResult entities if they are not inside a select statement
-            return entitiesInsideStmt.filter((entity) => entity.entityContextType !== EntityContextType.COLUMN &&
-                entity.entityContextType !== EntityContextType.QUERY_RESULT);
+            // Exception: empty column entities (text === '') should be kept
+            return entitiesInsideStmt.filter((entity) => {
+                // Keep non-COLUMN and non-QUERY_RESULT entities
+                if (entity.entityContextType !== EntityContextType.COLUMN &&
+                    entity.entityContextType !== EntityContextType.QUERY_RESULT) {
+                    return true;
+                }
+                // Also keep empty QUERY_RESULT entities (text === '')
+                if (entity.entityContextType === EntityContextType.QUERY_RESULT &&
+                    entity.text === '') {
+                    return true;
+                }
+                return false;
+            });
         }
     }
     combineQueryResultStmtEntities(stmtContext, entitiesInsideStmt) {

package/dist/parser/flink/index.js

@@ -36,6 +36,7 @@ export class FlinkSQL extends BasicSQL {
             FlinkSqlParser.RULE_functionNameCreate, // functionName that will be created
             FlinkSqlParser.RULE_columnName,
             FlinkSqlParser.RULE_columnNamePath,
+            FlinkSqlParser.RULE_columnNamePathAllowEmpty,
             FlinkSqlParser.RULE_columnNameCreate,
             FlinkSqlParser.RULE_tablePropertyKey,
             FlinkSqlParser.RULE_tablePropertyValue,
@@ -116,13 +117,15 @@ export class FlinkSQL extends BasicSQL {
                     syntaxContextType = EntityContextType.COLUMN_CREATE;
                     break;
                 }
-                case FlinkSqlParser.RULE_columnNamePath: {
+                case FlinkSqlParser.RULE_columnNamePath:
+                case FlinkSqlParser.RULE_columnNamePathAllowEmpty: {
                     if (candidateRule.ruleList.includes(FlinkSqlParser.RULE_selectClause) ||
                         candidateRule.ruleList.includes(FlinkSqlParser.RULE_whereClause) ||
                         candidateRule.ruleList.includes(FlinkSqlParser.RULE_groupByClause) ||
                         candidateRule.ruleList.includes(FlinkSqlParser.RULE_limitClause) ||
                         candidateRule.ruleList.includes(FlinkSqlParser.RULE_whenClause) ||
-                        candidateRule.ruleList.includes(FlinkSqlParser.RULE_havingClause)) {
+                        candidateRule.ruleList.includes(FlinkSqlParser.RULE_havingClause) ||
+                        candidateRule.ruleList.includes(FlinkSqlParser.RULE_joinCondition)) {
                         syntaxContextType = EntityContextType.COLUMN;
                     }
                     break;

package/dist/parser/mysql/index.js

@@ -25,6 +25,7 @@ export class MySQL extends BasicSQL {
             MySqlParser.RULE_functionName,
             MySqlParser.RULE_functionNameCreate,
             MySqlParser.RULE_columnName,
+            MySqlParser.RULE_columnNamePath,
             MySqlParser.RULE_columnNameCreate,
             ...this.excludeKeywordRules,
         ]);
@@ -88,7 +89,8 @@ export class MySQL extends BasicSQL {
                     syntaxContextType = EntityContextType.FUNCTION_CREATE;
                     break;
                 }
-                case MySqlParser.RULE_columnName: {
+                case MySqlParser.RULE_columnName:
+                case MySqlParser.RULE_columnNamePath: {
                     syntaxContextType = EntityContextType.COLUMN;
                     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, SelectExpressionElementContext, SelectStatementContext, SingleStatementContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext, TableAllColumnsContext, SelectLiteralColumnNameContext, AtomSubQueryTableSourceContext, SelectElementsContext, PureAllColumnsContext } 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, PureAllColumnsContext, SelectElement_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 {
@@ -18,6 +18,7 @@ export declare class MySqlEntityCollector extends EntityCollector implements MyS
     exitTableAllColumns(ctx: TableAllColumnsContext): void;
     exitPureAllColumns(ctx: PureAllColumnsContext): void;
     exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
+    exitSelectElement_dot_empty(ctx: SelectElement_dot_emptyContext): void;
     exitSelectExpressionElement(ctx: SelectExpressionElementContext): void;
     /** ===== Statement begin */
     enterSingleStatement(ctx: SingleStatementContext): void;

package/dist/parser/mysql/mysqlEntityCollector.js

@@ -1,4 +1,4 @@
-import { ColumnCreateTableContext, CreateDefinitionContext, CreateFunctionContext, SelectElementContext, TableSourceItemContext, AtomTableItemContext, SubqueryTableItemContext, } from '../../lib/mysql/MySqlParser';
+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';
 export class MySqlEntityCollector extends EntityCollector {
@@ -79,20 +79,30 @@ export class MySqlEntityCollector extends EntityCollector {
         });
     }
     exitSelectLiteralColumnName(ctx) {
+        // Handle empty column case (e.g., "select  from")
+        // When emptyColumn matches, the context has no actual tokens
+        if (!ctx.start || !ctx.stop || ctx.start.start > ctx.stop.stop) {
+            return;
+        }
         this.pushEntity(ctx, EntityContextType.COLUMN, [
             {
                 attrName: AttrName.alias,
-                endContextList: [SelectElementContext.name],
+                endContextList: [SelectElement_labelContext.name],
             },
         ], {
             declareType: ColumnDeclareType.LITERAL,
         });
     }
+    exitSelectElement_dot_empty(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
     exitSelectExpressionElement(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN, [
             {
                 attrName: AttrName.alias,
-                endContextList: [SelectElementContext.name],
+                endContextList: [SelectElement_exprContext.name],
             },
         ], {
             declareType: ColumnDeclareType.EXPRESSION,

package/dist/parser/mysql/mysqlErrorListener.js

@@ -14,6 +14,7 @@ export class MysqlErrorListener extends ParseErrorListener {
             [MySqlParser.RULE_functionName, 'function'],
             [MySqlParser.RULE_functionNameCreate, 'function'],
             [MySqlParser.RULE_columnName, 'column'],
+            [MySqlParser.RULE_columnNamePath, 'column'],
             [MySqlParser.RULE_columnNameCreate, 'column'],
         ]);
     }
@@ -48,6 +49,7 @@ export class MysqlErrorListener extends ParseErrorListener {
                     case MySqlParser.RULE_tableName:
                     case MySqlParser.RULE_functionName:
                     case MySqlParser.RULE_viewName:
+                    case MySqlParser.RULE_columnNamePath:
                     case MySqlParser.RULE_columnName: {
                         if (!result.includes(`{existing}${name}`)) {
                             result.push(`{existing}${name}`);

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, type FunctionNameCreateContext, type InsertStatementContext, type ProcedureNameContext, type ProcedureNameCreateContext, type QueryCreateTableContext, SelectExpressionColumnNameContext, SelectLiteralColumnNameContext, type SelectStatementContext, type SingleStmtContext, TableAllColumnsContext, type TableNameContext, type TableNameCreateContext, type ViewNameContext, type ViewNameCreateContext, TargetListContext, SelectNoParensContext, XmlTableContext, FuncTableContext, SelectWithParensContext } from '../../lib/postgresql/PostgreSqlParser';
+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 { PostgreSqlParserListener } from '../../lib/postgresql/PostgreSqlParserListener';
 import { EntityCollector } from '../common/entityCollector';
 export declare class PostgreSqlEntityCollector extends EntityCollector implements PostgreSqlParserListener {
@@ -16,6 +16,8 @@ export declare class PostgreSqlEntityCollector extends EntityCollector implement
     exitColumnNameCreate(ctx: ColumnNameCreateContext): void;
     exitTargetList(ctx: TargetListContext): void;
     exitTableAllColumns(ctx: TableAllColumnsContext): void;
+    exitTarget_empty(ctx: Target_emptyContext): void;
+    exitTarget_dot_empty(ctx: Target_dot_emptyContext): void;
     exitSelectExpressionColumnName(ctx: SelectExpressionColumnNameContext): void;
     exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
     exitProcedureName(ctx: ProcedureNameContext): void;

package/dist/parser/postgresql/postgreEntityCollector.js

@@ -81,6 +81,7 @@ export class PostgreSqlEntityCollector extends EntityCollector {
         ]);
     }
     exitTargetList(ctx) {
+        // Only create QUERY_RESULT for targetList that is direct child of simpleSelect
         if (!isChildContextOf(ctx, PostgreSqlParser.RULE_simpleSelect))
             return;
         this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
@@ -92,6 +93,18 @@ export class PostgreSqlEntityCollector extends EntityCollector {
             declareType: ColumnDeclareType.ALL,
         });
     }
+    exitTarget_empty(ctx) {
+        // Don't create entity for empty column here
+        // The targetList will create QUERY_RESULT entity
+        // Empty targetEl means the QUERY_RESULT has no columns
+    }
+    exitTarget_dot_empty(ctx) {
+        // Create COLUMN entity for incomplete column reference (e.g., "tb.|")
+        // This allows completion to suggest columns from table "tb"
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
     exitSelectExpressionColumnName(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN, [
             {

package/dist/parser/spark/index.js

@@ -30,6 +30,7 @@ export class SparkSQL extends BasicSQL {
             SparkSqlParser.RULE_functionNameCreate,
             SparkSqlParser.RULE_columnName,
             SparkSqlParser.RULE_columnNamePath,
+            SparkSqlParser.RULE_columnNamePathAllowEmpty,
             SparkSqlParser.RULE_columnNameCreate,
             ...this.excludeKeywordRules,
         ]);
@@ -101,7 +102,8 @@ export class SparkSQL extends BasicSQL {
                     syntaxContextType = EntityContextType.COLUMN_CREATE;
                     break;
                 }
-                case SparkSqlParser.RULE_columnNamePath: {
+                case SparkSqlParser.RULE_columnNamePath:
+                case SparkSqlParser.RULE_columnNamePathAllowEmpty: {
                     if (candidateRule.ruleList.includes(SparkSqlParser.RULE_whenClause) ||
                         candidateRule.ruleList.includes(SparkSqlParser.RULE_whereClause) ||
                         candidateRule.ruleList.includes(SparkSqlParser.RULE_joinRelation) ||

package/package.json

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