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

package/dist/parser/common/textAndWord.js

@@ -34,6 +34,8 @@ export function ctxToText(ctx, input) {
         endIndex,
         startColumn: ctx.start.column + 1,
         endColumn: ctx.stop.column + 1 + ((_b = (_a = ctx.stop.text) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0),
+        startTokenIndex: ctx.start.tokenIndex,
+        endTokenIndex: ctx.stop.tokenIndex,
     };
 }
 /**

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

@@ -42,6 +42,8 @@ export declare enum EntityContextType {
     COLUMN = "column",
     /** column name that will be created */
     COLUMN_CREATE = "columnCreate",
+    /** query result */
+    QUERY_RESULT = "queryResult",
     /** table property key when creating table*/
     TABLE_PROPERTY_KEY = "tablePropertyKey",
     /** table property value when creating table*/

package/dist/parser/common/types.js

@@ -31,6 +31,8 @@ export var EntityContextType;
     EntityContextType["COLUMN"] = "column";
     /** column name that will be created */
     EntityContextType["COLUMN_CREATE"] = "columnCreate";
+    /** query result */
+    EntityContextType["QUERY_RESULT"] = "queryResult";
     /** table property key when creating table*/
     EntityContextType["TABLE_PROPERTY_KEY"] = "tablePropertyKey";
     /** table property value when creating table*/

package/dist/parser/flink/flinkEntityCollector.d.ts

@@ -1,4 +1,4 @@
-import { CatalogPathContext, CatalogPathCreateContext, ColumnNameCreateContext, CreateCatalogContext, CreateDatabaseContext, CreateFunctionContext, CreateTableContext, CreateViewContext, DatabasePathContext, DatabasePathCreateContext, FunctionNameCreateContext, InsertStatementContext, QueryStatementContext, SqlStatementContext, TablePathContext, TablePathCreateContext, ViewPathContext, ViewPathCreateContext } from '../../lib/flink/FlinkSqlParser';
+import { AtomExpressionTableContext, AtomFunctionTableContext, CatalogPathContext, CatalogPathCreateContext, ColumnNameCreateContext, CreateCatalogContext, CreateDatabaseContext, CreateFunctionContext, CreateTableContext, CreateViewContext, DatabasePathContext, DatabasePathCreateContext, FunctionNameCreateContext, InsertStatementContext, QueryStatementContext, SelectExpressionColumnNameContext, SelectListContext, SelectLiteralColumnNameContext, SelectWindowItemColumnNameContext, SqlStatementContext, TableAllColumnsContext, TablePathContext, TablePathCreateContext, ViewPathContext, ViewPathCreateContext } from '../../lib/flink/FlinkSqlParser';
 import { FlinkSqlParserListener } from '../../lib/flink/FlinkSqlParserListener';
 import { EntityCollector } from '../common/entityCollector';
 export declare class FlinkEntityCollector extends EntityCollector implements FlinkSqlParserListener {
@@ -8,11 +8,19 @@ export declare class FlinkEntityCollector extends EntityCollector implements Fli
     exitDatabasePathCreate(ctx: DatabasePathCreateContext): void;
     exitDatabasePath(ctx: DatabasePathContext): void;
     exitTablePath(ctx: TablePathContext): void;
+    exitAtomFunctionTable(ctx: AtomFunctionTableContext): void;
+    exitAtomExpressionTable(ctx: AtomExpressionTableContext): void;
     exitTablePathCreate(ctx: TablePathCreateContext): void;
     exitViewPath(ctx: ViewPathContext): void;
     exitViewPathCreate(ctx: ViewPathCreateContext): void;
-    exitColumnNameCreate(ctx: ColumnNameCreateContext): void;
     exitFunctionNameCreate(ctx: FunctionNameCreateContext): void;
+    exitSelectList(ctx: SelectListContext): void;
+    /** Column entity rules */
+    exitColumnNameCreate(ctx: ColumnNameCreateContext): void;
+    exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
+    exitSelectExpressionColumnName(ctx: SelectExpressionColumnNameContext): void;
+    exitSelectWindowItemColumnName(ctx: SelectWindowItemColumnNameContext): void;
+    exitTableAllColumns(ctx: TableAllColumnsContext): void;
     /** ===== Statement begin */
     enterSqlStatement(ctx: SqlStatementContext): void;
     exitSqlStatement(ctx: SqlStatementContext): void;

package/dist/parser/flink/flinkEntityCollector.js

@@ -1,5 +1,5 @@
-import { CreateDatabaseContext, CreateTableContext, CreateViewContext, PhysicalColumnDefinitionContext, TableReferenceContext, } from '../../lib/flink/FlinkSqlParser';
-import { AttrName, EntityCollector, StmtContextType } from '../common/entityCollector';
+import { ColumnProjectItemContext, CreateDatabaseContext, CreateTableContext, CreateViewContext, OverWindowItemContext, PhysicalColumnDefinitionContext, TableReferenceContext, } from '../../lib/flink/FlinkSqlParser';
+import { AttrName, ColumnDeclareType, EntityCollector, StmtContextType, TableDeclareType, } from '../common/entityCollector';
 import { EntityContextType } from '../common/types';
 export class FlinkEntityCollector extends EntityCollector {
     /** ====== Entity Begin */
@@ -21,16 +21,34 @@ export class FlinkEntityCollector extends EntityCollector {
         this.pushEntity(ctx, EntityContextType.DATABASE);
     }
     exitTablePath(ctx) {
-        var _a;
-        const needCollectAttr = ((_a = this.getRootStmt()) === null || _a === void 0 ? void 0 : _a.stmtContextType) === StmtContextType.SELECT_STMT;
-        this.pushEntity(ctx, EntityContextType.TABLE, needCollectAttr
-            ? [
-                {
-                    attrName: AttrName.alias,
-                    endContextList: [TableReferenceContext.name],
-                },
-            ]
-            : undefined);
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [TableReferenceContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.LITERAL,
+        });
+    }
+    exitAtomFunctionTable(ctx) {
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [TableReferenceContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
+    }
+    exitAtomExpressionTable(ctx) {
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [TableReferenceContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
     }
     exitTablePathCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.TABLE_CREATE, [
@@ -51,6 +69,13 @@ export class FlinkEntityCollector extends EntityCollector {
             },
         ]);
     }
+    exitFunctionNameCreate(ctx) {
+        this.pushEntity(ctx, EntityContextType.FUNCTION_CREATE);
+    }
+    exitSelectList(ctx) {
+        this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
+    }
+    /** Column entity rules */
     exitColumnNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN_CREATE, [
             {
@@ -63,8 +88,45 @@ export class FlinkEntityCollector extends EntityCollector {
             },
         ]);
     }
