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

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

@@ -223,7 +223,6 @@ import { NullLiteralContext } from "./TrinoSqlParser.js";
 import { RowConstructorContext } from "./TrinoSqlParser.js";
 import { SubscriptContext } from "./TrinoSqlParser.js";
 import { JsonExistsContext } from "./TrinoSqlParser.js";
-import { CoalesceContext } from "./TrinoSqlParser.js";
 import { CurrentPathContext } from "./TrinoSqlParser.js";
 import { SubqueryExpressionContext } from "./TrinoSqlParser.js";
 import { BinaryLiteralContext } from "./TrinoSqlParser.js";
@@ -1889,13 +1888,6 @@ export declare class TrinoSqlVisitor<Result> extends AbstractParseTreeVisitor<Re
      * @return the visitor result
      */
     visitJsonExists?: (ctx: JsonExistsContext) => Result;
-    /**
-     * Visit a parse tree produced by the `coalesce`
-     * labeled alternative in `TrinoSqlParser.primaryExpression`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitCoalesce?: (ctx: CoalesceContext) => Result;
     /**
      * Visit a parse tree produced by the `currentPath`
      * labeled alternative in `TrinoSqlParser.primaryExpression`.

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

@@ -95,22 +95,10 @@ export declare abstract class BasicSQL<L extends Lexer = Lexer, PRC extends Pars
     private parseWithCache;
     /**
      * Validate input string and return syntax errors if exists.
-     * When input contains multiple statements separated by semicolons
-     * and the initial parse doesn't capture all errors, each statement
-     * is validated independently to collect all errors.
      * @param input source string
      * @returns syntax errors
      */
     validate(input: string): ParseError[];
-    /**
-     * Validate each statement fragment independently and collect all errors.
-     */
-    private validateStatements;
-    /**
-     * Split input into individual statement strings by semicolons.
-     * Handles semicolons inside quoted strings correctly.
-     */
-    private splitStatements;
     /**
      * Get the input string that has been parsed.
      */

package/dist/parser/common/basicSQL.js

@@ -104,84 +104,13 @@ export class BasicSQL {
     }
     /**
      * Validate input string and return syntax errors if exists.
-     * When input contains multiple statements separated by semicolons
-     * and the initial parse doesn't capture all errors, each statement
-     * is validated independently to collect all errors.
      * @param input source string
      * @returns syntax errors
      */
     validate(input) {
         this.parseWithCache(input);
-        if (this._parseErrors.length > 0) {
-            const statements = this.splitStatements(input);
-            if (statements.length > 1) {
-                const splitErrors = this.validateStatements(statements);
-                if (splitErrors.length > this._parseErrors.length) {
-                    this._parseErrors = splitErrors;
-                }
-            }
-        }
         return this._parseErrors;
     }
-    /**
-     * Validate each statement fragment independently and collect all errors.
-     */
-    validateStatements(statements) {
-        const allErrors = [];
-        let lineOffset = 0;
-        for (const statement of statements) {
-            if (!statement.text.trim()) {
-                const newlines = (statement.text.match(/\n/g) || []).length;
-                lineOffset += newlines;
-                continue;
-            }
-            const parser = this.createParser(statement.text);
-            const errors = [];
-            parser.removeErrorListeners();
-            parser.addErrorListener(this.createErrorListener((error) => {
-                errors.push({
-                    startLine: error.startLine + lineOffset,
-                    endLine: error.endLine + lineOffset,
-                    startColumn: error.startColumn,
-                    endColumn: error.endColumn,
-                    message: error.message,
-                });
-            }));
-            parser.errorHandler = new ErrorStrategy();
-            parser.program();
-            allErrors.push(...errors);
-            const newlines = (statement.text.match(/\n/g) || []).length;
-            lineOffset += newlines;
-        }
-        return allErrors;
-    }
-    /**
-     * Split input into individual statement strings by semicolons.
-     * Handles semicolons inside quoted strings correctly.
-     */
-    splitStatements(input) {
-        const statements = [];
-        let inSingleQuote = false;
-        let inDoubleQuote = false;
-        let lastSplit = 0;
-        for (let i = 0; i < input.length; i++) {
-            const ch = input[i];
-            if (ch === "'" && !inDoubleQuote) {
-                inSingleQuote = !inSingleQuote;
-            }
-            else if (ch === '"' && !inSingleQuote) {
-                inDoubleQuote = !inDoubleQuote;
-            }
-            else if (ch === ';' && !inSingleQuote && !inDoubleQuote) {
-                statements.push({ text: input.slice(lastSplit, i + 1), start: lastSplit });
-                lastSplit = i + 1;
-            }
-        }
-        if (lastSplit < input.length) {
-            statements.push({ text: input.slice(lastSplit), start: lastSplit });
-        }
-        return statements;
-    }
     /**
      * Get the input string that has been parsed.
      */

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

