feat: update endContextList of collect attribute

Author: zhaoge

src/parser/hive/hiveEntityCollector.ts

@@ -1,13 +1,13 @@
 import { HiveSqlParserListener } from '../../lib';
 import {
+    ColumnNameCommentContext,
     ColumnNameCreateContext,
     ColumnNameTypeConstraintContext,
     CreateDatabaseStatementContext,
     CreateFunctionStatementContext,
     CreateMaterializedViewStatementContext,
     CreateTableStatementContext,
     CreateViewStatementContext,
-    DatabaseCommentContext,
     DbSchemaNameContext,
     DbSchemaNameCreateContext,
     FromInsertStmtContext,
@@ -16,7 +16,6 @@ import {
     InsertStmtContext,
     SelectStatementContext,
     StatementContext,
-    TableCommentContext,
     TableNameContext,
     TableNameCreateContext,
     TableSourceContext,
@@ -32,7 +31,7 @@ export class HiveEntityCollector extends EntityCollector implements HiveSqlParse
     exitTableNameCreate(ctx: TableNameCreateContext) {
         this.pushEntity(ctx, EntityContextType.TABLE_CREATE, {
             attrNameList: [AttrName.comment],
-            endContextList: [TableCommentContext.name],
+            endContextList: [CreateTableStatementContext.name],
         });
     }
 
@@ -53,14 +52,14 @@ export class HiveEntityCollector extends EntityCollector implements HiveSqlParse
     exitColumnNameCreate(ctx: ColumnNameCreateContext) {
         this.pushEntity(ctx, EntityContextType.COLUMN_CREATE, {
             attrNameList: [AttrName.comment, AttrName.colType],
-            endContextList: [ColumnNameTypeConstraintContext.name],
+            endContextList: [ColumnNameTypeConstraintContext.name, ColumnNameCommentContext.name],
         });
     }
 
     exitViewNameCreate(ctx: ViewNameCreateContext) {
         this.pushEntity(ctx, EntityContextType.VIEW_CREATE, {
             attrNameList: [AttrName.comment],
-            endContextList: [TableCommentContext.name],
+            endContextList: [CreateViewStatementContext.name],
         });
     }
 
@@ -71,7 +70,7 @@ export class HiveEntityCollector extends EntityCollector implements HiveSqlParse
     exitDbSchemaNameCreate(ctx: DbSchemaNameCreateContext) {
         this.pushEntity(ctx, EntityContextType.DATABASE_CREATE, {
             attrNameList: [AttrName.comment],
-            endContextList: [DatabaseCommentContext.name],
+            endContextList: [CreateDatabaseStatementContext.name],
         });
     }
 

src/parser/impala/impalaEntityCollector.ts

@@ -2,7 +2,6 @@ import { ImpalaSqlParserListener } from '../../lib';
 import {
     ColumnDefinitionContext,
     ColumnNamePathCreateContext,
-    CommentClauseContext,
     CreateAggregateFunctionContext,
     CreateFunctionContext,
     CreateKuduTableAsSelectContext,
@@ -32,7 +31,7 @@ export class ImpalaEntityCollector extends EntityCollector implements ImpalaSqlP
     exitTableNameCreate(ctx: TableNameCreateContext) {
         this.pushEntity(ctx, EntityContextType.TABLE_CREATE, {
             attrNameList: [AttrName.comment],
-            endContextList: [CommentClauseContext.name],
+            endContextList: [CreateTableSelectContext.name, CreateKuduTableAsSelectContext.name],
         });
     }
 

src/parser/spark/sparkEntityCollector.ts

@@ -1,10 +1,8 @@
 import {
     ColumnNameCreateContext,
-    CommentSpecContext,
     CreateFunctionContext,
     CreateNamespaceContext,
     CreateOrReplaceTableColTypeContext,
-    CreateTableClausesContext,
     CreateTableContext,
     CreateTableLikeContext,
     CreateTempViewUsingContext,
@@ -58,7 +56,7 @@ export class SparkEntityCollector extends EntityCollector implements SparkSqlPar
     exitTableNameCreate(ctx: TableNameCreateContext) {
         this.pushEntity(ctx, EntityContextType.TABLE_CREATE, {
             attrNameList: [AttrName.comment],
-            endContextList: [CreateTableClausesContext.name],
+            endContextList: [CreateTableContext.name],
         });
     }
 
@@ -81,7 +79,6 @@ export class SparkEntityCollector extends EntityCollector implements SparkSqlPar
         this.pushEntity(ctx, EntityContextType.COLUMN_CREATE, {
             attrNameList: [AttrName.comment, AttrName.colType],
             endContextList: [
-                CommentSpecContext.name,
                 CreateOrReplaceTableColTypeContext.name,
                 IdentifierCommentContext.name,
             ],

src/parser/trino/trinoEntityCollector.ts

@@ -14,7 +14,6 @@ import {
     QueryStatementContext,
     SchemaNameCreateContext,
     SchemaRefContext,
-    SelectItemContext,
     SingleStatementContext,
     TableNameCreateContext,
     TableRefContext,
@@ -50,7 +49,7 @@ export class TrinoEntityCollector extends EntityCollector implements TrinoSqlLis
             needCollectAttr
                 ? {
                       attrNameList: [AttrName.alias],
-                      endContextList: [SelectItemContext.name, AliasedRelationContext.name],
+                      endContextList: [AliasedRelationContext.name],
                   }
                 : undefined
         );