-    exitFunctionNameCreate(ctx) {
-        this.pushEntity(ctx, EntityContextType.FUNCTION_CREATE);
+    exitSelectLiteralColumnName(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [ColumnProjectItemContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
+    exitSelectExpressionColumnName(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [ColumnProjectItemContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.EXPRESSION,
+        });
+    }
+    exitSelectWindowItemColumnName(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [ColumnProjectItemContext.name, OverWindowItemContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.EXPRESSION,
+        });
+    }
+    exitTableAllColumns(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [ColumnProjectItemContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.ALL,
+        });
     }
     /** ===== Statement begin */
     enterSqlStatement(ctx) {

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

@@ -1,12 +1,24 @@
 import { HiveSqlParserListener } from '../../lib';
-import { ColumnNameCreateContext, CreateDatabaseStatementContext, CreateFunctionStatementContext, CreateMaterializedViewStatementContext, CreateTableStatementContext, CreateViewStatementContext, DbSchemaNameContext, DbSchemaNameCreateContext, FromInsertStmtContext, FromSelectStmtContext, FunctionNameCreateContext, InsertStmtContext, SelectStatementContext, StatementContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext } from '../../lib/hive/HiveSqlParser';
+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 { EntityCollector } from '../common/entityCollector';
 export declare class HiveEntityCollector extends EntityCollector implements HiveSqlParserListener {
     /** ====== Entity Begin */
     exitTableNameCreate(ctx: TableNameCreateContext): void;
+    /** Table Entity Rules */
     exitTableName(ctx: TableNameContext): void;
+    /** Virtual Table Entity Rules */
+    exitAtomValuesClause(ctx: AtomValuesClauseContext): void;
+    /** SubQuery Table Entity Rules */
+    exitQueryStatementExpression(ctx: QueryStatementExpressionContext): void;
+    /** Partitioned Table Entity Rules */
+    exitAtomPartitionedTableFunction(ctx: AtomPartitionedTableFunctionContext): void;
+    /** Column Entity Rules */
     exitColumnNameCreate(ctx: ColumnNameCreateContext): void;
+    exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
+    exitSelectExpressionColumnName(ctx: SelectExpressionColumnNameContext): void;
+    exitTableAllColumns(ctx: TableAllColumnsContext): void;
     exitViewNameCreate(ctx: ViewNameCreateContext): void;
+    exitSelectList(ctx: SelectListContext): void;
     exitViewName(ctx: ViewNameContext): void;
     exitDbSchemaNameCreate(ctx: DbSchemaNameCreateContext): void;
     exitDbSchemaName(ctx: DbSchemaNameContext): void;

package/dist/parser/hive/hiveEntityCollector.js

@@ -1,5 +1,5 @@
-import { ColumnNameCommentContext, ColumnNameTypeConstraintContext, CreateDatabaseStatementContext, CreateTableStatementContext, CreateViewStatementContext, TableSourceContext, UniqueJoinSourceContext, } from '../../lib/hive/HiveSqlParser';
-import { AttrName, EntityCollector, StmtContextType } from '../common/entityCollector';
+import { ColumnNameCommentContext, ColumnNameTypeConstraintContext, CreateDatabaseStatementContext, CreateTableStatementContext, CreateViewStatementContext, HiveSqlParser, PartitionedTableFunctionContext, SelectItemContext, SubQuerySourceContext, TableSourceContext, UniqueJoinSourceContext, VirtualTableSourceContext, } from '../../lib/hive/HiveSqlParser';
+import { AttrName, ColumnDeclareType, EntityCollector, isChildContextOf, StmtContextType, TableDeclareType, } from '../common/entityCollector';
 import { EntityContextType } from '../common/types';
 export class HiveEntityCollector extends EntityCollector {
     /** ====== Entity Begin */
@@ -11,18 +11,57 @@ export class HiveEntityCollector extends EntityCollector {
             },
         ]);
     }
