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

package/dist/parser/postgresql/postgreEntityCollector.js

@@ -1,5 +1,5 @@
-import { Column_defContext, TableRefContext, } from '../../lib/postgresql/PostgreSqlParser';
-import { AttrName, EntityCollector, StmtContextType } from '../common/entityCollector';
+import { Column_defContext, ExpressionTableContext, PostgreSqlParser, TableRefContext, Target_labelContext, } from '../../lib/postgresql/PostgreSqlParser';
+import { AttrName, ColumnDeclareType, EntityCollector, isChildContextOf, StmtContextType, TableDeclareType, } from '../common/entityCollector';
 import { EntityContextType } from '../common/types';
 export class PostgreSqlEntityCollector extends EntityCollector {
     /** ====== Entity Begin */
@@ -10,31 +10,57 @@ export class PostgreSqlEntityCollector extends EntityCollector {
         this.pushEntity(ctx, EntityContextType.DATABASE_CREATE);
     }
     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: [TableRefContext.name],
-                },
-            ]
-            : undefined);
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [TableRefContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.LITERAL,
+        });
+    }
+    exitXmlTable(ctx) {
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [ExpressionTableContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
+    }
+    exitFuncTable(ctx) {
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [ExpressionTableContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
+    }
+    exitSelectWithParens(ctx) {
+        if (!isChildContextOf(ctx, PostgreSqlParser.RULE_expressionTable))
+            return;
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [ExpressionTableContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
     }
     exitTableNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.TABLE_CREATE);
     }
     exitViewName(ctx) {
-        var _a;
-        const needCollectAttr = ((_a = this.getRootStmt()) === null || _a === void 0 ? void 0 : _a.stmtContextType) === StmtContextType.SELECT_STMT;
-        this.pushEntity(ctx, EntityContextType.VIEW, needCollectAttr
-            ? [
-                {
-                    attrName: AttrName.alias,
-                    endContextList: [TableRefContext.name],
-                },
-            ]
-            : undefined);
+        this.pushEntity(ctx, EntityContextType.VIEW, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [TableRefContext.name],
+            },
+        ]);
     }
     exitViewNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.VIEW_CREATE);
@@ -54,6 +80,38 @@ export class PostgreSqlEntityCollector extends EntityCollector {
             },
         ]);
     }
