dt-sql-parser 4.0.1 → 4.0.3-beta.0

package/dist/parser/common/basicSQL.js

@@ -140,9 +140,6 @@ export class BasicSQL {
             return null;
         }
         const splitListener = this.splitListener;
-        // TODO: add splitListener to all sqlParser implements and remove following if
-        if (!splitListener)
-            return null;
         this.listen(splitListener, this._parseTree);
         const res = splitListener.statementsContext
             .map((context) => {
@@ -160,9 +157,6 @@ export class BasicSQL {
     getSuggestionAtCaretPosition(input, caretPosition) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const splitListener = this.splitListener;
-        // TODO: add splitListener to all sqlParser implements and remove following if
-        if (!splitListener)
-            return null;
         this.parseWithCache(input);
         if (!this._parseTree)
             return null;
@@ -261,10 +255,6 @@ export class BasicSQL {
             ? findCaretTokenIndex(caretPosition, allTokens)
             : void 0;
         const collectListener = this.createEntityCollector(input, caretTokenIndex);
-        // TODO: add entityCollector to all sqlParser implements and remove following if
-        if (!collectListener) {
-            return null;
-        }
         // const parser = this.createParserWithCache(input);
         // parser.entityCollecting = true;
         // if(caretPosition) {

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

@@ -13,7 +13,8 @@ export declare enum StmtContextType {
     CREATE_VIEW_STMT = "createViewStmt",
     SELECT_STMT = "selectStmt",
     INSERT_STMT = "insertStmt",
-    CREATE_FUNCTION_STMT = "createFunctionStmt"
+    CREATE_FUNCTION_STMT = "createFunctionStmt",
+    ALTER_TABLE_STMT = "alterTableStmt"
 }
 export interface StmtContext {
     readonly stmtContextType: StmtContextType;

package/dist/parser/common/entityCollector.js

@@ -26,6 +26,7 @@ export var StmtContextType;
     StmtContextType["SELECT_STMT"] = "selectStmt";
     StmtContextType["INSERT_STMT"] = "insertStmt";
     StmtContextType["CREATE_FUNCTION_STMT"] = "createFunctionStmt";
+    StmtContextType["ALTER_TABLE_STMT"] = "alterTableStmt";
 })(StmtContextType || (StmtContextType = {}));
 export function toStmtContext(ctx, type, input, rootStmt, parentStmt, isContainCaret) {
     const text = ctxToText(ctx, input);

package/dist/parser/flink/index.js

@@ -9,15 +9,15 @@ export class FlinkSQL extends BasicSQL {
     constructor() {
         super(...arguments);
         this.preferredRules = new Set([
-            FlinkSqlParser.RULE_catalogPath,
-            FlinkSqlParser.RULE_databasePath,
-            FlinkSqlParser.RULE_databasePathCreate,
-            FlinkSqlParser.RULE_tablePath,
-            FlinkSqlParser.RULE_tablePathCreate,
-            FlinkSqlParser.RULE_viewPath,
-            FlinkSqlParser.RULE_viewPathCreate,
-            FlinkSqlParser.RULE_functionName,
-            FlinkSqlParser.RULE_functionNameCreate,
+            FlinkSqlParser.RULE_catalogPath, // catalog name
+            FlinkSqlParser.RULE_databasePath, // database name
+            FlinkSqlParser.RULE_databasePathCreate, // database name that will be created
+            FlinkSqlParser.RULE_tablePath, // table name
+            FlinkSqlParser.RULE_tablePathCreate, // table name that will be created
+            FlinkSqlParser.RULE_viewPath, // view name path
+            FlinkSqlParser.RULE_viewPathCreate, // viewName that will be created
+            FlinkSqlParser.RULE_functionName, // functionName
+            FlinkSqlParser.RULE_functionNameCreate, // functionName that will be created
             FlinkSqlParser.RULE_columnName,
             FlinkSqlParser.RULE_columnNameCreate,
         ]);

package/dist/parser/hive/index.js

@@ -9,15 +9,15 @@ export class HiveSQL extends BasicSQL {
     constructor() {
         super(...arguments);
         this.preferredRules = new Set([
-            HiveSqlParser.RULE_dbSchemaName,
-            HiveSqlParser.RULE_dbSchemaNameCreate,
-            HiveSqlParser.RULE_tableName,
-            HiveSqlParser.RULE_tableNameCreate,
-            HiveSqlParser.RULE_viewName,
-            HiveSqlParser.RULE_viewNameCreate,
-            HiveSqlParser.RULE_functionNameForDDL,
-            HiveSqlParser.RULE_functionNameForInvoke,
-            HiveSqlParser.RULE_functionNameCreate,
+            HiveSqlParser.RULE_dbSchemaName, // db or schema name
+            HiveSqlParser.RULE_dbSchemaNameCreate, // db or schema name that will be created
+            HiveSqlParser.RULE_tableName, // table name
+            HiveSqlParser.RULE_tableNameCreate, // table name that will be created
+            HiveSqlParser.RULE_viewName, // view name
+            HiveSqlParser.RULE_viewNameCreate, // view name that will be created
+            HiveSqlParser.RULE_functionNameForDDL, // function name
+            HiveSqlParser.RULE_functionNameForInvoke, // function name
+            HiveSqlParser.RULE_functionNameCreate, // function name that will be created
             HiveSqlParser.RULE_columnName,
             HiveSqlParser.RULE_columnNameCreate,
         ]);

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

@@ -1,4 +1,4 @@
-import type { ColumnCreateTableContext, ColumnNameCreateContext, CopyCreateTableContext, CreateDatabaseContext, CreateFunctionContext, CreateViewContext, DatabaseNameContext, DatabaseNameCreateContext, FunctionNameCreateContext, InsertStatementContext, QueryCreateTableContext, SelectStatementContext, SingleStatementContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext } from '../../lib/mysql/MySqlParser';
+import type { ColumnCreateTableContext, ColumnNameCreateContext, CopyCreateTableContext, CreateDatabaseContext, CreateFunctionContext, CreateFunctionLoadableContext, CreateViewContext, DatabaseNameContext, DatabaseNameCreateContext, FunctionNameCreateContext, InsertStatementContext, QueryCreateTableContext, SelectStatementContext, SingleStatementContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext } from '../../lib/mysql/MySqlParser';
 import type { MySqlParserListener } from '../../lib/mysql/MySqlParserListener';
 import { EntityCollector } from '../common/entityCollector';
 export declare class MySqlEntityCollector extends EntityCollector implements MySqlParserListener {
@@ -34,4 +34,6 @@ export declare class MySqlEntityCollector extends EntityCollector implements MyS
     exitCreateDatabase(ctx: CreateDatabaseContext): void;
     enterCreateFunction(ctx: CreateFunctionContext): void;
     exitCreateFunction(ctx: CreateFunctionContext): void;
+    enterCreateFunctionLoadable(ctx: CreateFunctionLoadableContext): void;
+    exitCreateFunctionLoadable(ctx: CreateFunctionLoadableContext): void;
 }

package/dist/parser/mysql/mysqlEntityCollector.js

@@ -93,4 +93,10 @@ export class MySqlEntityCollector extends EntityCollector {
     exitCreateFunction(ctx) {
         this.popStmt();
     }
+    enterCreateFunctionLoadable(ctx) {
+        this.pushStmt(ctx, StmtContextType.CREATE_FUNCTION_STMT);
+    }
+    exitCreateFunctionLoadable(ctx) {
+        this.popStmt();
+    }
 }

package/dist/parser/postgresql/index.js

@@ -9,19 +9,19 @@ export class PostgreSQL extends BasicSQL {
     constructor() {
         super(...arguments);
         this.preferredRules = new Set([
-            PostgreSqlParser.RULE_table_name_create,
-            PostgreSqlParser.RULE_table_name,
-            PostgreSqlParser.RULE_function_name,
-            PostgreSqlParser.RULE_function_name_create,
-            PostgreSqlParser.RULE_schema_name_create,
-            PostgreSqlParser.RULE_schema_name,
-            PostgreSqlParser.RULE_view_name_create,
-            PostgreSqlParser.RULE_view_name,
-            PostgreSqlParser.RULE_database_name_create,
-            PostgreSqlParser.RULE_database_name,
-            PostgreSqlParser.RULE_procedure_name_create,
-            PostgreSqlParser.RULE_procedure_name,
-            PostgreSqlParser.RULE_column_name_create,
+            PostgreSqlParser.RULE_table_name_create, // table name
+            PostgreSqlParser.RULE_table_name, // table name that will be created
+            PostgreSqlParser.RULE_function_name, // function name
+            PostgreSqlParser.RULE_function_name_create, // function name that will be created
+            PostgreSqlParser.RULE_schema_name_create, // schema name that will be created
+            PostgreSqlParser.RULE_schema_name, // schema name
+            PostgreSqlParser.RULE_view_name_create, // view name that will be created
+            PostgreSqlParser.RULE_view_name, // view name
+            PostgreSqlParser.RULE_database_name_create, // database name that will be created
+            PostgreSqlParser.RULE_database_name, // database name
+            PostgreSqlParser.RULE_procedure_name_create, // procedure name that will be created
+            PostgreSqlParser.RULE_procedure_name, // procedure name
+            PostgreSqlParser.RULE_column_name_create, // column name that will be created
             PostgreSqlParser.RULE_column_name, // column name
         ]);
     }

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

@@ -1,4 +1,4 @@
-import type { ColumnCreateTableContext, ColumnNameCreateContext, CreateDatabaseContext, CreateForeignTableContext, CreateMaterializedViewContext, CreatePartitionForeignTableContext, CreateViewContext, CreatefunctionstmtContext, DatabaseNameContext, DatabaseNameCreateContext, FunctionNameCreateContext, InsertStatementContext, QueryCreateTableContext, SelectStatementContext, SingleStmtContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext } from '../../lib/postgresql/PostgreSqlParser';
+import type { AltertablestmtContext, ColumnCreateTableContext, ColumnNameCreateContext, CreateDatabaseContext, CreateForeignTableContext, CreateMaterializedViewContext, CreatePartitionForeignTableContext, CreateViewContext, CreatefunctionstmtContext, DatabaseNameContext, DatabaseNameCreateContext, FunctionNameCreateContext, InsertStatementContext, QueryCreateTableContext, SelectStatementContext, SingleStmtContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext } from '../../lib/postgresql/PostgreSqlParser';
 import type { PostgreSqlParserListener } from '../../lib/postgresql/PostgreSqlParserListener';
 import { EntityCollector } from '../common/entityCollector';
 export declare class PostgreSqlEntityCollector extends EntityCollector implements PostgreSqlParserListener {
@@ -34,4 +34,6 @@ export declare class PostgreSqlEntityCollector extends EntityCollector implement
     exitInsertStatement(ctx: InsertStatementContext): void;
     enterCreatefunctionstmt(ctx: CreatefunctionstmtContext): void;
     exitCreatefunctionstmt(ctx: CreatefunctionstmtContext): void;
+    enterAltertablestmt(ctx: AltertablestmtContext): void;
+    exitAltertablestmt(ctx: AltertablestmtContext): void;
 }

package/dist/parser/postgresql/postgreEntityCollector.js

@@ -93,4 +93,10 @@ export class PostgreSqlEntityCollector extends EntityCollector {
     exitCreatefunctionstmt(ctx) {
         this.popStmt();
     }
+    enterAltertablestmt(ctx) {
+        this.pushStmt(ctx, StmtContextType.ALTER_TABLE_STMT);
+    }
+    exitAltertablestmt(ctx) {
+        this.popStmt();
+    }
 }

package/dist/parser/trino/index.js

@@ -9,16 +9,17 @@ export class TrinoSQL extends BasicSQL {
     constructor() {
         super(...arguments);
         this.preferredRules = new Set([
-            TrinoSqlParser.RULE_catalogName,
+            TrinoSqlParser.RULE_catalogRef,
             TrinoSqlParser.RULE_catalogNameCreate,
-            TrinoSqlParser.RULE_schemaName,
+            TrinoSqlParser.RULE_schemaRef,
             TrinoSqlParser.RULE_schemaNameCreate,
-            TrinoSqlParser.RULE_tableName,
+            TrinoSqlParser.RULE_tableRef,
             TrinoSqlParser.RULE_tableNameCreate,
-            TrinoSqlParser.RULE_viewName,
+            TrinoSqlParser.RULE_viewRef,
             TrinoSqlParser.RULE_viewNameCreate,
             TrinoSqlParser.RULE_functionName,
-            TrinoSqlParser.RULE_columnName,
+            TrinoSqlParser.RULE_functionNameCreate,
+            TrinoSqlParser.RULE_columnRef,
             TrinoSqlParser.RULE_columnNameCreate,
         ]);
     }
@@ -43,11 +44,15 @@ export class TrinoSQL extends BasicSQL {
             const tokenRanges = allTokens.slice(startTokenIndex, caretTokenIndex + tokenIndexOffset + 1);
             let syntaxContextType = void 0;
             switch (ruleType) {
-                case TrinoSqlParser.RULE_catalogName: {
+                case TrinoSqlParser.RULE_catalogRef: {
                     syntaxContextType = EntityContextType.CATALOG;
                     break;
                 }
-                case TrinoSqlParser.RULE_schemaName: {
+                case TrinoSqlParser.RULE_catalogNameCreate: {
+                    syntaxContextType = EntityContextType.CATALOG_CREATE;
+                    break;
+                }
+                case TrinoSqlParser.RULE_schemaRef: {
                     syntaxContextType = EntityContextType.DATABASE;
                     break;
                 }
@@ -55,7 +60,7 @@ export class TrinoSQL extends BasicSQL {
                     syntaxContextType = EntityContextType.DATABASE_CREATE;
                     break;
                 }
-                case TrinoSqlParser.RULE_tableName: {
+                case TrinoSqlParser.RULE_tableRef: {
                     syntaxContextType = EntityContextType.TABLE;
                     break;
                 }
@@ -63,7 +68,7 @@ export class TrinoSQL extends BasicSQL {
                     syntaxContextType = EntityContextType.TABLE_CREATE;
                     break;
                 }
-                case TrinoSqlParser.RULE_viewName: {
+                case TrinoSqlParser.RULE_viewRef: {
                     syntaxContextType = EntityContextType.VIEW;
                     break;
                 }
@@ -75,11 +80,15 @@ export class TrinoSQL extends BasicSQL {
                     syntaxContextType = EntityContextType.FUNCTION;
                     break;
                 }
+                case TrinoSqlParser.RULE_functionNameCreate: {
+                    syntaxContextType = EntityContextType.FUNCTION_CREATE;
+                    break;
+                }
                 case TrinoSqlParser.RULE_columnNameCreate: {
                     syntaxContextType = EntityContextType.COLUMN_CREATE;
                     break;
                 }
-                case TrinoSqlParser.RULE_columnName: {
+                case TrinoSqlParser.RULE_columnRef: {
                     syntaxContextType = EntityContextType.COLUMN;
                     break;
                 }

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

@@ -1,13 +1,15 @@
-import type { ColumnNameCreateContext, CreateMaterializedViewContext, CreateSchemaContext, CreateTableAsSelectContext, CreateTableContext, CreateViewContext, InsertIntoContext, QueryStatementContext, SchemaNameContext, SchemaNameCreateContext, SingleStatementContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext } from '../../lib/trino/TrinoSqlParser';
+import type { CatalogNameCreateContext, CatalogRefContext, ColumnNameCreateContext, CreateMaterializedViewContext, CreateSchemaContext, CreateTableAsSelectContext, CreateTableContext, CreateViewContext, InsertIntoContext, SchemaNameCreateContext, SchemaRefContext, SingleStatementContext, TableNameCreateContext, TableRefContext, ViewNameCreateContext, ViewRefContext, QueryStatementContext } from '../../lib/trino/TrinoSqlParser';
 import type { TrinoSqlListener } from '../../lib/trino/TrinoSqlListener';
 import { EntityCollector } from '../common/entityCollector';
 export declare class TrinoEntityCollector extends EntityCollector implements TrinoSqlListener {
     /** ====== Entity Begin */
-    exitSchemaName(ctx: SchemaNameContext): void;
+    exitCatalogRef(ctx: CatalogRefContext): void;
+    exitCatalogNameCreate(ctx: CatalogNameCreateContext): void;
+    exitSchemaRef(ctx: SchemaRefContext): void;
     exitSchemaNameCreate(ctx: SchemaNameCreateContext): void;
-    exitTableName(ctx: TableNameContext): void;
+    exitTableRef(ctx: TableRefContext): void;
     exitTableNameCreate(ctx: TableNameCreateContext): void;
-    exitViewName(ctx: ViewNameContext): void;
+    exitViewRef(ctx: ViewRefContext): void;
     exitViewNameCreate(ctx: ViewNameCreateContext): void;
     exitColumnNameCreate(ctx: ColumnNameCreateContext): void;
     /** ===== Statement begin */

package/dist/parser/trino/trinoEntityCollector.js

@@ -2,19 +2,25 @@ import { EntityContextType } from '../common/types';
 import { StmtContextType, EntityCollector } from '../common/entityCollector';
 export class TrinoEntityCollector extends EntityCollector {
     /** ====== Entity Begin */
-    exitSchemaName(ctx) {
+    exitCatalogRef(ctx) {
+        this.pushEntity(ctx, EntityContextType.CATALOG);
+    }
+    exitCatalogNameCreate(ctx) {
+        this.pushEntity(ctx, EntityContextType.CATALOG_CREATE);
+    }
+    exitSchemaRef(ctx) {
         this.pushEntity(ctx, EntityContextType.DATABASE);
     }
     exitSchemaNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.DATABASE_CREATE);
     }
-    exitTableName(ctx) {
+    exitTableRef(ctx) {
         this.pushEntity(ctx, EntityContextType.TABLE);
     }
     exitTableNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.TABLE_CREATE);
     }
-    exitViewName(ctx) {
+    exitViewRef(ctx) {
         this.pushEntity(ctx, EntityContextType.VIEW);
     }
     exitViewNameCreate(ctx) {

package/package.json

@@ -1,16 +1,20 @@
 {
   "name": "dt-sql-parser",
-  "version": "4.0.1",
+  "version": "4.0.3-beta.0",
   "authors": "DTStack Corporation",
   "description": "SQL Parsers for BigData, built with antlr4",
   "keywords": [
+    "antlr4",
     "sql",
     "parser",
-    "monaco-editor",
+    "code-completion",
     "hive",
     "spark",
     "flink",
-    "bigdata"
+    "mysql",
+    "postgresql",
+    "trino",
+    "impala"
   ],
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -26,12 +30,18 @@
     "check-types": "tsc -p ./tsconfig.json && tsc -p ./test/tsconfig.json",
     "test": "NODE_OPTIONS=--max_old_space_size=4096 && jest",
     "release": "node ./scripts/release.js",
-    "lint": "prettier --check '**/*.ts' --config ./.prettierrc",
-    "lint-fix": "prettier --write '**/*.ts' --config ./.prettierrc",
+    "prettier-check": "prettier --check .",
+    "format": "prettier --write .",
     "format-g4": "antlr-format -c ./antlr.format.json -v ./src/grammar/**/*.g4",
-    "cleanComment": "node ./scripts/cleanCommentCli.js"
+    "cleanComment": "node ./scripts/cleanCommentCli.js",
+    "benchmark": "NODE_OPTIONS=--max_old_space_size=4096 && node --no-warnings ./scripts/benchmark.js",
+    "benchmark:release": "node --no-warnings ./scripts/benchmark.js --release"
   },
   "license": "MIT",
+  "dependencies": {
+    "antlr4-c3": "3.3.7",
+    "antlr4ng": "2.0.11"
+  },
   "devDependencies": {
     "@commitlint/cli": "^17.7.2",
     "@commitlint/config-conventional": "^17.7.0",
@@ -44,24 +54,41 @@
     "antlr4ng-cli": "^1.0.7",
     "chalk": "4.1.2",
     "commitizen": "^4.3.0",
+    "console-table-printer": "^2.12.0",
+    "envinfo": "^7.11.1",
     "glob": "^10.3.10",
     "husky": "^8.0.3",
     "inquirer": "^8.2.2",
     "jest": "^29.5.0",
     "lint-staged": "12.5.0",
     "prettier": "^3.0.3",
+    "semver": "^7.6.2",
     "standard-version": "^9.5.0",
+    "tsx": "^4.7.1",
     "typescript": "^5.0.4",
     "yargs-parser": "^21.1.1"
   },
-  "git repository": "https://github.com/DTStack/dt-sql-parser",
-  "repository": "https://github.com/DTStack/dt-sql-parser",
+  "repository": {
+    "type": "git",
+		"url": "https://github.com/DTStack/dt-sql-parser.git"
+  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
-  "dependencies": {
-    "antlr4-c3": "3.3.7",
-    "antlr4ng": "2.0.11"
+  "sideEffects": false,
+  "engines": {
+    "node": ">=18"
+  },
+  "packageManager": "pnpm@9.7.0",
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/@commitlint/cz-commitlint"
+    }
   },
-  "sideEffects": false
+  "lint-staged": {
+    "*": [
+      "prettier --write --ignore-unknown"
+    ],
+    "*.g4": ["antlr-format -c ./antlr.format.json -v"]
+  }
 }