+    /** Table Entity Rules */
     exitTableName(ctx) {
-        var _a;
-        const needCollectAttr = ((_a = this.getRootStmt()) === null || _a === void 0 ? void 0 : _a.stmtContextType) === StmtContextType.SELECT_STMT;
-        this.pushEntity(ctx, EntityContextType.TABLE, needCollectAttr
-            ? [
-                {
-                    attrName: AttrName.alias,
-                    endContextList: [TableSourceContext.name, UniqueJoinSourceContext.name],
-                },
-            ]
-            : undefined);
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [TableSourceContext.name, UniqueJoinSourceContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.LITERAL,
+        });
+    }
+    /** Virtual Table Entity Rules */
+    exitAtomValuesClause(ctx) {
+        if (!isChildContextOf(ctx, HiveSqlParser.RULE_fromClause))
+            return;
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [VirtualTableSourceContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
+    }
+    /** SubQuery Table Entity Rules */
+    exitQueryStatementExpression(ctx) {
+        if (!isChildContextOf(ctx, HiveSqlParser.RULE_fromClause))
+            return;
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [SubQuerySourceContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
+    }
+    /** Partitioned Table Entity Rules */
+    exitAtomPartitionedTableFunction(ctx) {
+        if (!isChildContextOf(ctx, HiveSqlParser.RULE_fromClause))
+            return;
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [PartitionedTableFunctionContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
     }
+    /** Column Entity Rules */
     exitColumnNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN_CREATE, [
             {
@@ -35,6 +74,37 @@ export class HiveEntityCollector extends EntityCollector {
             },
         ]);
     }
+    exitSelectLiteralColumnName(ctx) {
+        if (!isChildContextOf(ctx, HiveSqlParser.RULE_selectItem))
+            return;
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [SelectItemContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
+    exitSelectExpressionColumnName(ctx) {
+        if (!isChildContextOf(ctx, HiveSqlParser.RULE_selectItem))
+            return;
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [SelectItemContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.EXPRESSION,
+        });
+    }
+    exitTableAllColumns(ctx) {
+        if (!isChildContextOf(ctx, HiveSqlParser.RULE_selectItem))
+            return;
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.ALL,
+        });
+    }
     exitViewNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.VIEW_CREATE, [
             {
@@ -43,6 +113,9 @@ export class HiveEntityCollector extends EntityCollector {
             },
         ]);
     }