+    exitTargetList(ctx) {
+        if (!isChildContextOf(ctx, PostgreSqlParser.RULE_simpleSelect))
+            return;
+        this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
+    }
+    exitTableAllColumns(ctx) {
+        if (!isChildContextOf(ctx, PostgreSqlParser.RULE_targetList))
+            return;
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.ALL,
+        });
+    }
+    exitSelectExpressionColumnName(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [Target_labelContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.EXPRESSION,
+        });
+    }
+    exitSelectLiteralColumnName(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [Target_labelContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
     exitProcedureName(ctx) {
         this.pushEntity(ctx, EntityContextType.PROCEDURE);
     }
@@ -115,6 +173,12 @@ export class PostgreSqlEntityCollector extends EntityCollector {
     exitSelectStatement(ctx) {
         this.popStmt();
     }
+    enterSelectNoParens(ctx) {
+        this.pushStmt(ctx, StmtContextType.SELECT_STMT);
+    }
+    exitSelectNoParens(ctx) {
+        this.popStmt();
+    }
     enterInsertStatement(ctx) {
         this.pushStmt(ctx, StmtContextType.INSERT_STMT);
     }

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

@@ -1,16 +1,28 @@
-import { ColumnNameCreateContext, CreateFunctionContext, CreateNamespaceContext, CreateTableContext, CreateTableLikeContext, CreateTempViewUsingContext, CreateViewContext, FunctionNameCreateContext, InsertFromQueryContext, MultipleInsertContext, NamespaceNameContext, NamespaceNameCreateContext, QueryStatementContext, ReplaceTableContext, SingleStatementContext, TableNameContext, TableNameCreateContext, ViewNameContext, ViewNameCreateContext } from '../../lib/spark/SparkSqlParser';
+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 type { SparkSqlParserListener } from '../../lib/spark/SparkSqlParserListener';
 import { EntityCollector } from '../common/entityCollector';
 export declare class SparkEntityCollector extends EntityCollector implements SparkSqlParserListener {
     /** ====== Entity Begin */
     exitNamespaceName(ctx: NamespaceNameContext): void;
     exitNamespaceNameCreate(ctx: NamespaceNameCreateContext): void;
+    /** Table Entity Rules */
     exitTableName(ctx: TableNameContext): void;
+    /** Inline Table Entity Rules */
+    exitInlineTableSource(ctx: InlineTableSourceContext): void;
+    /** Function Table Entity Rules */
+    exitFunctionTableSource(ctx: FunctionTableSourceContext): void;
+    /** SubQuery Table Entity Rules */
+    exitAtomSubQueryTableSource(ctx: AtomSubQueryTableSourceContext): void;
     exitTableNameCreate(ctx: TableNameCreateContext): void;
     exitViewName(ctx: ViewNameContext): void;
+    exitSelectList(ctx: SelectListContext): void;
     exitViewNameCreate(ctx: ViewNameCreateContext): void;
     exitFunctionNameCreate(ctx: FunctionNameCreateContext): void;
+    /** Column Entity Rules */
     exitColumnNameCreate(ctx: ColumnNameCreateContext): 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/spark/sparkEntityCollector.js

@@ -1,5 +1,5 @@
-import { CreateNamespaceContext, CreateOrReplaceTableColTypeContext, CreateTableContext, CreateViewContext, IdentifierCommentContext, RelationPrimaryContext, } from '../../lib/spark/SparkSqlParser';
-import { AttrName, EntityCollector, StmtContextType } from '../common/entityCollector';
+import { CreateNamespaceContext, CreateOrReplaceTableColTypeContext, CreateTableContext, CreateViewContext, FunctionTableSourceContext, IdentifierCommentContext, InlineTableSourceContext, NamedExpressionContext, RelationContext, RelationPrimaryContext, SparkSqlParser, SubQueryTableSourceContext, TableSourceContext, } from '../../lib/spark/SparkSqlParser';
+import { AttrName, ColumnDeclareType, EntityCollector, isChildContextOf, StmtContextType, TableDeclareType, } from '../common/entityCollector';
 import { EntityContextType } from '../common/types';
 export class SparkEntityCollector extends EntityCollector {
     /** ====== Entity Begin */
@@ -14,17 +14,53 @@ export class SparkEntityCollector 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: [RelationPrimaryContext.name],
-                },
-            ]
-            : undefined);
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [
+                    RelationPrimaryContext.name,
+                    RelationContext.name,
+                    TableSourceContext.name,
+                ],
+            },
+        ], {
+            declareType: TableDeclareType.LITERAL,
+        });
+    }
+    /** Inline Table Entity Rules */
+    exitInlineTableSource(ctx) {
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [InlineTableSourceContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
+    }
+    /** Function Table Entity Rules */
+    exitFunctionTableSource(ctx) {
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [FunctionTableSourceContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
+    }
+    /** SubQuery Table Entity Rules */
+    exitAtomSubQueryTableSource(ctx) {
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [SubQueryTableSourceContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
     }
     exitTableNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.TABLE_CREATE, [
@@ -37,6 +73,9 @@ export class SparkEntityCollector extends EntityCollector {
     exitViewName(ctx) {
         this.pushEntity(ctx, EntityContextType.VIEW);
     }
+    exitSelectList(ctx) {
+        this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
+    }
     exitViewNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.VIEW_CREATE, [
             {
@@ -48,6 +87,7 @@ export class SparkEntityCollector extends EntityCollector {
     exitFunctionNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.FUNCTION_CREATE);
     }
+    /** Column Entity Rules */
     exitColumnNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN_CREATE, [
             {
@@ -63,6 +103,42 @@ export class SparkEntityCollector extends EntityCollector {
             },
         ]);
     }
+    exitSelectLiteralColumnName(ctx) {
+        if (!isChildContextOf(ctx, SparkSqlParser.RULE_namedExpression))
+            return;
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [NamedExpressionContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.LITERAL,
+        });
+    }
+    exitSelectExpressionColumnName(ctx) {
+        if (!isChildContextOf(ctx, SparkSqlParser.RULE_namedExpression))
+            return;
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [NamedExpressionContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.EXPRESSION,
+        });
+    }
+    exitTableAllColumns(ctx) {
+        if (!isChildContextOf(ctx, SparkSqlParser.RULE_namedExpression))
+            return;
+        this.pushEntity(ctx, EntityContextType.COLUMN, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [NamedExpressionContext.name],
+            },
+        ], {
+            declareType: ColumnDeclareType.ALL,
+        });
+    }
     /** ===== Statement begin */
     enterSingleStatement(ctx) {
         this.pushStmt(ctx, StmtContextType.COMMON_STMT);

package/dist/parser/trino/index.js

@@ -108,7 +108,8 @@ export class TrinoSQL extends BasicSQL {
                     break;
                 }
                 case TrinoSqlParser.RULE_columnName: {
-                    if (candidateRule.ruleList.includes(TrinoSqlParser.RULE_groupBy) ||
+                    if (candidateRule.ruleList.includes(TrinoSqlParser.RULE_selectItem) ||
+                        candidateRule.ruleList.includes(TrinoSqlParser.RULE_groupBy) ||
                         candidateRule.ruleList.includes(TrinoSqlParser.RULE_sortItem) ||
                         candidateRule.ruleList.includes(TrinoSqlParser.RULE_whereClause) ||
                         candidateRule.ruleList.includes(TrinoSqlParser.RULE_havingClause) ||

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, InsertIntoContext, QueryStatementContext, SchemaNameCreateContext, SchemaRefContext, SingleStatementContext, TableNameCreateContext, TableRefContext, ViewNameCreateContext, ViewRefContext } from '../../lib/trino/TrinoSqlParser';
+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 { EntityCollector } from '../common/entityCollector';
 export declare class TrinoEntityCollector extends EntityCollector implements TrinoSqlListener {
     /** ====== Entity Begin */
@@ -8,10 +8,16 @@ export declare class TrinoEntityCollector extends EntityCollector implements Tri
     exitSchemaRef(ctx: SchemaRefContext): void;
     exitSchemaNameCreate(ctx: SchemaNameCreateContext): void;
     exitTableRef(ctx: TableRefContext): void;
+    exitExpressionSourceTable(ctx: ExpressionSourceTableContext): void;
     exitTableNameCreate(ctx: TableNameCreateContext): void;
     exitViewRef(ctx: ViewRefContext): void;
     exitViewNameCreate(ctx: ViewNameCreateContext): void;
+    exitSelectList(ctx: SelectListContext): void;
     exitColumnNameCreate(ctx: ColumnNameCreateContext): void;
+    exitSelectLiteralColumnName(ctx: SelectLiteralColumnNameContext): void;
+    exitSelectExpressionColumnName(ctx: SelectExpressionColumnNameContext): void;
+    exitTableAllColumns(ctx: TableAllColumnsContext): void;
+    exitSelectAllWithoutTable(ctx: SelectAllWithoutTableContext): void;
     /** ===== Statement begin */
     enterSingleStatement(ctx: SingleStatementContext): void;
     exitSingleStatement(ctx: SingleStatementContext): void;

package/dist/parser/trino/trinoEntityCollector.js

@@ -1,5 +1,5 @@
-import { AliasedRelationContext, ColumnDefinitionContext, CreateMaterializedViewContext, CreateTableAsSelectContext, CreateTableContext, CreateViewContext, } from '../../lib/trino/TrinoSqlParser';
-import { AttrName, EntityCollector, StmtContextType } from '../common/entityCollector';
+import { AliasedRelationContext, ColumnDefinitionContext, CreateMaterializedViewContext, CreateTableAsSelectContext, CreateTableContext, CreateViewContext, SelectItemContext, } from '../../lib/trino/TrinoSqlParser';
+import { AttrName, ColumnDeclareType, EntityCollector, StmtContextType, TableDeclareType, } from '../common/entityCollector';
 import { EntityContextType } from '../common/types';
 export class TrinoEntityCollector extends EntityCollector {
     /** ====== Entity Begin */
@@ -16,16 +16,24 @@ export class TrinoEntityCollector extends EntityCollector {
         this.pushEntity(ctx, EntityContextType.DATABASE_CREATE);
     }
     exitTableRef(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: [AliasedRelationContext.name],
-                },
-            ]
-            : undefined);
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [AliasedRelationContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.LITERAL,
+        });
+    }
+    exitExpressionSourceTable(ctx) {
+        this.pushEntity(ctx, EntityContextType.TABLE, [
+            {
+                attrName: AttrName.alias,
+                endContextList: [AliasedRelationContext.name],
+            },
+        ], {
+            declareType: TableDeclareType.EXPRESSION,
+        });
     }
     exitTableNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.TABLE_CREATE, [
@@ -46,6 +54,9 @@ export class TrinoEntityCollector extends EntityCollector {
             },
         ]);
     }
+    exitSelectList(ctx) {
+        this.pushEntity(ctx, EntityContextType.QUERY_RESULT);
+    }
     exitColumnNameCreate(ctx) {
         this.pushEntity(ctx, EntityContextType.COLUMN_CREATE, [
             {
@@ -58,6 +69,36 @@ export class TrinoEntityCollector extends EntityCollector {
             },
         ]);
     }
+    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, [], {
+            declareType: ColumnDeclareType.ALL,
+        });
+    }
+    exitSelectAllWithoutTable(ctx) {
+        this.pushEntity(ctx, EntityContextType.COLUMN, [], {
+            declareType: ColumnDeclareType.ALL,
+        });
+    }
     /** ===== Statement begin */
     enterSingleStatement(ctx) {
         this.pushStmt(ctx, StmtContextType.COMMON_STMT);

package/package.json

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