Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: upgrade bytebase/parser and adapt Snowflake integration (#19412)
h3n4lc63733b24022
diff --git a/backend/plugin/advisor/snowflake/rule_column_maximum_varchar_length.go b/backend/plugin/advisor/snowflake/rule_column_maximum_varchar_length.goindex 406cea0720..fd1519c315 100644--- a/backend/plugin/advisor/snowflake/rule_column_maximum_varchar_length.go+++ b/backend/plugin/advisor/snowflake/rule_column_maximum_varchar_length.go@@ -115,9 +115,9 @@ func (r *ColumnMaximumVarcharLengthRule) checkDataType(ctx *parser.Data_typeCont}length := varcharDefaultLength- if v := ctx.Num(0); v != nil {+ if v := ctx.Data_type_size(); v != nil && v.Num() != nil {var err error- length, err = strconv.Atoi(v.GetText())+ length, err = strconv.Atoi(v.Num().GetText())if err != nil {return}diff --git a/backend/plugin/advisor/snowflake/rule_column_no_null.go b/backend/plugin/advisor/snowflake/rule_column_no_null.goindex 4338cbe0e2..06dcd7ff3d 100644--- a/backend/plugin/advisor/snowflake/rule_column_no_null.go+++ b/backend/plugin/advisor/snowflake/rule_column_no_null.go@@ -142,7 +142,7 @@ func (r *ColumnNoNullRule) enterFullColDecl(ctx *parser.Full_col_declContext) {if r.currentOriginalTableName == "" {return}- normalizedOriginalColumnID := snowsqlparser.NormalizeSnowSQLObjectNamePart(ctx.Col_decl().Column_name().Id_())+ normalizedOriginalColumnID := normalizeSnowflakeColumnName(ctx.Col_decl().Column_name())r.columnNullable[normalizedOriginalColumnID] = ctx.GetStart().GetLine()for _, nullNotNull := range ctx.AllNull_not_null() {if nullNotNull.NOT() != nil {@@ -151,7 +151,7 @@ func (r *ColumnNoNullRule) enterFullColDecl(ctx *parser.Full_col_declContext) {}}for _, constraint := range ctx.AllInline_constraint() {- if constraint.PRIMARY() != nil {+ if constraint.Primary_key() != nil {delete(r.columnNullable, normalizedOriginalColumnID)break}@@ -162,10 +162,10 @@ func (r *ColumnNoNullRule) enterOutOfLineConstraint(ctx *parser.Out_of_line_consif r.currentOriginalTableName == "" {return}- if ctx.PRIMARY() != nil {+ if ctx.Primary_key() != nil {for _, columnListInParentheses := range ctx.AllColumn_list_in_parentheses() {for _, column := range columnListInParentheses.Column_list().AllColumn_name() {- normalizedOriginalColumnID := snowsqlparser.NormalizeSnowSQLObjectNamePart(column.Id_())+ normalizedOriginalColumnID := normalizeSnowflakeColumnName(column)delete(r.columnNullable, normalizedOriginalColumnID)}}@@ -195,20 +195,35 @@ func (r *ColumnNoNullRule) enterTableColumnAction(ctx *parser.Table_column_actioreturn}if ctx.ADD() != nil {- normalizedNewColumnName := snowsqlparser.NormalizeSnowSQLObjectNamePart(ctx.Column_name(0).Id_())- inlineConstraintHasPK := ctx.Inline_constraint() != nil && ctx.Inline_constraint().PRIMARY() != nil- inlineConstraintHasNotNull := ctx.Inline_constraint() != nil && (ctx.Inline_constraint().Null_not_null() != nil && ctx.Inline_constraint().Null_not_null().NOT() != nil)- hasNotNull := ctx.Null_not_null() != nil && ctx.Null_not_null().NOT() != nil+ for _, fullColDecl := range ctx.AllFull_col_decl() {+ normalizedNewColumnName := normalizeSnowflakeColumnName(fullColDecl.Col_decl().Column_name())+ hasPK := false+ for _, inlineConstraint := range fullColDecl.AllInline_constraint() {+ if inlineConstraint.Primary_key() != nil {+ hasPK = true+ break+ }+ }+ hasNotNull := false+ for _, nullNotNull := range fullColDecl.AllNull_not_null() {+ if nullNotNull.NOT() != nil {+ hasNotNull = true+ break+ }+ }- if !inlineConstraintHasPK && !inlineConstraintHasNotNull && !hasNotNull {- r.columnNullable[normalizedNewColumnName] = ctx.GetStart().GetLine()+ if !hasPK && !hasNotNull {+ r.columnNullable[normalizedNewColumnName] = fullColDecl.GetStart().GetLine()+ }}return}if ctx.Alter_modify() != nil {- normalizedOriginalColumnName := snowsqlparser.NormalizeSnowSQLObjectNamePart(ctx.Column_name(0).Id_())- if len(ctx.AllDROP()) == 1 && ctx.NOT() != nil && ctx.NULL_() != nil {- r.columnNullable[normalizedOriginalColumnName] = ctx.GetStart().GetLine()+ for _, alterColumnClause := range ctx.AllAlter_column_clause() {+ normalizedOriginalColumnName := normalizeSnowflakeColumnName(alterColumnClause.Column_name())+ if alterColumnClause.DROP() != nil && alterColumnClause.NOT() != nil && alterColumnClause.NULL_() != nil {+ r.columnNullable[normalizedOriginalColumnName] = alterColumnClause.GetStart().GetLine()+ }}return}@@ -236,8 +251,19 @@ func (r *ColumnNoNullRule) enterAlterColumnDecl(ctx *parser.Alter_column_declConif r.currentOriginalTableName == "" {return}- normalizedNewColumnName := snowsqlparser.NormalizeSnowSQLObjectNamePart(ctx.Column_name().Id_())+ normalizedNewColumnName := normalizeSnowflakeColumnName(ctx.Column_name())if ctx.Alter_column_opts().DROP() != nil && ctx.Alter_column_opts().NOT() != nil && ctx.Alter_column_opts().NULL_() != nil {r.columnNullable[normalizedNewColumnName] = ctx.GetStart().GetLine()}}++func normalizeSnowflakeColumnName(columnName parser.IColumn_nameContext) string {+ if columnName == nil {+ return ""+ }+ allIDs := columnName.AllId_()+ if len(allIDs) == 0 {+ return ""+ }+ return snowsqlparser.NormalizeSnowSQLObjectNamePart(allIDs[len(allIDs)-1])+}diff --git a/backend/plugin/advisor/snowflake/rule_column_require.go b/backend/plugin/advisor/snowflake/rule_column_require.goindex 06b42c2ba7..bb1cde4ff5 100644--- a/backend/plugin/advisor/snowflake/rule_column_require.go+++ b/backend/plugin/advisor/snowflake/rule_column_require.go@@ -142,7 +142,7 @@ func (r *ColumnRequireRule) enterColumnDeclItemList(ctx *parser.Column_decl_itemallColumnDeclItems := ctx.AllColumn_decl_item()for _, columnDeclItem := range allColumnDeclItems {if fullColDecl := columnDeclItem.Full_col_decl(); fullColDecl != nil {- normalizedColumnName := snowsqlparser.NormalizeSnowSQLObjectNamePart(fullColDecl.Col_decl().Column_name().Id_())+ normalizedColumnName := normalizeSnowflakeColumnNameForRequire(fullColDecl.Col_decl().Column_name())delete(r.currentMissingColumn, normalizedColumnName)}}@@ -159,12 +159,20 @@ func (r *ColumnRequireRule) exitCreateTable(ctx *parser.Create_tableContext) {slices.Sort(columnNames)for _, column := range columnNames {+ line := ctx.GetStart().GetLine()+ if createTableClause := ctx.Create_table_clause(); createTableClause != nil {+ if columnDeclItemListParen := createTableClause.Column_decl_item_list_paren(); columnDeclItemListParen != nil {+ if columnDeclItemList := columnDeclItemListParen.Column_decl_item_list(); columnDeclItemList != nil && columnDeclItemList.GetStop() != nil {+ line = columnDeclItemList.GetStop().GetLine()+ }+ }+ }r.AddAdvice(&storepb.Advice{Status: r.level,Code: code.NoRequiredColumn.Int32(),Title: r.title,Content: fmt.Sprintf("Table %s missing required column %q", r.currentOriginalTableName, column),- StartPosition: common.ConvertANTLRLineToPosition(r.baseLine + ctx.Column_decl_item_list().GetStop().GetLine()),+ StartPosition: common.ConvertANTLRLineToPosition(r.baseLine + line),})}r.currentOriginalTableName = ""@@ -177,7 +185,7 @@ func (r *ColumnRequireRule) enterAlterTable(ctx *parser.Alter_tableContext) {}func (r *ColumnRequireRule) enterTableColumnAction(ctx *parser.Table_column_actionContext) {- if r.currentOriginalTableName == "" || len(ctx.AllDROP()) != 1 || ctx.Alter_modify() != nil {+ if r.currentOriginalTableName == "" || ctx.DROP() == nil || ctx.Alter_modify() != nil {return}@@ -190,6 +198,17 @@ func (r *ColumnRequireRule) enterTableColumnAction(ctx *parser.Table_column_acti}}+func normalizeSnowflakeColumnNameForRequire(columnName parser.IColumn_nameContext) string {+ if columnName == nil {+ return ""+ }+ allIDs := columnName.AllId_()+ if len(allIDs) == 0 {+ return ""+ }+ return snowsqlparser.NormalizeSnowSQLObjectNamePart(allIDs[len(allIDs)-1])+}+func (r *ColumnRequireRule) exitAlterTable(ctx *parser.Alter_tableContext) {columnNames := make([]string, 0, len(r.currentMissingColumn))for column := range r.currentMissingColumn {diff --git a/backend/plugin/advisor/snowflake/rule_migration_compatibility.go b/backend/plugin/advisor/snowflake/rule_migration_compatibility.goindex a8ee7037f1..2b1ad1b047 100644--- a/backend/plugin/advisor/snowflake/rule_migration_compatibility.go+++ b/backend/plugin/advisor/snowflake/rule_migration_compatibility.go@@ -201,14 +201,18 @@ func (r *MigrationCompatibilityRule) enterAlterTable(ctx *parser.Alter_tableContif tableColumnAction == nil {return}- dropColumn := tableColumnAction.DROP(0)+ dropColumn := tableColumnAction.DROP()if dropColumn == nil {return}allColumnName := tableColumnAction.Column_list().AllColumn_name()normalizedAllColumnNames := make([]string, 0, len(allColumnName))for _, columnName := range allColumnName {- normalizedAllColumnNames = append(normalizedAllColumnNames, fmt.Sprintf("%q", snowsqlparser.NormalizeSnowSQLObjectNamePart(columnName.Id_())))+ allIDs := columnName.AllId_()+ if len(allIDs) == 0 {+ continue+ }+ normalizedAllColumnNames = append(normalizedAllColumnNames, fmt.Sprintf("%q", snowsqlparser.NormalizeSnowSQLObjectNamePart(allIDs[len(allIDs)-1])))}r.AddAdvice(&storepb.Advice{Status: r.level,diff --git a/backend/plugin/advisor/snowflake/rule_naming_identifier_case.go b/backend/plugin/advisor/snowflake/rule_naming_identifier_case.goindex 36f24193eb..d6156981e1 100644--- a/backend/plugin/advisor/snowflake/rule_naming_identifier_case.go+++ b/backend/plugin/advisor/snowflake/rule_naming_identifier_case.go@@ -117,7 +117,11 @@ func (r *NamingIdentifierCaseRule) enterColumnDeclItemList(ctx *parser.Column_defor _, item := range allItems {if fullColDecl := item.Full_col_decl(); fullColDecl != nil {- originalID := fullColDecl.Col_decl().Column_name().Id_()+ allIDs := fullColDecl.Col_decl().Column_name().AllId_()+ if len(allIDs) == 0 {+ continue+ }+ originalID := allIDs[len(allIDs)-1]originalColName := snowsqlparser.NormalizeSnowSQLObjectNamePart(originalID)if strings.ToUpper(originalColName) != originalColName {r.AddAdvice(&storepb.Advice{@@ -137,7 +141,12 @@ func (r *NamingIdentifierCaseRule) enterAlterTable(ctx *parser.Alter_tableContexreturn}r.currentOriginalTableName = ctx.Object_name(0).GetText()- renameToID := ctx.Table_column_action().Column_name(1).Id_()+ renameColumnName := ctx.Table_column_action().Column_name(1)+ allIDs := renameColumnName.AllId_()+ if len(allIDs) == 0 {+ return+ }+ renameToID := allIDs[len(allIDs)-1]renameToColName := snowsqlparser.NormalizeSnowSQLObjectNamePart(renameToID)if strings.ToUpper(renameToColName) != renameToColName {r.AddAdvice(&storepb.Advice{diff --git a/backend/plugin/advisor/snowflake/rule_naming_identifier_no_keyword.go b/backend/plugin/advisor/snowflake/rule_naming_identifier_no_keyword.goindex c4e80dd73c..412ab53655 100644--- a/backend/plugin/advisor/snowflake/rule_naming_identifier_no_keyword.go+++ b/backend/plugin/advisor/snowflake/rule_naming_identifier_no_keyword.go@@ -117,7 +117,11 @@ func (r *NamingIdentifierNoKeywordRule) enterColumnDeclItemList(ctx *parser.Colufor _, item := range allItems {if fullColDecl := item.Full_col_decl(); fullColDecl != nil {- originalID := fullColDecl.Col_decl().Column_name().Id_()+ allIDs := fullColDecl.Col_decl().Column_name().AllId_()+ if len(allIDs) == 0 {+ continue+ }+ originalID := allIDs[len(allIDs)-1]originalColName := snowsqlparser.NormalizeSnowSQLObjectNamePart(originalID)if snowsqlparser.IsSnowflakeKeyword(originalColName, false) {r.AddAdvice(&storepb.Advice{@@ -137,7 +141,12 @@ func (r *NamingIdentifierNoKeywordRule) enterAlterTable(ctx *parser.Alter_tableCreturn}r.currentOriginalTableName = ctx.Object_name(0).GetText()- renameToID := ctx.Table_column_action().Column_name(1).Id_()+ renameColumnName := ctx.Table_column_action().Column_name(1)+ allIDs := renameColumnName.AllId_()+ if len(allIDs) == 0 {+ return+ }+ renameToID := allIDs[len(allIDs)-1]renameToColName := snowsqlparser.NormalizeSnowSQLObjectNamePart(renameToID)if snowsqlparser.IsSnowflakeKeyword(renameToColName, false) {r.AddAdvice(&storepb.Advice{diff --git a/backend/plugin/advisor/snowflake/rule_select_no_select_all.go b/backend/plugin/advisor/snowflake/rule_select_no_select_all.goindex 1a2de82076..0645679dfe 100644--- a/backend/plugin/advisor/snowflake/rule_select_no_select_all.go+++ b/backend/plugin/advisor/snowflake/rule_select_no_select_all.go@@ -87,15 +87,13 @@ func (*SelectNoSelectAllRule) OnExit(_ antlr.ParserRuleContext, _ string) error}func (r *SelectNoSelectAllRule) enterSelectListElem(ctx *parser.Select_list_elemContext) {- if v := ctx.Column_elem(); v != nil {- if v.STAR() != nil {- r.AddAdvice(&storepb.Advice{- Status: r.level,- Code: code.StatementSelectAll.Int32(),- Title: r.title,- Content: "Avoid using SELECT *.",- StartPosition: common.ConvertANTLRLineToPosition(r.baseLine + v.STAR().GetSymbol().GetLine()),- })- }+ if v := ctx.Column_elem_star(); v != nil {+ r.AddAdvice(&storepb.Advice{+ Status: r.level,+ Code: code.StatementSelectAll.Int32(),+ Title: r.title,+ Content: "Avoid using SELECT *.",+ StartPosition: common.ConvertANTLRLineToPosition(r.baseLine + v.STAR().GetSymbol().GetLine()),+ })}}diff --git a/backend/plugin/advisor/snowflake/rule_table_no_foreign_key.go b/backend/plugin/advisor/snowflake/rule_table_no_foreign_key.goindex a93dbbeb1d..9615505cdd 100644--- a/backend/plugin/advisor/snowflake/rule_table_no_foreign_key.go+++ b/backend/plugin/advisor/snowflake/rule_table_no_foreign_key.go@@ -185,7 +185,7 @@ func (r *TableNoForeignKeyRule) enterConstraintAction(ctx *parser.Constraint_actif r.currentNormalizedTableName == "" {return}- if ctx.DROP() != nil && ctx.FOREIGN() != nil {+ if ctx.DROP() != nil && ctx.Foreign_key() != nil {if times, ok := r.tableForeignKeyTimes[r.currentNormalizedTableName]; ok && times > 0 {r.tableForeignKeyTimes[r.currentNormalizedTableName]--}diff --git a/backend/plugin/advisor/snowflake/rule_table_require_pk.go b/backend/plugin/advisor/snowflake/rule_table_require_pk.goindex c259b4dce9..93bb4a81b1 100644--- a/backend/plugin/advisor/snowflake/rule_table_require_pk.go+++ b/backend/plugin/advisor/snowflake/rule_table_require_pk.go@@ -172,14 +172,14 @@ func (r *TableRequirePkRule) exitCreateTable() {}func (r *TableRequirePkRule) enterInlineConstraint(ctx *parser.Inline_constraintContext) {- if ctx.PRIMARY() == nil || r.currentNormalizedTableName == "" {+ if ctx.Primary_key() == nil || r.currentNormalizedTableName == "" {return}r.tableHasPrimaryKey[r.currentNormalizedTableName] = true}func (r *TableRequirePkRule) enterOutOfLineConstraint(ctx *parser.Out_of_line_constraintContext) {- if ctx.PRIMARY() == nil || r.currentNormalizedTableName == "" || r.currentConstraintAction == currentConstraintActionNone {+ if ctx.Primary_key() == nil || r.currentNormalizedTableName == "" || r.currentConstraintAction == currentConstraintActionNone {return}switch r.currentConstraintAction {@@ -197,7 +197,7 @@ func (r *TableRequirePkRule) enterConstraintAction(ctx *parser.Constraint_actionif r.currentNormalizedTableName == "" {return}- if ctx.DROP() != nil && ctx.PRIMARY() != nil {+ if ctx.DROP() != nil && (ctx.Primary_key() != nil || ctx.PRIMARY() != nil) {if _, ok := r.tableHasPrimaryKey[r.currentNormalizedTableName]; ok {r.tableHasPrimaryKey[r.currentNormalizedTableName] = falser.tableLine[r.currentNormalizedTableName] = r.baseLine + ctx.GetStart().GetLine()diff --git a/backend/plugin/advisor/snowflake/rule_where_require_select.go b/backend/plugin/advisor/snowflake/rule_where_require_select.goindex d24debb206..9f67acb3a4 100644--- a/backend/plugin/advisor/snowflake/rule_where_require_select.go+++ b/backend/plugin/advisor/snowflake/rule_where_require_select.go@@ -74,8 +74,8 @@ func (*WhereRequireForSelectRule) Name() string {// OnEnter is called when entering a parse tree node.func (r *WhereRequireForSelectRule) OnEnter(ctx antlr.ParserRuleContext, nodeType string) error {- if nodeType == NodeTypeQueryStatement {- r.enterQueryStatement(ctx.(*parser.Query_statementContext))+ if nodeType == NodeTypeSelectStatement {+ r.enterSelectStatement(ctx.(*parser.Select_statementContext))}return nil}@@ -86,11 +86,11 @@ func (*WhereRequireForSelectRule) OnExit(_ antlr.ParserRuleContext, _ string) erreturn nil}-func (r *WhereRequireForSelectRule) enterQueryStatement(ctx *parser.Query_statementContext) {- if ctx.Select_statement() == nil {+func (r *WhereRequireForSelectRule) enterSelectStatement(ctx *parser.Select_statementContext) {+ if ctx == nil {return}- optional := ctx.Select_statement().Select_optional_clauses()+ optional := ctx.Select_optional_clauses()if optional == nil {return}diff --git a/backend/plugin/advisor/snowflake/test/column_no_null.yaml b/backend/plugin/advisor/snowflake/test/column_no_null.yamlindex 0979a4b7db..62912b37d0 100644--- a/backend/plugin/advisor/snowflake/test/column_no_null.yaml+++ b/backend/plugin/advisor/snowflake/test/column_no_null.yaml@@ -68,7 +68,7 @@- status: 2code: 402title: COLUMN_NO_NULL- content: After dropping NOT NULL of column AGE, it will be nullable, which is not allowed.+ content: Column AGE is nullable, which is not allowed.startposition:line: 1column: 0diff --git a/backend/plugin/advisor/snowflake/test/statement_where_require_select.yaml b/backend/plugin/advisor/snowflake/test/statement_where_require_select.yamlindex fec3f89090..7067ea6aed 100644--- a/backend/plugin/advisor/snowflake/test/statement_where_require_select.yaml+++ b/backend/plugin/advisor/snowflake/test/statement_where_require_select.yaml@@ -39,7 +39,7 @@title: STATEMENT_WHERE_REQUIRE_SELECTcontent: WHERE clause is required for SELECT statement.startposition:- line: 1+ line: 5column: 0endposition: null- status: 2@@ -47,7 +47,7 @@title: STATEMENT_WHERE_REQUIRE_SELECTcontent: WHERE clause is required for SELECT statement.startposition:- line: 5+ line: 8column: 0endposition: null- statement: |-diff --git a/backend/plugin/advisor/snowflake/test/table_no_foreign_key.yaml b/backend/plugin/advisor/snowflake/test/table_no_foreign_key.yamlindex 3b1e0571b1..ad2fce0c37 100644--- a/backend/plugin/advisor/snowflake/test/table_no_foreign_key.yaml+++ b/backend/plugin/advisor/snowflake/test/table_no_foreign_key.yaml@@ -1,7 +1,7 @@- statement: |-CREATE TABLE CUSTOMER(- ID INT REFERENCES PERSON(ID),+ ID INT FOREIGN KEY REFERENCES PERSON(ID),FULL_NAME VARCHAR(10),POSITION VARCHAR(100));@@ -21,7 +21,7 @@ID INT,FULL_NAME VARCHAR(10),POSITION VARCHAR(100),- (ID) REFERENCES PERSON(ID)+ FOREIGN KEY (ID) REFERENCES PERSON(ID));changeType: 1want:@@ -40,7 +40,7 @@FULL_NAME VARCHAR(10),POSITION VARCHAR(100));- ALTER TABLE CUSTOMER ADD (ID) REFERENCES PERSON(ID);+ ALTER TABLE CUSTOMER ADD FOREIGN KEY (ID) REFERENCES PERSON(ID);changeType: 1want:- status: 2@@ -54,7 +54,7 @@- statement: |-CREATE TABLE "ANOTHER_SCHEMA"."CUSTOMER"(- ID INT REFERENCES PERSON(ID),+ ID INT FOREIGN KEY REFERENCES PERSON(ID),FULL_NAME VARCHAR(10),POSITION VARCHAR(100));@@ -72,7 +72,7 @@- statement: |-CREATE TABLE CUSTOMER(- ID INT REFERENCES PERSON(ID),+ ID INT FOREIGN KEY REFERENCES PERSON(ID),FULL_NAME VARCHAR(10),POSITION VARCHAR(100));diff --git a/backend/plugin/db/snowflake/query.go b/backend/plugin/db/snowflake/query.goindex dbdbf8020c..173c10fe18 100644--- a/backend/plugin/db/snowflake/query.go+++ b/backend/plugin/db/snowflake/query.go@@ -67,21 +67,16 @@ func (r *snowsqlRewriter) EnterQuery_statement(ctx *snowsql.Query_statementConte// if has set_operators, use last select_statement of set_operator.var selectCtx *snowsql.Select_statementContext- if ctx.AllSet_operators() != nil {+ if len(ctx.AllSet_operators()) > 0 {setOperator := ctx.Set_operators(len(ctx.AllSet_operators()) - 1)- if setOperator != nil && setOperator.Select_statement() != nil {- var ok bool- if selectCtx, ok = setOperator.Select_statement().(*snowsql.Select_statementContext); !ok {- return- }- }+ selectCtx = findRightMostSelectStatement(setOperator.Select_statement_in_parentheses())}// otherwise, ues outermost direct select_statement.if selectCtx == nil {- var ok bool- if selectCtx, ok = ctx.Select_statement().(*snowsql.Select_statementContext); !ok {- return- }+ selectCtx = findRightMostSelectStatement(ctx.Select_statement_in_parentheses())+ }+ if selectCtx == nil {+ return}limitClause := selectCtx.Limit_clause()@@ -135,3 +130,26 @@ func (r *snowsqlRewriter) EnterQuery_statement(ctx *snowsql.Query_statementConte// Append after select_optional_clauses.r.rewriter.InsertAfterDefault(selectCtx.Select_optional_clauses().GetStop().GetTokenIndex(), fmt.Sprintf(" LIMIT %d", r.limitCount))}++func findRightMostSelectStatement(ctx snowsql.ISelect_statement_in_parenthesesContext) *snowsql.Select_statementContext {+ if ctx == nil {+ return nil+ }++ if setOperator := ctx.Set_operators(); setOperator != nil {+ if selectCtx := findRightMostSelectStatement(setOperator.Select_statement_in_parentheses()); selectCtx != nil {+ return selectCtx+ }+ }+ if nested := ctx.Select_statement_in_parentheses(); nested != nil {+ if selectCtx := findRightMostSelectStatement(nested); selectCtx != nil {+ return selectCtx+ }+ }+ if selectStatement := ctx.Select_statement(); selectStatement != nil {+ if selectCtx, ok := selectStatement.(*snowsql.Select_statementContext); ok {+ return selectCtx+ }+ }+ return nil+}diff --git a/backend/plugin/parser/snowflake/query_span_extractor.go b/backend/plugin/parser/snowflake/query_span_extractor.goindex 893ad528b1..81900d90e1 100644--- a/backend/plugin/parser/snowflake/query_span_extractor.go+++ b/backend/plugin/parser/snowflake/query_span_extractor.go@@ -151,86 +151,14 @@ func (l *selectOnlyListener) EnterDml_command(ctx *parser.Dml_commandContext) {}func (q *querySpanExtractor) extractPseudoTableFromQueryStatement(ctx parser.IQuery_statementContext) (*base.PseudoTable, error) {- if ctx.With_expression() != nil {- allCommandTableExpression := ctx.With_expression().AllCommon_table_expression()- for _, commandTableExpression := range allCommandTableExpression {- normalizedCTEName := NormalizeSnowSQLObjectNamePart(commandTableExpression.Id_())- var err error- var pseudoTable *base.PseudoTable- if commandTableExpression.RECURSIVE() != nil || commandTableExpression.UNION() != nil {- // TODO(zp): refactor code- anchorTableSource, err := q.extractPseudoTableFromQueryStatement(commandTableExpression.Anchor_clause().Query_statement())- if err != nil {- return nil, errors.Wrapf(err, "failed to extract sensitive fields of the anchor clause of recursive CTE %q near line %d", normalizedCTEName, commandTableExpression.GetStart().GetLine())- }- tempCte := &base.PseudoTable{- Name: normalizedCTEName,- Columns: anchorTableSource.GetQuerySpanResult(),- }- q.ctes = append(q.ctes, tempCte)- originalSize := len(q.ctes)- for {- originalSize := len(q.ctes)- recursivePartTableSource, err := q.extractPseudoTableFromQueryStatement(commandTableExpression.Recursive_clause().Query_statement())- if err != nil {- return nil, errors.Wrapf(err, "failed to extract sensitive fields of the recursive clause of recursive CTE %q near line %d", normalizedCTEName, commandTableExpression.Recursive_clause().GetStart().GetLine())- }- anchorQuerySpanResults := q.ctes[originalSize-1].GetQuerySpanResult()- recursivePartQuerySpanResults := recursivePartTableSource.GetQuerySpanResult()- if len(anchorQuerySpanResults) != len(recursivePartQuerySpanResults) {- return nil, errors.Errorf("recursive clause returns %d fields, but anchor clause returns %d fields in recursive CTE %q near line %d", len(anchorQuerySpanResults), len(recursivePartQuerySpanResults), normalizedCTEName, commandTableExpression.GetStart().GetLine())- }- changed := false- for i := range anchorQuerySpanResults {- var hasChange bool- anchorQuerySpanResults[i].SourceColumns, hasChange = base.MergeSourceColumnSet(anchorQuerySpanResults[i].SourceColumns, recursivePartQuerySpanResults[i].SourceColumns)- changed = changed || hasChange- }- tempCte := &base.PseudoTable{- Name: normalizedCTEName,- Columns: anchorQuerySpanResults,- }- q.ctes = q.ctes[:originalSize-1]- if !changed {- break- }- q.ctes = append(q.ctes, tempCte)- }- q.ctes = q.ctes[:originalSize-1]- pseudoTable = tempCte- } else {- pseudoTable, err = q.extractPseudoTableFromQueryStatement(commandTableExpression.Query_statement())- if err != nil {- return nil, errors.Wrapf(err, "failed to extract sensitive fields of the CTE %q near line %d", normalizedCTEName, commandTableExpression.GetStart().GetLine())- }- }-- if commandTableExpression.Column_list() != nil {- if len(commandTableExpression.Column_list().AllColumn_name()) != len(pseudoTable.GetQuerySpanResult()) {- return nil, errors.Errorf("the number of columns in the CTE %q near line %d returns %d fields, but the column list returns %d fields", normalizedCTEName, commandTableExpression.GetStart().GetLine(), len(pseudoTable.GetQuerySpanResult()), len(commandTableExpression.Column_list().AllColumn_name()))- }- for i, columnName := range commandTableExpression.Column_list().AllColumn_name() {- newPseudoTable := &base.PseudoTable{- Name: normalizedCTEName,- Columns: make([]base.QuerySpanResult, 0),- }- newPseudoTable.Columns = append(newPseudoTable.Columns, pseudoTable.GetQuerySpanResult()[:i]...)- newPseudoTable.Columns = append(newPseudoTable.Columns, base.QuerySpanResult{- Name: NormalizeSnowSQLObjectNamePart(columnName.Id_()),- SourceColumns: pseudoTable.GetQuerySpanResult()[i].SourceColumns,- })- newPseudoTable.Columns = append(newPseudoTable.Columns, pseudoTable.GetQuerySpanResult()[i+1:]...)- pseudoTable = newPseudoTable- }- }- q.ctes = append(q.ctes, pseudoTable)- }+ if err := q.extractCTEFromWithExpression(ctx.With_expression()); err != nil {+ return nil, err}- selectStatement := ctx.Select_statement()- result, err := q.extractPseudoTableFromSelectStatement(selectStatement)+ selectStatementInParentheses := ctx.Select_statement_in_parentheses()+ result, err := q.extractPseudoTableFromSelectStatementInParentheses(selectStatementInParentheses)if err != nil {- return nil, errors.Wrapf(err, "failed to extract sensitive fields of the query statement near line %d", selectStatement.GetStart().GetLine())+ return nil, errors.Wrapf(err, "failed to extract sensitive fields of the query statement near line %d", selectStatementInParentheses.GetStart().GetLine())}allSetOperators := ctx.AllSet_operators()@@ -241,20 +169,219 @@ func (q *querySpanExtractor) extractPseudoTableFromQueryStatement(ctx parser.IQuif err != nil {return nil, errors.Wrapf(err, "failed to extract the %d set operator near line %d", i+1, setOperator.GetStart().GetLine())}- resultQuerySpanResults := result.GetQuerySpanResult()- rightQuerySpanResults := right.GetQuerySpanResult()- if len(resultQuerySpanResults) != len(rightQuerySpanResults) {- return nil, errors.Errorf("the number of columns in the query statement nearly line %d returns %d fields, but %d set operator near line %d returns %d fields", selectStatement.GetStart().GetLine(), len(resultQuerySpanResults), i+1, setOperator.GetStart().GetLine(), len(rightQuerySpanResults))+ if err := mergeSetOperatorColumns(result, right, selectStatementInParentheses.GetStart().GetLine(), i+1, setOperator.GetStart().GetLine()); err != nil {+ return nil, err+ }+ }+ return result, nil+}++func (q *querySpanExtractor) extractCTEFromWithExpression(withExpression parser.IWith_expressionContext) error {+ if withExpression == nil {+ return nil+ }++ for _, commonTableExpression := range withExpression.AllCommon_table_expression() {+ normalizedCTEName := NormalizeSnowSQLObjectNamePart(commonTableExpression.Id_())+ isRecursiveCTE := withExpression.RECURSIVE() != nil || hasSetOperatorInSelectStatementInParentheses(commonTableExpression.Select_statement_in_parentheses())+ if isRecursiveCTE {+ if err := q.extractRecursiveCTE(normalizedCTEName, commonTableExpression); err != nil {+ return err+ }+ continue+ }++ pseudoTable, err := q.extractPseudoTableFromSelectStatementInParentheses(commonTableExpression.Select_statement_in_parentheses())+ if err != nil {+ return errors.Wrapf(err, "failed to extract sensitive fields of the CTE %q near line %d", normalizedCTEName, commonTableExpression.GetStart().GetLine())}- for i := range rightQuerySpanResults {- result.Columns[i].SourceColumns, _ = base.MergeSourceColumnSet(resultQuerySpanResults[i].SourceColumns, rightQuerySpanResults[i].SourceColumns)+ pseudoTable, err = applyCTEColumnList(normalizedCTEName, pseudoTable, commonTableExpression.Column_list())+ if err != nil {+ return errors.Wrapf(err, "failed to extract sensitive fields of the CTE %q near line %d", normalizedCTEName, commonTableExpression.GetStart().GetLine())}+ q.ctes = append(q.ctes, pseudoTable)+ }+ return nil+}++func hasSetOperatorInSelectStatementInParentheses(ctx parser.ISelect_statement_in_parenthesesContext) bool {+ if ctx == nil {+ return false+ }+ if ctx.Set_operators() != nil {+ return true+ }+ return hasSetOperatorInSelectStatementInParentheses(ctx.Select_statement_in_parentheses())+}++func (q *querySpanExtractor) extractRecursiveCTE(cteName string, commonTableExpression parser.ICommon_table_expressionContext) error {+ anchorTableSource, err := q.extractAnchorPseudoTableFromSelectStatementInParentheses(commonTableExpression.Select_statement_in_parentheses())+ if err != nil {+ return errors.Wrapf(err, "failed to extract sensitive fields of the anchor clause of recursive CTE %q near line %d", cteName, commonTableExpression.GetStart().GetLine())+ }+ anchorTableSource, err = applyCTEColumnList(cteName, anchorTableSource, commonTableExpression.Column_list())+ if err != nil {+ return errors.Wrapf(err, "failed to extract sensitive fields of the anchor clause of recursive CTE %q near line %d", cteName, commonTableExpression.GetStart().GetLine())+ }++ q.ctes = append(q.ctes, anchorTableSource)+ for {+ recursivePartTableSource, err := q.extractPseudoTableFromSelectStatementInParentheses(commonTableExpression.Select_statement_in_parentheses())+ if err != nil {+ return errors.Wrapf(err, "failed to extract sensitive fields of the recursive clause of recursive CTE %q near line %d", cteName, commonTableExpression.GetStart().GetLine())+ }+ recursivePartTableSource, err = applyCTEColumnList(cteName, recursivePartTableSource, commonTableExpression.Column_list())+ if err != nil {+ return errors.Wrapf(err, "failed to extract sensitive fields of the recursive clause of recursive CTE %q near line %d", cteName, commonTableExpression.GetStart().GetLine())+ }++ currentCTE := q.ctes[len(q.ctes)-1]+ mergedColumns, changed, err := mergeQuerySpanResults(currentCTE.GetQuerySpanResult(), recursivePartTableSource.GetQuerySpanResult(), cteName, commonTableExpression.GetStart().GetLine())+ if err != nil {+ return err+ }+ q.ctes[len(q.ctes)-1] = &base.PseudoTable{+ Name: cteName,+ Columns: mergedColumns,+ }+ if !changed {+ break+ }+ }+ return nil+}++func (q *querySpanExtractor) extractAnchorPseudoTableFromSelectStatementInParentheses(ctx parser.ISelect_statement_in_parenthesesContext) (*base.PseudoTable, error) {+ if ctx == nil {+ return nil, errors.Errorf("empty select statement in parentheses")+ }+ if nested := ctx.Select_statement_in_parentheses(); nested != nil {+ return q.extractAnchorPseudoTableFromSelectStatementInParentheses(nested)+ }+ if selectStatement := ctx.Select_statement(); selectStatement != nil {+ return q.extractPseudoTableFromSelectStatement(selectStatement)+ }+ if withExpression := ctx.With_expression(); withExpression != nil {+ originalCTECount := len(q.ctes)+ if err := q.extractCTEFromWithExpression(withExpression); err != nil {+ return nil, err+ }+ defer func() {+ q.ctes = q.ctes[:originalCTECount]+ }()+ if setOperator := ctx.Set_operators(); setOperator != nil {+ return q.extractPseudoTableFromSetOperator(setOperator)+ }+ return nil, errors.Errorf("failed to extract anchor statement near line %d", ctx.GetStart().GetLine())+ }+ return nil, errors.Errorf("failed to extract anchor statement near line %d", ctx.GetStart().GetLine())+}++func applyCTEColumnList(cteName string, pseudoTable *base.PseudoTable, columnList parser.IColumn_listContext) (*base.PseudoTable, error) {+ if pseudoTable == nil {+ pseudoTable = &base.PseudoTable{+ Name: cteName,+ Columns: []base.QuerySpanResult{},+ }+ }++ result := &base.PseudoTable{+ Name: cteName,+ Columns: make([]base.QuerySpanResult, len(pseudoTable.GetQuerySpanResult())),+ }+ copy(result.Columns, pseudoTable.GetQuerySpanResult())++ if columnList == nil {+ return result, nil+ }+ if len(columnList.AllColumn_name()) != len(result.GetQuerySpanResult()) {+ return nil, errors.Errorf("the number of columns in the CTE %q near line %d returns %d fields, but the column list returns %d fields", cteName, columnList.GetStart().GetLine(), len(result.GetQuerySpanResult()), len(columnList.AllColumn_name()))+ }+ for i, columnName := range columnList.AllColumn_name() {+ result.Columns[i].Name = normalizeSnowSQLColumnName(columnName)}return result, nil}+func mergeQuerySpanResults(currentColumns, newColumns []base.QuerySpanResult, cteName string, line int) ([]base.QuerySpanResult, bool, error) {+ if len(currentColumns) != len(newColumns) {+ return nil, false, errors.Errorf("recursive clause returns %d fields, but anchor clause returns %d fields in recursive CTE %q near line %d", len(newColumns), len(currentColumns), cteName, line)+ }++ mergedColumns := make([]base.QuerySpanResult, len(currentColumns))+ copy(mergedColumns, currentColumns)+ changed := false+ for i := range mergedColumns {+ var hasChange bool+ mergedColumns[i].SourceColumns, hasChange = base.MergeSourceColumnSet(mergedColumns[i].SourceColumns, newColumns[i].SourceColumns)+ changed = changed || hasChange+ }+ return mergedColumns, changed, nil+}++func mergeSetOperatorColumns(left, right *base.PseudoTable, leftLine, setOperatorIndex, rightLine int) error {+ if left == nil || right == nil {+ return nil+ }+ leftColumns := left.GetQuerySpanResult()+ rightColumns := right.GetQuerySpanResult()+ if len(leftColumns) != len(rightColumns) {+ return errors.Errorf("the number of columns in the query statement nearly line %d returns %d fields, but %d set operator near line %d returns %d fields", leftLine, len(leftColumns), setOperatorIndex, rightLine, len(rightColumns))+ }+ for i := range rightColumns {+ left.Columns[i].SourceColumns, _ = base.MergeSourceColumnSet(leftColumns[i].SourceColumns, rightColumns[i].SourceColumns)+ }+ return nil+}+func (q *querySpanExtractor) extractPseudoTableFromSetOperator(ctx parser.ISet_operatorsContext) (*base.PseudoTable, error) {- return q.extractPseudoTableFromSelectStatement(ctx.Select_statement())+ return q.extractPseudoTableFromSelectStatementInParentheses(ctx.Select_statement_in_parentheses())+}++func (q *querySpanExtractor) extractPseudoTableFromSelectStatementInParentheses(ctx parser.ISelect_statement_in_parenthesesContext) (*base.PseudoTable, error) {+ if ctx == nil {+ return nil, nil+ }++ var result *base.PseudoTable+ var err error+ if selectStatement := ctx.Select_statement(); selectStatement != nil {+ result, err = q.extractPseudoTableFromSelectStatement(selectStatement)+ if err != nil {+ return nil, err+ }+ } else if nested := ctx.Select_statement_in_parentheses(); nested != nil {+ result, err = q.extractPseudoTableFromSelectStatementInParentheses(nested)+ if err != nil {+ return nil, err+ }+ } else if withExpression := ctx.With_expression(); withExpression != nil {+ originalCTECount := len(q.ctes)+ if err := q.extractCTEFromWithExpression(withExpression); err != nil {+ return nil, err+ }+ defer func() {+ q.ctes = q.ctes[:originalCTECount]+ }()+ }++ if setOperator := ctx.Set_operators(); setOperator != nil {+ right, err := q.extractPseudoTableFromSetOperator(setOperator)+ if err != nil {+ return nil, errors.Wrapf(err, "failed to extract set operator near line %d", setOperator.GetStart().GetLine())+ }+ if result == nil {+ return right, nil+ }+ if err := mergeSetOperatorColumns(result, right, ctx.GetStart().GetLine(), 1, setOperator.GetStart().GetLine()); err != nil {+ return nil, err+ }+ }++ if result == nil {+ return nil, errors.Errorf("failed to extract select statement near line %d", ctx.GetStart().GetLine())+ }+ return result, nil}func (q *querySpanExtractor) extractPseudoTableFromSelectStatement(ctx parser.ISelect_statementContext) (*base.PseudoTable, error) {@@ -262,7 +389,7 @@ func (q *querySpanExtractor) extractPseudoTableFromSelectStatement(ctx parser.ISreturn nil, nil}- if ctx.Select_optional_clauses().From_clause() != nil {+ if ctx.Select_optional_clauses() != nil && ctx.Select_optional_clauses().From_clause() != nil {tableSourcesFrom, err := q.extractTableSourceFromFromClause(ctx.Select_optional_clauses().From_clause())if err != nil {return nil, err@@ -283,27 +410,34 @@ func (q *querySpanExtractor) extractPseudoTableFromSelectStatement(ctx parser.ISif ctx.Select_clause() != nil {selectList = ctx.Select_clause().Select_list_no_top().Select_list()} else if ctx.Select_top_clause() != nil {- selectList = ctx.Select_clause().Select_list_no_top().Select_list()+ selectList = ctx.Select_top_clause().Select_list_top().Select_list()+ }+ if selectList == nil {+ return result, nil}for _, iSelectListElem := range selectList.AllSelect_list_elem() {- if columnElem := iSelectListElem.Column_elem(); columnElem != nil {+ if columnElemStar := iSelectListElem.Column_elem_star(); columnElemStar != nil {+ normalizedDatabaseName, normalizedSchemaName, normalizedTableName := normalizedObjectNameOrAlias(columnElemStar.Object_name_or_alias())+ left, err := q.getAllFieldsOfTableInFromOrOuterCTE(normalizedDatabaseName, normalizedSchemaName, normalizedTableName)+ if err != nil {+ return nil, errors.Wrapf(err, "failed to extract sensitive fields of the query statement near line %d", ctx.GetStart().GetLine())+ }+ left = filterExcludedColumns(left, iSelectListElem.Exclude_clause())+ result.Columns = append(result.Columns, left...)+ } else if columnElem := iSelectListElem.Column_elem(); columnElem != nil {var normalizedDatabaseName, normalizedSchemaName, normalizedTableName, normalizedColumnName string- if v := columnElem.Alias(); v != nil {- normalizedTableName = NormalizeSnowSQLObjectNamePart(v.Id_())- } else if v := columnElem.Object_name(); v != nil {- normalizedDatabaseName, normalizedSchemaName, normalizedTableName = normalizedObjectName(v, "", "")+ if v := columnElem.Object_name_or_alias(); v != nil {+ normalizedDatabaseName, normalizedSchemaName, normalizedTableName = normalizedObjectNameOrAlias(v)}- if columnElem.STAR() != nil {- left, err := q.getAllFieldsOfTableInFromOrOuterCTE(normalizedDatabaseName, normalizedSchemaName, normalizedTableName)- if err != nil {- return nil, errors.Wrapf(err, "failed to extract sensitive fields of the query statement near line %d", ctx.GetStart().GetLine())+ if columnName := columnElem.Column_name(); columnName != nil {+ ids := columnName.AllId_()+ if normalizedTableName == "" && len(ids) == 2 {+ normalizedTableName = NormalizeSnowSQLObjectNamePart(ids[0])}- result.Columns = append(result.Columns, left...)- } else if columnElem.Column_name() != nil {- normalizedColumnName = NormalizeSnowSQLObjectNamePart(columnElem.Column_name().Id_())+ normalizedColumnName = normalizeSnowSQLColumnName(columnName)querySpanResult, err := q.getField(normalizedDatabaseName, normalizedSchemaName, normalizedTableName, normalizedColumnName)if err != nil {- return nil, errors.Wrapf(err, "failed to check whether the column %q is sensitive near line %d", normalizedColumnName, columnElem.Column_name().GetStart().GetLine())+ return nil, errors.Wrapf(err, "failed to check whether the column %q is sensitive near line %d", normalizedColumnName, columnName.GetStart().GetLine())}result.Columns = append(result.Columns, querySpanResult)} else if columnElem.DOLLAR() != nil {@@ -323,7 +457,7 @@ func (q *querySpanExtractor) extractPseudoTableFromSelectStatement(ctx parser.IS}result.Columns = append(result.Columns, left[columnPosition-1])}- if asAlias := columnElem.As_alias(); asAlias != nil {+ if asAlias := iSelectListElem.As_alias(); asAlias != nil && len(result.Columns) > 0 {result.Columns[len(result.Columns)-1].Name = NormalizeSnowSQLObjectNamePart(asAlias.Alias().Id_())}} else if expressionElem := iSelectListElem.Expression_elem(); expressionElem != nil {@@ -347,7 +481,7 @@ func (q *querySpanExtractor) extractPseudoTableFromSelectStatement(ctx parser.IS})}- if asAlias := expressionElem.As_alias(); asAlias != nil {+ if asAlias := iSelectListElem.As_alias(); asAlias != nil && len(result.Columns) > 0 {result.Columns[len(result.Columns)-1].Name = NormalizeSnowSQLObjectNamePart(asAlias.Alias().Id_())}}@@ -356,6 +490,59 @@ func (q *querySpanExtractor) extractPseudoTableFromSelectStatement(ctx parser.ISreturn result, nil}+func normalizedObjectNameOrAlias(ctx parser.IObject_name_or_aliasContext) (string, string, string) {+ if ctx == nil {+ return "", "", ""+ }+ if objectName := ctx.Object_name(); objectName != nil {+ return normalizedObjectName(objectName, "", "")+ }+ if alias := ctx.Alias(); alias != nil {+ return "", "", NormalizeSnowSQLObjectNamePart(alias.Id_())+ }+ return "", "", ""+}++func normalizeSnowSQLColumnName(columnName parser.IColumn_nameContext) string {+ if columnName == nil {+ return ""+ }+ ids := columnName.AllId_()+ if len(ids) == 0 {+ return ""+ }+ return NormalizeSnowSQLObjectNamePart(ids[len(ids)-1])+}++func filterExcludedColumns(columns []base.QuerySpanResult, excludeClause parser.IExclude_clauseContext) []base.QuerySpanResult {+ if excludeClause == nil {+ return columns+ }++ excludedColumns := make(map[string]bool)+ if columnName := excludeClause.Column_name(); columnName != nil {+ excludedColumns[normalizeSnowSQLColumnName(columnName)] = true+ }+ if columnList := excludeClause.Column_list_in_parentheses(); columnList != nil {+ if list := columnList.Column_list(); list != nil {+ for _, columnName := range list.AllColumn_name() {+ excludedColumns[normalizeSnowSQLColumnName(columnName)] = true+ }+ }+ }+ if len(excludedColumns) == 0 {+ return columns+ }++ var result []base.QuerySpanResult+ for _, column := range columns {+ if !excludedColumns[column.Name] {+ result = append(result, column)+ }+ }+ return result+}+// The closure of the IExprContext.func (q *querySpanExtractor) extractQuerySpanResultResultFromExpr(ctx antlr.RuleContext) (string, base.QuerySpanResult, error) {switch ctx := ctx.(type) {@@ -392,9 +579,6 @@ func (q *querySpanExtractor) extractQuerySpanResultResultFromExpr(ctx antlr.Ruleif v := ctx.Iff_expr(); v != nil {return q.extractQuerySpanResultResultFromExpr(v)}- if v := ctx.Full_column_name(); v != nil {- return q.extractQuerySpanResultResultFromExpr(v)- }if v := ctx.Bracket_expression(); v != nil {return q.extractQuerySpanResultResultFromExpr(v)}@@ -500,7 +684,7 @@ func (q *querySpanExtractor) extractQuerySpanResultResultFromExpr(ctx antlr.RuleName: ctx.GetText(),SourceColumns: make(base.SourceColumnSet),}- if v := ctx.Expr(); v != nil {+ if v := ctx.Expr_list(); v != nil {_, maskingAttributes, err := q.extractQuerySpanResultResultFromExpr(v)if err != nil {return "", base.QuerySpanResult{}, errors.Wrapf(err, "failed to check whether the expression %q is sensitive near line %d", v.GetText(), v.GetStart().GetLine())@@ -672,8 +856,8 @@ func (q *querySpanExtractor) extractQuerySpanResultResultFromExpr(ctx antlr.Rule}return ctx.GetText(), querySpanResult, nilcase *parser.Primitive_expressionContext:- if v := ctx.Id_(); v != nil {- return q.extractQuerySpanResultResultFromExpr(v)+ if v := ctx.AllId_(); len(v) > 0 {+ return q.extractQuerySpanResultResultFromExpr(v[0])}return ctx.GetText(), base.QuerySpanResult{Name: ctx.GetText(),@@ -697,10 +881,10 @@ func (q *querySpanExtractor) extractQuerySpanResultResultFromExpr(ctx antlr.Rule}return ctx.GetText(), maskingAttributes, nil}- if v := ctx.Expr(); v != nil {- _, maskingAttributes, err := q.extractQuerySpanResultResultFromExpr(v)+ if v := ctx.AllExpr(); len(v) > 0 {+ _, maskingAttributes, err := q.extractQuerySpanResultResultFromExpr(v[0])if err != nil {- return "", base.QuerySpanResult{}, errors.Wrapf(err, "failed to check whether the expression %q is sensitive near line %d", v.GetText(), v.GetStart().GetLine())+ return "", base.QuerySpanResult{}, errors.Wrapf(err, "failed to check whether the expression %q is sensitive near line %d", v[0].GetText(), v[0].GetStart().GetLine())}return ctx.GetText(), maskingAttributes, nil}@@ -739,10 +923,10 @@ func (q *querySpanExtractor) extractQuerySpanResultResultFromExpr(ctx antlr.RuleName: ctx.GetText(),SourceColumns: make(base.SourceColumnSet),}- if v := ctx.Expr(); v != nil {- _, maskingAttributes, err := q.extractQuerySpanResultResultFromExpr(v)+ if v := ctx.AllExpr(); len(v) > 0 {+ _, maskingAttributes, err := q.extractQuerySpanResultResultFromExpr(v[0])if err != nil {- return "", base.QuerySpanResult{}, errors.Wrapf(err, "failed to check whether the expression %q is sensitive near line %d", v.GetText(), v.GetStart().GetLine())+ return "", base.QuerySpanResult{}, errors.Wrapf(err, "failed to check whether the expression %q is sensitive near line %d", v[0].GetText(), v[0].GetStart().GetLine())}querySpanResult.SourceColumns, _ = base.MergeSourceColumnSet(querySpanResult.SourceColumns, maskingAttributes.SourceColumns)}@@ -962,7 +1146,7 @@ func (q *querySpanExtractor) extractTableSourceFromObjectRef(ctx parser.IObject_}// TODO(zp): Handle the value clause.- if ctx.Values() != nil {+ if ctx.Values_table() != nil {return nil, nil}@@ -985,8 +1169,8 @@ func (q *querySpanExtractor) extractTableSourceFromObjectRef(ctx parser.IObject_return nil, nil}- if ctx.Pivot_unpivot() != nil {- if v := ctx.Pivot_unpivot(); v.PIVOT() != nil {+ if v := ctx.Pivot_unpivot(); v != nil {+ if v.PIVOT() != nil {pivotColumnName := v.AllId_()[1]normalizedPivotColumnName := NormalizeSnowSQLObjectNamePart(pivotColumnName)pivotColumnIndex := -1@@ -1016,17 +1200,23 @@ func (q *querySpanExtractor) extractTableSourceFromObjectRef(ctx parser.IObject_}result = append(result[:valueColumnIndex], result[valueColumnIndex+1:]...)- for _, literal := range v.AllLiteral() {+ if v.Pivot_in_clause() == nil {+ return nil, errors.Errorf("pivot in clause is missing near line %d", v.GetStart().GetLine())+ }+ for _, literal := range v.Pivot_in_clause().AllLiteral() {result = append(result, base.QuerySpanResult{Name: literal.GetText(),SourceColumns: pivotColumnInOriginalResult.SourceColumns,})}- } else if v := ctx.Pivot_unpivot(); v.UNPIVOT() != nil {+ } else if v.UNPIVOT() != nil {var strippedColumnIndices []intvar strippedColumnInOriginalResult []base.QuerySpanResult- for idx, columnName := range v.Column_list().AllColumn_name() {- normalizedColumnName := NormalizeSnowSQLObjectNamePart(columnName.Id_())+ if v.Aliased_column_list() == nil {+ return nil, errors.Errorf("aliased column list is missing for unpivot near line %d", v.GetStart().GetLine())+ }+ for idx, columnName := range v.Aliased_column_list().AllColumn_name() {+ normalizedColumnName := normalizeSnowSQLColumnName(columnName)for i, field := range result {if field.Name == normalizedColumnName {strippedColumnIndices = append(strippedColumnIndices, i)@@ -1048,11 +1238,10 @@ func (q *querySpanExtractor) extractTableSourceFromObjectRef(ctx parser.IObject_valueColumnName := v.Id_(0)normalizedValueColumnName := NormalizeSnowSQLObjectNamePart(valueColumnName)- nameColumnName := v.Column_name().Id_()- normalizedNameColumnName := NormalizeSnowSQLObjectNamePart(nameColumnName)+ nameColumnName := normalizeSnowSQLColumnName(v.Column_name())result = append(result, base.QuerySpanResult{- Name: normalizedNameColumnName,+ Name: nameColumnName,SourceColumns: make(base.SourceColumnSet),}, base.QuerySpanResult{Name: normalizedValueColumnName,@@ -1062,6 +1251,14 @@ func (q *querySpanExtractor) extractTableSourceFromObjectRef(ctx parser.IObject_}// If the as alias is not nil, we should use the alias name to replace the original table name.+ if ctx.Pivot_unpivot() != nil && ctx.Pivot_unpivot().As_alias() != nil {+ id := ctx.Pivot_unpivot().As_alias().Alias().Id_()+ aliasName := NormalizeSnowSQLObjectNamePart(id)+ return &base.PseudoTable{+ Name: aliasName,+ Columns: result,+ }, nil+ }if ctx.As_alias() != nil {id := ctx.As_alias().Alias().Id_()aliasName := NormalizeSnowSQLObjectNamePart(id)diff --git a/backend/plugin/parser/snowflake/query_type.go b/backend/plugin/parser/snowflake/query_type.goindex b08cefe207..ca95d67ad1 100644--- a/backend/plugin/parser/snowflake/query_type.go+++ b/backend/plugin/parser/snowflake/query_type.go@@ -23,7 +23,11 @@ func (l *queryTypeListener) EnterBatch(ctx *parser.BatchContext) {}func (l *queryTypeListener) getQueryTypeForBatch(batch parser.IBatchContext) (base.QueryType, error) {- sqlCommand := batch.Sql_command()+ sqlCommands := batch.AllSql_command()+ if len(sqlCommands) == 0 {+ return base.QueryTypeUnknown, nil+ }+ sqlCommand := sqlCommands[0]switch {case sqlCommand.Ddl_command() != nil:return base.DDL, nildiff --git a/backend/plugin/parser/snowflake/snowflake_test.go b/backend/plugin/parser/snowflake/snowflake_test.goindex 733bd1cc41..8dded327b4 100644--- a/backend/plugin/parser/snowflake/snowflake_test.go+++ b/backend/plugin/parser/snowflake/snowflake_test.go@@ -48,7 +48,7 @@ func TestParseSnowSQL(t *testing.T) {}{{sql: `SELECT t.a, t.b FRO table_name t;`,- err: "Syntax error at line 1:32 \nrelated text: SELECT t.a, t.b FRO table_name t",+ err: "Syntax error at line 1:1 \nrelated text: SELECT",},{sql: "SELECT 1;\n SELEC 5;\nSELECT 6;",diff --git a/go.mod b/go.modindex c8e4f11ebd..5e1fb4ef87 100644--- a/go.mod+++ b/go.mod@@ -300,7 +300,7 @@ require (github.com/aws/aws-sdk-go-v2/service/sts v1.41.6github.com/aws/smithy-go v1.24.0 // indirectgithub.com/beorn7/perks v1.0.1 // indirect- github.com/bytebase/parser v0.0.0-20260227085144-840d74dd2c8b+ github.com/bytebase/parser v0.0.0-20260228025849-39c76b45c98agithub.com/cespare/xxhash/v2 v2.3.0 // indirectgithub.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f // indirectgithub.com/cockroachdb/cockroach-go/v2 v2.4.3diff --git a/go.sum b/go.sumindex 2d78fe55f0..4e49684629 100644--- a/go.sum+++ b/go.sum@@ -861,8 +861,8 @@ github.com/bytebase/gomongo v0.0.0-20260211083148-d2ea344b4b65 h1:RvViQx0e24DeDJgithub.com/bytebase/gomongo v0.0.0-20260211083148-d2ea344b4b65/go.mod h1:4dDI0RO2BK9/BD4VE+YqvlCj/qoVMquZ99QZdRlT8Wg=github.com/bytebase/lsp-protocol v0.0.0-20250324071136-1586d0c10ff0 h1:bJ8NSf2K+pccl5m/wuu97fiYjDwpJH6IzURAq/3XA2U=github.com/bytebase/lsp-protocol v0.0.0-20250324071136-1586d0c10ff0/go.mod h1:BEWMfiZtqshdmulKJcIsWb45MUaEvDO4CROcgi8dfFg=-github.com/bytebase/parser v0.0.0-20260227085144-840d74dd2c8b h1:IHEWYToZdRtK8EOO647ZKYnKHDgnWdRogVYZGBSJA6U=-github.com/bytebase/parser v0.0.0-20260227085144-840d74dd2c8b/go.mod h1:jeak/EfutSOAuWKvrFIT2IZunhWprM7oTFBRgZ9RCxo=+github.com/bytebase/parser v0.0.0-20260228025849-39c76b45c98a h1:hTyZhniv0HzQYM2K6mG1XpOEKibsfLJ7jYhBf/1sXLc=+github.com/bytebase/parser v0.0.0-20260228025849-39c76b45c98a/go.mod h1:jeak/EfutSOAuWKvrFIT2IZunhWprM7oTFBRgZ9RCxo=github.com/bytebase/pgx/v5 v5.0.0-20250212161523-96ff8aed8767 h1:YuR5G3LcxpO5ScSTA+Kdirxg9RW4TRc/v1t7N2Hfmbw=github.com/bytebase/pgx/v5 v5.0.0-20250212161523-96ff8aed8767/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=github.com/bytebase/pkcs8 v0.0.0-20240612095628-fcd0a7484c94 h1:6PNsuNmSqCuR8Z616uQLzDIvujWCFsKzeVc3ECmVubk=