+    exitSelectList(ctx) {
+        this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
+    }
     exitViewName(ctx) {
         this.pushEntity(ctx, EntityContextType.VIEW);
     }

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

@@ -1,16 +1,22 @@
 import { ImpalaSqlParserListener } from '../../lib';
-import { ColumnNamePathCreateContext, CreateAggregateFunctionContext, CreateFunctionContext, CreateKuduTableAsSelectContext, CreateSchemaContext, CreateTableLikeContext, CreateTableSelectContext, CreateViewContext, DatabaseNameCreateContext, DatabaseNamePathContext, FunctionNameCreateContext, InsertStatementContext, QueryStatementContext, SingleStatementContext, TableNameCreateContext, TableNamePathContext, ViewNameCreateContext, ViewNamePathContext } from '../../lib/impala/ImpalaSqlParser';
+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 { EntityCollector } from '../common/entityCollector';
 export declare class ImpalaEntityCollector extends EntityCollector implements ImpalaSqlParserListener {
     /** ===== Entity begin */
     exitTableNameCreate(ctx: TableNameCreateContext): void;
     exitTableNamePath(ctx: TableNamePathContext): void;
+    exitAtomSubQueryTableSource(ctx: AtomSubQueryTableSourceContext): void;
+    exitUnnest(ctx: UnnestContext): void;
     exitColumnNamePathCreate(ctx: ColumnNamePathCreateContext): void;
     exitViewNameCreate(ctx: ViewNameCreateContext): void;
     exitViewNamePath(ctx: ViewNamePathContext): void;
     exitDatabaseNamePath(ctx: DatabaseNamePathContext): void;
     exitDatabaseNameCreate(ctx: DatabaseNameCreateContext): void;
     exitFunctionNameCreate(ctx: FunctionNameCreateContext): void;
+    exitSelectList(ctx: SelectListContext): void;
+    exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
+    exitSelectExpressionColumnName(ctx: SelectExpressionColumnNameContext): void;
+    exitTableAllColumns(ctx: TableAllColumnsContext): void;
     /** ===== Statement begin */
     enterSingleStatement(ctx: SingleStatementContext): void;
     exitSingleStatement(ctx: SingleStatementContext): void;

package/dist/parser/impala/impalaEntityCollector.js

@@ -1,5 +1,5 @@
-import { ColumnDefinitionContext, CreateKuduTableAsSelectContext, CreateSchemaContext, CreateTableSelectContext, CreateViewContext, KuduTableElementContext, SampledRelationContext, ViewColumnItemContext, } from '../../lib/impala/ImpalaSqlParser';
-import { AttrName, EntityCollector, StmtContextType } from '../common/entityCollector';
+import { AliasedRelationContext, ColumnDefinitionContext, CreateKuduTableAsSelectContext, CreateSchemaContext, CreateTableSelectContext, CreateViewContext, KuduTableElementContext, SelectItemContext, ViewColumnItemContext, } from '../../lib/impala/ImpalaSqlParser';
+import { AttrName, ColumnDeclareType, EntityCollector, StmtContextType, TableDeclareType, } from '../common/entityCollector';
 import { EntityContextType } from '../common/types';
 export class ImpalaEntityCollector extends EntityCollector {
     /** ===== Entity begin */
@@ -15,16 +15,34 @@ export class ImpalaEntityCollector extends EntityCollector {
         ]);
     }
     exitTableNamePath(ctx) {
-        var _a;
-        const needCollectAttr = ((_a = this.getRootStmt()) === null || _a === void 0 ? void 0 : _a.stmtContextType) === StmtContextType.SELECT_STMT;
-        this.pushEntity(ctx, EntityContextType.TABLE, needCollectAttr
-            ? [
-                {
-                    attrName: AttrName.alias,
-                    endContextList: [SampledRelationContext.name],
-                },
-            ]
-            : undefined);
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [AliasedRelationContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.LITERAL,
+        });
+    }
+    exitAtomSubQueryTableSource(ctx) {
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [AliasedRelationContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
+    }
+    exitUnnest(ctx) {
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [AliasedRelationContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
     }
     exitColumnNamePathCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN_CREATE, [
@@ -71,6 +89,39 @@ export class ImpalaEntityCollector extends EntityCollector {
     exitFunctionNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.FUNCTION_CREATE);
     }
+    exitSelectList(ctx) {
+        this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
+    }
+    exitSelectLiteralColumnName(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [SelectItemContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
+    exitSelectExpressionColumnName(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [SelectItemContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.EXPRESSION,
+        });
+    }
+    exitTableAllColumns(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [SelectItemContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.ALL,
+        });
+    }
     /** ===== Statement begin */
     enterSingleStatement(ctx) {
         this.pushStmt(ctx, StmtContextType.COMMON_STMT);

package/dist/parser/impala/index.js

@@ -102,7 +102,8 @@ export class ImpalaSQL extends BasicSQL {
                         candidateRule.ruleList.includes(ImpalaSqlParser.RULE_whereClause) ||
                         candidateRule.ruleList.includes(ImpalaSqlParser.RULE_whenClause) ||
                         candidateRule.ruleList.includes(ImpalaSqlParser.RULE_partitionByClause) ||
-                        candidateRule.ruleList.includes(ImpalaSqlParser.RULE_relation)) {
+                        candidateRule.ruleList.includes(ImpalaSqlParser.RULE_relation) ||
+                        candidateRule.ruleList.includes(ImpalaSqlParser.RULE_functionCallExpression)) {
                         syntaxContextType = EntityContextType.COLUMN;
                     }
                 }

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

@@ -1,16 +1,24 @@
-import { ColumnCreateTableContext, ColumnNameCreateContext, CopyCreateTableContext, CreateDatabaseContext, CreateFunctionContext, CreateFunctionLoadableContext, CreateViewContext, DatabaseNameContext, DatabaseNameCreateContext, FunctionNameCreateContext, InsertStatementContext, QueryCreateTableContext, SelectStatementContext, SingleStatementContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext } from '../../lib/mysql/MySqlParser';
+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 type { MySqlParserListener } from '../../lib/mysql/MySqlParserListener';
 import { EntityCollector } from '../common/entityCollector';
 export declare class MySqlEntityCollector extends EntityCollector implements MySqlParserListener {
     /** ====== Entity Begin */
     exitDatabaseName(ctx: DatabaseNameContext): void;
     exitDatabaseNameCreate(ctx: DatabaseNameCreateContext): void;
+    /** Table Entity Rules */
     exitTableName(ctx: TableNameContext): void;
+    /** SubQuery Table Entity Rules */
+    exitAtomSubQueryTableSource(ctx: AtomSubQueryTableSourceContext): void;
     exitTableNameCreate(ctx: TableNameCreateContext): void;
     exitViewName(ctx: ViewNameContext): void;
     exitViewNameCreate(ctx: ViewNameCreateContext): void;
     exitFunctionNameCreate(ctx: FunctionNameCreateContext): void;
+    exitSelectElements(ctx: SelectElementsContext): void;
     exitColumnNameCreate(ctx: ColumnNameCreateContext): void;
+    exitTableAllColumns(ctx: TableAllColumnsContext): void;
+    exitPureAllColumns(ctx: PureAllColumnsContext): void;
+    exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
+    exitSelectExpressionElement(ctx: SelectExpressionElementContext): void;
     /** ===== Statement begin */
     enterSingleStatement(ctx: SingleStatementContext): void;
     exitSingleStatement(ctx: SingleStatementContext): void;

package/dist/parser/mysql/mysqlEntityCollector.js

@@ -1,5 +1,5 @@
-import { ColumnCreateTableContext, CreateDefinitionContext, CreateFunctionContext, TableSourceContext, } from '../../lib/mysql/MySqlParser';
-import { AttrName, EntityCollector, StmtContextType } from '../common/entityCollector';
+import { ColumnCreateTableContext, CreateDefinitionContext, CreateFunctionContext, SelectElementContext, TableSourceItemContext, AtomTableItemContext, SubqueryTableItemContext, } from '../../lib/mysql/MySqlParser';
+import { AttrName, ColumnDeclareType, EntityCollector, StmtContextType, TableDeclareType, } from '../common/entityCollector';
 import { EntityContextType } from '../common/types';
 export class MySqlEntityCollector extends EntityCollector {
     /** ====== Entity Begin */
@@ -9,17 +9,27 @@ export class MySqlEntityCollector extends EntityCollector {
     exitDatabaseNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.DATABASE_CREATE);
     }
+    /** Table Entity Rules */
     exitTableName(ctx) {
-        var _a;
-        const needCollectAttr = ((_a = this.getRootStmt()) === null || _a === void 0 ? void 0 : _a.stmtContextType) === StmtContextType.SELECT_STMT;
-        this.pushEntity(ctx, EntityContextType.TABLE, needCollectAttr
-            ? [
-                {
-                    attrName: AttrName.alias,
-                    endContextList: [TableSourceContext.name],
-                },
-            ]
-            : undefined);
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [TableSourceItemContext.name, AtomTableItemContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.LITERAL,
+        });
+    }
+    /** SubQuery Table Entity Rules */
+    exitAtomSubQueryTableSource(ctx) {
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [TableSourceItemContext.name, SubqueryTableItemContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
     }
     exitTableNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.TABLE_CREATE, [
@@ -43,6 +53,9 @@ export class MySqlEntityCollector extends EntityCollector {
             },
         ]);
     }
+    exitSelectElements(ctx) {
+        this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
+    }
     exitColumnNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN_CREATE, [
             {
@@ -55,6 +68,36 @@ export class MySqlEntityCollector extends EntityCollector {
             },
         ]);
     }