@@ -1,14 +1,17 @@
 import type { GenericSqlListener } from '../../lib/generic/GenericSqlListener';
-import { AlterTableContext, ColumnDefinitionContext, ColumnRefContext, CreateTableContext, DeleteContext, DropTableContext, InsertContext, QuerySpecificationContext, QueryStatementContext, SelectItemContext, SingleStatementContext, TableNameContext, TableNameCreateContext, UpdateContext } from '../../lib/generic/GenericSqlParser';
+import { AlterTableContext, ColumnRefContext, ColumnRefCreateContext, CreateTableContext, DeleteContext, DropTableContext, InsertContext, QuerySpecificationContext, QueryStatementContext, SelectAllElementContext, SelectEmptyElementContext, SelectExpressionElementContext, SelectStarElementContext, SingleStatementContext, TableNameContext, TableNameCreateContext, UpdateContext } from '../../lib/generic/GenericSqlParser';
 import { EntityCollector } from '../common/entityCollector';
 export declare class GenericEntityCollector extends EntityCollector implements GenericSqlListener {
     /** ====== Entity Begin */
     exitTableName(ctx: TableNameContext): void;
     exitTableNameCreate(ctx: TableNameCreateContext): void;
     exitColumnRef(ctx: ColumnRefContext): void;
-    exitColumnDefinition(ctx: ColumnDefinitionContext): void;
+    exitColumnRefCreate(ctx: ColumnRefCreateContext): void;
     exitQuerySpecification(ctx: QuerySpecificationContext): void;
-    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,4 +1,4 @@
-import { ColumnDefinitionContext, CreateTableStatementContext, SelectItemContext, } from '../../lib/generic/GenericSqlParser';
+import { ColumnDefinitionContext, CreateTableStatementContext, SelectExpressionElementContext, } from '../../lib/generic/GenericSqlParser';
 import { AttrName, ColumnDeclareType, EntityCollector, StmtContextType, TableDeclareType, } from '../common/entityCollector';
 import { EntityContextType } from '../common/types';
 export class GenericEntityCollector extends EntityCollector {
@@ -19,7 +19,7 @@ export class GenericEntityCollector extends EntityCollector {
     exitColumnRef(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN);
     }
-    exitColumnDefinition(ctx) {
+    exitColumnRefCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN_CREATE, [
             {
                 attrName: AttrName.colType,
@@ -34,25 +34,33 @@ export class GenericEntityCollector extends EntityCollector {
     exitQuerySpecification(ctx) {
         this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
     }
-    exitSelectItem(ctx) {
-        if (ctx.ASTERISK()) {
-            this.pushEntity(ctx, EntityContextType.COLUMN, [], {
-                declareType: ColumnDeclareType.ALL,
-            });
-        }
-        else {
-            const isSimpleColumn = this.isSimpleColumnReference(ctx);
-            this.pushEntity(ctx, EntityContextType.COLUMN, [
-                {
-                    attrName: AttrName.alias,
-                    endContextList: [SelectItemContext.name],
-                },
-            ], {
-                declareType: isSimpleColumn
-                    ? ColumnDeclareType.LITERAL
-                    : ColumnDeclareType.EXPRESSION,
-            });
-        }
+    exitSelectExpressionElement(ctx) {
+        const isSimpleColumn = this.isSimpleColumnReference(ctx);
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [SelectExpressionElementContext.name],
+            },
+        ], {
+            declareType: isSimpleColumn
+                ? ColumnDeclareType.LITERAL
+                : ColumnDeclareType.EXPRESSION,
+        });
+    }
+    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();

package/dist/parser/generic/index.js

@@ -19,6 +19,9 @@ export class GenericSQL extends BasicSQL {
             GenericSqlParser.RULE_tableName,
             GenericSqlParser.RULE_tableNameCreate,
             GenericSqlParser.RULE_columnRef,
+            GenericSqlParser.RULE_columnRefCreate,
+            GenericSqlParser.RULE_columnName,
+            GenericSqlParser.RULE_functionName,
             ...this.excludeKeywordRules,
         ]);
         this._diagnostics = (options === null || options === void 0 ? void 0 : options.diagnostics) !== false;
@@ -68,6 +71,18 @@ export class GenericSQL extends BasicSQL {
                     syntaxContextType = EntityContextType.COLUMN;
                     break;
                 }
+                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:
                     break;
             }

package/package.json

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