+    exitTableAllColumns(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.ALL,
+        });
+    }
+    exitPureAllColumns(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.ALL,
+        });
+    }
+    exitSelectLiteralColumnName(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [SelectElementContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
+    exitSelectExpressionElement(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [SelectElementContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.EXPRESSION,
+        });
+    }
     /** ===== Statement begin */
     enterSingleStatement(ctx) {
         this.pushStmt(ctx, StmtContextType.COMMON_STMT);

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, type SelectStatementContext, type SingleStmtContext, type TableNameContext, type TableNameCreateContext, type ViewNameContext, type ViewNameCreateContext } 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, 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 { PostgreSqlParserListener } from '../../lib/postgresql/PostgreSqlParserListener';
 import { EntityCollector } from '../common/entityCollector';
 export declare class PostgreSqlEntityCollector extends EntityCollector implements PostgreSqlParserListener {
@@ -6,11 +6,18 @@ export declare class PostgreSqlEntityCollector extends EntityCollector implement
     exitDatabaseName(ctx: DatabaseNameContext): void;
     exitDatabaseNameCreate(ctx: DatabaseNameCreateContext): void;
     exitTableName(ctx: TableNameContext): void;
+    exitXmlTable(ctx: XmlTableContext): void;
+    exitFuncTable(ctx: FuncTableContext): void;
+    exitSelectWithParens(ctx: SelectWithParensContext): void;
     exitTableNameCreate(ctx: TableNameCreateContext): void;
     exitViewName(ctx: ViewNameContext): void;
     exitViewNameCreate(ctx: ViewNameCreateContext): void;
     exitFunctionNameCreate(ctx: FunctionNameCreateContext): void;
     exitColumnNameCreate(ctx: ColumnNameCreateContext): void;
+    exitTargetList(ctx: TargetListContext): void;
+    exitTableAllColumns(ctx: TableAllColumnsContext): void;
+    exitSelectExpressionColumnName(ctx: SelectExpressionColumnNameContext): void;
+    exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
     exitProcedureName(ctx: ProcedureNameContext): void;
     exitProcedureNameCreate(ctx: ProcedureNameCreateContext): void;
     /** ===== Statement begin */
@@ -32,6 +39,8 @@ export declare class PostgreSqlEntityCollector extends EntityCollector implement
     exitCreateMaterializedView(ctx: CreateMaterializedViewContext): void;
     enterSelectStatement(ctx: SelectStatementContext): void;
     exitSelectStatement(ctx: SelectStatementContext): void;
+    enterSelectNoParens(ctx: SelectNoParensContext): void;
+    exitSelectNoParens(ctx: SelectNoParensContext): void;
     enterInsertStatement(ctx: InsertStatementContext): void;
     exitInsertStatement(ctx: InsertStatementContext): void;
     enterCreateFunctionStmt(ctx: CreateFunctionStmtContext): void;