Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: improve parser type safety with UnifiedAST wrapper (#18189)
h3n4l523c835127c1
diff --git a/backend/api/v1/release_service_check.go b/backend/api/v1/release_service_check.goindex 526c06af1b..db82bc0093 100644--- a/backend/api/v1/release_service_check.go+++ b/backend/api/v1/release_service_check.go@@ -18,6 +18,7 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code"advisorpg "github.com/bytebase/bytebase/backend/plugin/advisor/pg""github.com/bytebase/bytebase/backend/plugin/db"+ "github.com/bytebase/bytebase/backend/plugin/parser/base""github.com/bytebase/bytebase/backend/plugin/parser/pg""github.com/bytebase/bytebase/backend/plugin/schema""github.com/bytebase/bytebase/backend/runner/plancheck"@@ -825,7 +826,7 @@ type statementTypeWithPosition struct {// getStatementTypesWithPositionsForEngine returns statement types with position info for the given engine and ASTs.// The line numbers are one-based.// Currently only PostgreSQL is supported.-func getStatementTypesWithPositionsForEngine(engine storepb.Engine, asts any) ([]statementTypeWithPosition, error) {+func getStatementTypesWithPositionsForEngine(engine storepb.Engine, asts []base.AST) ([]statementTypeWithPosition, error) {switch engine {case storepb.Engine_POSTGRES, storepb.Engine_COCKROACHDB, storepb.Engine_REDSHIFT:pgStmts, err := pg.GetStatementTypes(asts)diff --git a/backend/component/sheet/sheet.go b/backend/component/sheet/sheet.goindex a18fb07f75..ef17f9df0d 100644--- a/backend/component/sheet/sheet.go+++ b/backend/component/sheet/sheet.go@@ -188,13 +188,13 @@ func getSheetCommandsForMSSQL(statement string) []*storepb.Range {type Result struct {sync.Mutex- ast any+ ast []base.ASTadvices []*storepb.Advice}// GetASTsForChecks gets the ASTs of statement with caching, and it should only be used// for plan checks because it involves some truncating.-func (sm *Manager) GetASTsForChecks(dbType storepb.Engine, statement string) (any, []*storepb.Advice) {+func (sm *Manager) GetASTsForChecks(dbType storepb.Engine, statement string) ([]base.AST, []*storepb.Advice) {var result *Resulth := xxh3.HashString(statement)key := astHashKey{hash: h, engine: dbType}diff --git a/backend/plugin/advisor/advisor.go b/backend/plugin/advisor/advisor.goindex 837b9e9763..525eee6737 100644--- a/backend/plugin/advisor/advisor.go+++ b/backend/plugin/advisor/advisor.go@@ -45,7 +45,7 @@ type Context struct {IsObjectCaseSensitive bool// SQL review rule special fields.- AST any+ AST []base.ASTRule *storepb.SQLReviewRuleOriginalMetadata *model.DatabaseMetadataFinalMetadata *model.DatabaseMetadatadiff --git a/backend/plugin/advisor/mssql/rule_builtin_prior_backup_check.go b/backend/plugin/advisor/mssql/rule_builtin_prior_backup_check.goindex 44f3b9c6f4..681a7707e0 100644--- a/backend/plugin/advisor/mssql/rule_builtin_prior_backup_check.go+++ b/backend/plugin/advisor/mssql/rule_builtin_prior_backup_check.go@@ -39,9 +39,10 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx adv}var adviceList []*storepb.Advice- stmtList, ok := checkCtx.AST.(antlr.Tree)- if !ok {- return nil, nil+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)@@ -75,7 +76,10 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx adv// Use the refactored rule for DDL/DML checkingrule := NewStatementDisallowMixDMLRule(level, title)checker := NewGenericChecker([]Rule{rule})- antlr.ParseTreeWalkerDefault.Walk(checker, stmtList)+ for _, stmt := range stmtList {+ rule.SetBaseLine(stmt.BaseLine)+ antlr.ParseTreeWalkerDefault.Walk(checker, stmt.Tree)+ }if rule.hasDDL {adviceList = append(adviceList, &storepb.Advice{diff --git a/backend/plugin/advisor/mssql/rule_column_maximum_varchar_length.go b/backend/plugin/advisor/mssql/rule_column_maximum_varchar_length.goindex ee355e46a9..0225dde3b7 100644--- a/backend/plugin/advisor/mssql/rule_column_maximum_varchar_length.go+++ b/backend/plugin/advisor/mssql/rule_column_maximum_varchar_length.go@@ -11,13 +11,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common""github.com/bytebase/bytebase/backend/common/log"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -35,9 +33,10 @@ type ColumnMaximumVarcharLengthAdvisor struct {// Check checks for maximum varchar length.func (*ColumnMaximumVarcharLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_column_no_null.go b/backend/plugin/advisor/mssql/rule_column_no_null.goindex 27103bf616..6a08ca46fc 100644--- a/backend/plugin/advisor/mssql/rule_column_no_null.go+++ b/backend/plugin/advisor/mssql/rule_column_no_null.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -30,9 +28,10 @@ type ColumnNoNullAdvisor struct {// Check checks for column no NULL value..func (*ColumnNoNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_column_require.go b/backend/plugin/advisor/mssql/rule_column_require.goindex e7225db9a3..c94e932296 100644--- a/backend/plugin/advisor/mssql/rule_column_require.go+++ b/backend/plugin/advisor/mssql/rule_column_require.go@@ -9,12 +9,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -32,9 +30,10 @@ type ColumnRequireAdvisor struct {// Check checks for column requirement..func (*ColumnRequireAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_column_type_disallow_list.go b/backend/plugin/advisor/mssql/rule_column_type_disallow_list.goindex 798004d026..b875bffcd8 100644--- a/backend/plugin/advisor/mssql/rule_column_type_disallow_list.go+++ b/backend/plugin/advisor/mssql/rule_column_type_disallow_list.go@@ -9,12 +9,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -30,9 +28,10 @@ type ColumnTypeDisallowListAdvisor struct {}func (*ColumnTypeDisallowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_function_disallow_create_or_alter.go b/backend/plugin/advisor/mssql/rule_function_disallow_create_or_alter.goindex bc29302351..27b1659b6f 100644--- a/backend/plugin/advisor/mssql/rule_function_disallow_create_or_alter.go+++ b/backend/plugin/advisor/mssql/rule_function_disallow_create_or_alter.go@@ -5,13 +5,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")func init() {@@ -22,9 +20,10 @@ type FunctionDisallowCreateOrAlterAdvisor struct{}// Check implements advisor.Advisor.func (*FunctionDisallowCreateOrAlterAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_index_not_redundant.go b/backend/plugin/advisor/mssql/rule_index_not_redundant.goindex 010a23ed82..e37d24c0b6 100644--- a/backend/plugin/advisor/mssql/rule_index_not_redundant.go+++ b/backend/plugin/advisor/mssql/rule_index_not_redundant.go@@ -9,11 +9,8 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors"-"github.com/bytebase/bytebase/backend/common""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -33,9 +30,10 @@ type IndexNotRedundantAdvisor struct{}// TODO(zp): we currently don't have runtime checks for indexes created in the statements.func (IndexNotRedundantAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to AST tree")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_migration_compatibility.go b/backend/plugin/advisor/mssql/rule_migration_compatibility.goindex d91a37f7d2..788703dfa8 100644--- a/backend/plugin/advisor/mssql/rule_migration_compatibility.go+++ b/backend/plugin/advisor/mssql/rule_migration_compatibility.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -31,9 +29,10 @@ type MigrationCompatibilityAdvisor struct {// Check checks for migration compatibility.func (*MigrationCompatibilityAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_naming_identifier_no_keyword.go b/backend/plugin/advisor/mssql/rule_naming_identifier_no_keyword.goindex f63e1b2f6b..7ddc6fcd47 100644--- a/backend/plugin/advisor/mssql/rule_naming_identifier_no_keyword.go+++ b/backend/plugin/advisor/mssql/rule_naming_identifier_no_keyword.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -31,9 +29,10 @@ type NamingIdentifierNoKeywordAdvisor struct {// Check checks for identifier naming convention without keyword.func (*NamingIdentifierNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_naming_table.go b/backend/plugin/advisor/mssql/rule_naming_table.goindex 308a304b89..155a0c36b3 100644--- a/backend/plugin/advisor/mssql/rule_naming_table.go+++ b/backend/plugin/advisor/mssql/rule_naming_table.go@@ -9,13 +9,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors"-"github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -33,9 +30,10 @@ type NamingTableAdvisor struct {// Check checks for table naming convention..func (*NamingTableAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_naming_table_no_keyword.go b/backend/plugin/advisor/mssql/rule_naming_table_no_keyword.goindex 8ba8ceae76..262b75436a 100644--- a/backend/plugin/advisor/mssql/rule_naming_table_no_keyword.go+++ b/backend/plugin/advisor/mssql/rule_naming_table_no_keyword.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -31,9 +29,10 @@ type NamingTableNoKeywordAdvisor struct {// Check checks for table naming convention without keyword.func (*NamingTableNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_procedure_disallow_create_or_alter.go b/backend/plugin/advisor/mssql/rule_procedure_disallow_create_or_alter.goindex fb9515d0b8..9c7b321950 100644--- a/backend/plugin/advisor/mssql/rule_procedure_disallow_create_or_alter.go+++ b/backend/plugin/advisor/mssql/rule_procedure_disallow_create_or_alter.go@@ -5,13 +5,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")func init() {@@ -21,9 +19,10 @@ func init() {type ProcedureDisallowCreateOrAlterAdvisor struct{}func (*ProcedureDisallowCreateOrAlterAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_select_no_select_all.go b/backend/plugin/advisor/mssql/rule_select_no_select_all.goindex 0182bab188..cf10a036dd 100644--- a/backend/plugin/advisor/mssql/rule_select_no_select_all.go+++ b/backend/plugin/advisor/mssql/rule_select_no_select_all.go@@ -5,13 +5,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -28,9 +26,10 @@ type SelectNoSelectAllAdvisor struct {// Check checks for no select all.func (*SelectNoSelectAllAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_statement_disallow_cross_db_queries.go b/backend/plugin/advisor/mssql/rule_statement_disallow_cross_db_queries.goindex c8c5adc7e0..e2c058743f 100644--- a/backend/plugin/advisor/mssql/rule_statement_disallow_cross_db_queries.go+++ b/backend/plugin/advisor/mssql/rule_statement_disallow_cross_db_queries.go@@ -8,13 +8,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors"-"github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -25,9 +22,10 @@ func init() {type DisallowCrossDBQueriesAdvisor struct{}func (*DisallowCrossDBQueriesAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_ddl.go b/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_ddl.goindex 369c1b147e..9d463b1f99 100644--- a/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_ddl.go+++ b/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_ddl.go@@ -4,7 +4,6 @@ import ("context""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors"parser "github.com/bytebase/parser/tsql"@@ -12,7 +11,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -33,9 +31,10 @@ func (*StatementDisallowMixInDDLAdvisor) Check(_ context.Context, checkCtx advisdefault:return nil, nil}- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_dml.go b/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_dml.goindex 8e6e9c92c8..6271231f20 100644--- a/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_dml.go+++ b/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_dml.go@@ -4,7 +4,6 @@ import ("context""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors"parser "github.com/bytebase/parser/tsql"@@ -12,7 +11,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -33,9 +31,10 @@ func (*StatementDisallowMixInDMLAdvisor) Check(_ context.Context, checkCtx advisdefault:return nil, nil}- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_statement_where_disallow_functions_and_calculations.go b/backend/plugin/advisor/mssql/rule_statement_where_disallow_functions_and_calculations.goindex 4a37d06b0e..4691fb1d66 100644--- a/backend/plugin/advisor/mssql/rule_statement_where_disallow_functions_and_calculations.go+++ b/backend/plugin/advisor/mssql/rule_statement_where_disallow_functions_and_calculations.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")func init() {@@ -24,9 +22,10 @@ type DisallowFuncAndCalculationsAdvisor struct{}var _ advisor.Advisor = (*DisallowFuncAndCalculationsAdvisor)(nil)func (*DisallowFuncAndCalculationsAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to AST tree")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_statement_where_requirement_for_select.go b/backend/plugin/advisor/mssql/rule_statement_where_requirement_for_select.goindex c5dc6fcc1a..6cb63351ca 100644--- a/backend/plugin/advisor/mssql/rule_statement_where_requirement_for_select.go+++ b/backend/plugin/advisor/mssql/rule_statement_where_requirement_for_select.go@@ -5,13 +5,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -28,9 +26,10 @@ type WhereRequirementForSelectAdvisor struct {// Check checks for WHERE clause requirement.func (*WhereRequirementForSelectAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_statement_where_requirement_for_update_delete.go b/backend/plugin/advisor/mssql/rule_statement_where_requirement_for_update_delete.goindex 13ae7ca07f..9bb24809de 100644--- a/backend/plugin/advisor/mssql/rule_statement_where_requirement_for_update_delete.go+++ b/backend/plugin/advisor/mssql/rule_statement_where_requirement_for_update_delete.go@@ -5,13 +5,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -28,9 +26,10 @@ type WhereRequirementForUpdateDeleteAdvisor struct {// Check checks for WHERE clause requirement.func (*WhereRequirementForUpdateDeleteAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_table_disallow_ddl.go b/backend/plugin/advisor/mssql/rule_table_disallow_ddl.goindex 566e1128bd..3a2b6b78df 100644--- a/backend/plugin/advisor/mssql/rule_table_disallow_ddl.go+++ b/backend/plugin/advisor/mssql/rule_table_disallow_ddl.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -30,9 +28,10 @@ type TableDisallowDDLAdvisor struct {}func (*TableDisallowDDLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_table_disallow_dml.go b/backend/plugin/advisor/mssql/rule_table_disallow_dml.goindex 1cc0db0a33..46de21daf4 100644--- a/backend/plugin/advisor/mssql/rule_table_disallow_dml.go+++ b/backend/plugin/advisor/mssql/rule_table_disallow_dml.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -30,9 +28,10 @@ type TableDisallowDMLAdvisor struct {}func (*TableDisallowDMLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_table_drop_naming_convention.go b/backend/plugin/advisor/mssql/rule_table_drop_naming_convention.goindex 614418aee0..2d82f30103 100644--- a/backend/plugin/advisor/mssql/rule_table_drop_naming_convention.go+++ b/backend/plugin/advisor/mssql/rule_table_drop_naming_convention.go@@ -9,12 +9,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -32,9 +30,10 @@ type TableDropNamingConventionAdvisor struct {// Check checks for table drop with naming convention.func (*TableDropNamingConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_table_no_foreign_key.go b/backend/plugin/advisor/mssql/rule_table_no_foreign_key.goindex d740bc0110..11e59af64b 100644--- a/backend/plugin/advisor/mssql/rule_table_no_foreign_key.go+++ b/backend/plugin/advisor/mssql/rule_table_no_foreign_key.go@@ -8,12 +8,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"+tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -31,9 +30,10 @@ type TableNoForeignKeyAdvisor struct {// Check checks for table disallow foreign key..func (*TableNoForeignKeyAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/rule_table_require_pk.go b/backend/plugin/advisor/mssql/rule_table_require_pk.goindex ec4d347924..c2b11f9b48 100644--- a/backend/plugin/advisor/mssql/rule_table_require_pk.go+++ b/backend/plugin/advisor/mssql/rule_table_require_pk.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql")@@ -30,9 +28,10 @@ type TableRequirePkAdvisor struct {// Check checks for table require primary key..func (*TableRequirePkAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult list")+ parseResults, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mssql/utils.go b/backend/plugin/advisor/mssql/utils.gonew file mode 100644index 0000000000..d0565ca239--- /dev/null+++ b/backend/plugin/advisor/mssql/utils.go@@ -0,0 +1,28 @@+package mssql++import (+ "github.com/pkg/errors"++ "github.com/bytebase/bytebase/backend/plugin/advisor"+ "github.com/bytebase/bytebase/backend/plugin/parser/base"+)++// getANTLRTree extracts TSQL ANTLR parse trees from the advisor context.+func getANTLRTree(checkCtx advisor.Context) ([]*base.ParseResult, error) {+ if checkCtx.AST == nil {+ return nil, errors.New("AST is not provided in context")+ }+ var parseResults []*base.ParseResult+ for _, unifiedAST := range checkCtx.AST {+ antlrAST, ok := base.GetANTLRAST(unifiedAST)+ if !ok {+ return nil, errors.New("AST type mismatch: expected ANTLR-based parser result")+ }+ parseResults = append(parseResults, &base.ParseResult{+ Tree: antlrAST.Tree,+ Tokens: antlrAST.Tokens,+ BaseLine: base.GetLineOffset(antlrAST.StartPosition),+ })+ }+ return parseResults, nil+}diff --git a/backend/plugin/advisor/mysql/rule_builtin_prior_backup_check.go b/backend/plugin/advisor/mysql/rule_builtin_prior_backup_check.goindex 7399079953..eec659e75c 100644--- a/backend/plugin/advisor/mysql/rule_builtin_prior_backup_check.go+++ b/backend/plugin/advisor/mysql/rule_builtin_prior_backup_check.go@@ -32,9 +32,10 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx adv}var adviceList []*storepb.Advice- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_charset_allowlist.go b/backend/plugin/advisor/mysql/rule_charset_allowlist.goindex 561043c52b..28e51bac1f 100644--- a/backend/plugin/advisor/mysql/rule_charset_allowlist.go+++ b/backend/plugin/advisor/mysql/rule_charset_allowlist.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +31,10 @@ type CharsetAllowlistAdvisor struct {// Check checks for charset allowlist.func (*CharsetAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)if err != nil {diff --git a/backend/plugin/advisor/mysql/rule_collation_allowlist.go b/backend/plugin/advisor/mysql/rule_collation_allowlist.goindex 1fb4432201..e592b10072 100644--- a/backend/plugin/advisor/mysql/rule_collation_allowlist.go+++ b/backend/plugin/advisor/mysql/rule_collation_allowlist.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +31,10 @@ type CollationAllowlistAdvisor struct {// Check checks for collation allowlist.func (*CollationAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_auto_increment_initial_value.go b/backend/plugin/advisor/mysql/rule_column_auto_increment_initial_value.goindex 9726b58d06..b503f64a6d 100644--- a/backend/plugin/advisor/mysql/rule_column_auto_increment_initial_value.go+++ b/backend/plugin/advisor/mysql/rule_column_auto_increment_initial_value.go@@ -8,14 +8,13 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"+mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -35,9 +34,10 @@ type ColumnAutoIncrementInitialValueAdvisor struct {// Check checks for auto-increment column initial value.func (*ColumnAutoIncrementInitialValueAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_auto_increment_must_integer.go b/backend/plugin/advisor/mysql/rule_column_auto_increment_must_integer.goindex 99d031f285..bda7bf238f 100644--- a/backend/plugin/advisor/mysql/rule_column_auto_increment_must_integer.go+++ b/backend/plugin/advisor/mysql/rule_column_auto_increment_must_integer.go@@ -7,14 +7,13 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"+mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -34,9 +33,10 @@ type ColumnAutoIncrementMustIntegerAdvisor struct {// Check checks for auto-increment column type.func (*ColumnAutoIncrementMustIntegerAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_auto_increment_must_unsigned.go b/backend/plugin/advisor/mysql/rule_column_auto_increment_must_unsigned.goindex 665a8932bb..1d2cdc3680 100644--- a/backend/plugin/advisor/mysql/rule_column_auto_increment_must_unsigned.go+++ b/backend/plugin/advisor/mysql/rule_column_auto_increment_must_unsigned.go@@ -8,14 +8,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -35,9 +33,10 @@ type ColumnAutoIncrementMustUnsignedAdvisor struct {// Check checks for unsigned auto-increment column.func (*ColumnAutoIncrementMustUnsignedAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_comment_convention.go b/backend/plugin/advisor/mysql/rule_column_comment_convention.goindex 80f0f6bf58..9507338188 100644--- a/backend/plugin/advisor/mysql/rule_column_comment_convention.go+++ b/backend/plugin/advisor/mysql/rule_column_comment_convention.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -32,9 +30,10 @@ type ColumnCommentConventionAdvisor struct {// Check checks for column comment convention.func (*ColumnCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_current_time_count_limit.go b/backend/plugin/advisor/mysql/rule_column_current_time_count_limit.goindex b400c420ac..ecac2f546f 100644--- a/backend/plugin/advisor/mysql/rule_column_current_time_count_limit.go+++ b/backend/plugin/advisor/mysql/rule_column_current_time_count_limit.go@@ -8,14 +8,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -40,9 +38,10 @@ type ColumnCurrentTimeCountLimitAdvisor struct {// Check checks for current time column count limit.func (*ColumnCurrentTimeCountLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_disallow_changing.go b/backend/plugin/advisor/mysql/rule_column_disallow_changing.goindex 4af62ab88b..b9d65e6288 100644--- a/backend/plugin/advisor/mysql/rule_column_disallow_changing.go+++ b/backend/plugin/advisor/mysql/rule_column_disallow_changing.go@@ -7,14 +7,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -34,9 +32,10 @@ type ColumnDisallowChangingAdvisor struct {// Check checks for disallow CHANGE COLUMN statement.func (*ColumnDisallowChangingAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_disallow_changing_order.go b/backend/plugin/advisor/mysql/rule_column_disallow_changing_order.goindex c444d51e7d..970d01f7c9 100644--- a/backend/plugin/advisor/mysql/rule_column_disallow_changing_order.go+++ b/backend/plugin/advisor/mysql/rule_column_disallow_changing_order.go@@ -7,14 +7,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -34,9 +32,10 @@ type ColumnDisallowChangingOrderAdvisor struct {// Check checks for disallow changing column order.func (*ColumnDisallowChangingOrderAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_disallow_changing_type.go b/backend/plugin/advisor/mysql/rule_column_disallow_changing_type.goindex bcbfc5c0e3..58be5674e4 100644--- a/backend/plugin/advisor/mysql/rule_column_disallow_changing_type.go+++ b/backend/plugin/advisor/mysql/rule_column_disallow_changing_type.go@@ -8,14 +8,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/store/model")@@ -36,9 +34,10 @@ type ColumnDisallowChangingTypeAdvisor struct {// Check checks for disallow changing column type.func (*ColumnDisallowChangingTypeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_disallow_drop.go b/backend/plugin/advisor/mysql/rule_column_disallow_drop.goindex 52c67b805b..0fc533eccd 100644--- a/backend/plugin/advisor/mysql/rule_column_disallow_drop.go+++ b/backend/plugin/advisor/mysql/rule_column_disallow_drop.go@@ -7,14 +7,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -32,9 +30,10 @@ type ColumnDisallowDropAdvisor struct {// Check checks for disallow DROP COLUMN statement.func (*ColumnDisallowDropAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_disallow_drop_in_index.go b/backend/plugin/advisor/mysql/rule_column_disallow_drop_in_index.goindex 8176daf50f..e55d662fef 100644--- a/backend/plugin/advisor/mysql/rule_column_disallow_drop_in_index.go+++ b/backend/plugin/advisor/mysql/rule_column_disallow_drop_in_index.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/store/model")@@ -34,9 +32,10 @@ type ColumnDisallowDropInIndexAdvisor struct {// Check checks for disallow Drop COLUMN in index statement.func (*ColumnDisallowDropInIndexAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_disallow_set_charset.go b/backend/plugin/advisor/mysql/rule_column_disallow_set_charset.goindex 8523e17e1b..5f40a19341 100644--- a/backend/plugin/advisor/mysql/rule_column_disallow_set_charset.go+++ b/backend/plugin/advisor/mysql/rule_column_disallow_set_charset.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +31,10 @@ type ColumnDisallowSetCharsetAdvisor struct {// Check checks for disallow set column charset.func (*ColumnDisallowSetCharsetAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_maximum_character_length.go b/backend/plugin/advisor/mysql/rule_column_maximum_character_length.goindex 0a36aaf2da..332c6b744e 100644--- a/backend/plugin/advisor/mysql/rule_column_maximum_character_length.go+++ b/backend/plugin/advisor/mysql/rule_column_maximum_character_length.go@@ -8,14 +8,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -35,9 +33,10 @@ type ColumnMaximumCharacterLengthAdvisor struct {// Check checks for maximum character length.func (*ColumnMaximumCharacterLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_maximum_varchar_length.go b/backend/plugin/advisor/mysql/rule_column_maximum_varchar_length.goindex b428d2ea2d..6929988925 100644--- a/backend/plugin/advisor/mysql/rule_column_maximum_varchar_length.go+++ b/backend/plugin/advisor/mysql/rule_column_maximum_varchar_length.go@@ -9,12 +9,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -34,9 +32,10 @@ type ColumnMaximumVarcharLengthAdvisor struct {// Check checks for maximum varchar length.func (*ColumnMaximumVarcharLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_no_null.go b/backend/plugin/advisor/mysql/rule_column_no_null.goindex 2442aec8e0..faf19240d6 100644--- a/backend/plugin/advisor/mysql/rule_column_no_null.go+++ b/backend/plugin/advisor/mysql/rule_column_no_null.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/store/model")@@ -34,9 +32,10 @@ type ColumnNoNullAdvisor struct {// Check checks for column no NULL value.func (*ColumnNoNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ root, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)@@ -50,7 +49,7 @@ func (*ColumnNoNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) (// Create the generic checker with the rulechecker := NewGenericChecker([]Rule{rule})- for _, stmtNode := range list {+ for _, stmtNode := range root {rule.SetBaseLine(stmtNode.BaseLine)checker.SetBaseLine(stmtNode.BaseLine)antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)diff --git a/backend/plugin/advisor/mysql/rule_column_require_charset.go b/backend/plugin/advisor/mysql/rule_column_require_charset.goindex ae6c9ca71b..be1f34177e 100644--- a/backend/plugin/advisor/mysql/rule_column_require_charset.go+++ b/backend/plugin/advisor/mysql/rule_column_require_charset.go@@ -7,14 +7,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -31,9 +29,10 @@ type ColumnRequireCharsetAdvisor struct {}func (*ColumnRequireCharsetAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_require_collation.go b/backend/plugin/advisor/mysql/rule_column_require_collation.goindex 2e2f2bc9b1..6939fd2da7 100644--- a/backend/plugin/advisor/mysql/rule_column_require_collation.go+++ b/backend/plugin/advisor/mysql/rule_column_require_collation.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -30,9 +28,10 @@ type ColumnRequireCollationAdvisor struct {}func (*ColumnRequireCollationAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_require_default.go b/backend/plugin/advisor/mysql/rule_column_require_default.goindex 78d1a5de6d..8ac410a410 100644--- a/backend/plugin/advisor/mysql/rule_column_require_default.go+++ b/backend/plugin/advisor/mysql/rule_column_require_default.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +31,10 @@ type ColumnRequireDefaultAdvisor struct {// Check checks for column default requirement.func (*ColumnRequireDefaultAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_required.go b/backend/plugin/advisor/mysql/rule_column_required.goindex eb1ed3906c..bcd755811f 100644--- a/backend/plugin/advisor/mysql/rule_column_required.go+++ b/backend/plugin/advisor/mysql/rule_column_required.go@@ -10,12 +10,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -35,9 +33,10 @@ type ColumnRequirementAdvisor struct {// Check checks for the column requirement.func (*ColumnRequirementAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ list, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_set_default_for_not_null.go b/backend/plugin/advisor/mysql/rule_column_set_default_for_not_null.goindex 63500c7d2c..fa66cbffcb 100644--- a/backend/plugin/advisor/mysql/rule_column_set_default_for_not_null.go+++ b/backend/plugin/advisor/mysql/rule_column_set_default_for_not_null.go@@ -7,14 +7,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -34,9 +32,10 @@ type ColumnSetDefaultForNotNullAdvisor struct {// Check checks for set default value for not null column.func (*ColumnSetDefaultForNotNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_column_type_disallow_list.go b/backend/plugin/advisor/mysql/rule_column_type_disallow_list.goindex b6ef96ec8f..9d5a80e6c0 100644--- a/backend/plugin/advisor/mysql/rule_column_type_disallow_list.go+++ b/backend/plugin/advisor/mysql/rule_column_type_disallow_list.go@@ -8,14 +8,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -35,9 +33,10 @@ type ColumnTypeDisallowListAdvisor struct {// Check checks for column type restriction.func (*ColumnTypeDisallowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_database_drop_empty_db.go b/backend/plugin/advisor/mysql/rule_database_drop_empty_db.goindex ee7cca0a2e..8c5752c684 100644--- a/backend/plugin/advisor/mysql/rule_database_drop_empty_db.go+++ b/backend/plugin/advisor/mysql/rule_database_drop_empty_db.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/store/model")@@ -34,9 +32,9 @@ type DatabaseAllowDropIfEmptyAdvisor struct {// Check checks for drop table naming convention.func (*DatabaseAllowDropIfEmptyAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql ParseResult")+ list, err := getANTLRTree(checkCtx)+ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)@@ -50,7 +48,7 @@ func (*DatabaseAllowDropIfEmptyAdvisor) Check(_ context.Context, checkCtx adviso// Create the generic checker with the rulechecker := NewGenericChecker([]Rule{rule})- for _, stmt := range stmtList {+ for _, stmt := range list {rule.SetBaseLine(stmt.BaseLine)checker.SetBaseLine(stmt.BaseLine)antlr.ParseTreeWalkerDefault.Walk(checker, stmt.Tree)diff --git a/backend/plugin/advisor/mysql/rule_disallow_procedure.go b/backend/plugin/advisor/mysql/rule_disallow_procedure.goindex 993642e9d4..5ce5f700e7 100644--- a/backend/plugin/advisor/mysql/rule_disallow_procedure.go+++ b/backend/plugin/advisor/mysql/rule_disallow_procedure.go@@ -5,7 +5,6 @@ import ("fmt""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql"@@ -13,7 +12,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -31,9 +29,10 @@ type ProcedureDisallowCreateAdvisor struct {// Check checks for disallow create procedure.func (*ProcedureDisallowCreateAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_event_disallow_create.go b/backend/plugin/advisor/mysql/rule_event_disallow_create.goindex d2555f24fd..c980aab81d 100644--- a/backend/plugin/advisor/mysql/rule_event_disallow_create.go+++ b/backend/plugin/advisor/mysql/rule_event_disallow_create.go@@ -5,7 +5,6 @@ import ("fmt""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql"@@ -13,7 +12,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -31,9 +29,10 @@ type EventDisallowCreateAdvisor struct {// Check checks for disallow creating event.func (*EventDisallowCreateAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_function_disallow_create.go b/backend/plugin/advisor/mysql/rule_function_disallow_create.goindex a4d17bbec6..26e4b6c214 100644--- a/backend/plugin/advisor/mysql/rule_function_disallow_create.go+++ b/backend/plugin/advisor/mysql/rule_function_disallow_create.go@@ -5,7 +5,6 @@ import ("fmt""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql"@@ -13,7 +12,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -31,9 +29,10 @@ type FunctionDisallowCreateAdvisor struct {// Check checks for disallow creating function.func (*FunctionDisallowCreateAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_function_disallowed_list.go b/backend/plugin/advisor/mysql/rule_function_disallowed_list.goindex b4cd812f63..f008564622 100644--- a/backend/plugin/advisor/mysql/rule_function_disallowed_list.go+++ b/backend/plugin/advisor/mysql/rule_function_disallowed_list.go@@ -10,12 +10,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -32,9 +30,10 @@ type FunctionDisallowedListAdvisor struct {}func (*FunctionDisallowedListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_index_key_number_limit.go b/backend/plugin/advisor/mysql/rule_index_key_number_limit.goindex 7fa7268101..c460389c67 100644--- a/backend/plugin/advisor/mysql/rule_index_key_number_limit.go+++ b/backend/plugin/advisor/mysql/rule_index_key_number_limit.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +31,10 @@ type IndexKeyNumberLimitAdvisor struct {// Check checks for index key number limit.func (*IndexKeyNumberLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_index_no_duplicate_column.go b/backend/plugin/advisor/mysql/rule_index_no_duplicate_column.goindex 83717507c5..763dce3008 100644--- a/backend/plugin/advisor/mysql/rule_index_no_duplicate_column.go+++ b/backend/plugin/advisor/mysql/rule_index_no_duplicate_column.go@@ -7,14 +7,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -34,9 +32,10 @@ type IndexNoDuplicateColumnAdvisor struct {// Check checks for no duplicate columns in index.func (*IndexNoDuplicateColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_index_pk_type.go b/backend/plugin/advisor/mysql/rule_index_pk_type.goindex 83bfb20a09..c4f32a90de 100644--- a/backend/plugin/advisor/mysql/rule_index_pk_type.go+++ b/backend/plugin/advisor/mysql/rule_index_pk_type.go@@ -14,7 +14,6 @@ import ("github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/store/model")@@ -35,9 +34,10 @@ type IndexPkTypeAdvisor struct {// Check checks for correct type of PK.func (*IndexPkTypeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_index_primary_key_type_allowlist.go b/backend/plugin/advisor/mysql/rule_index_primary_key_type_allowlist.goindex 76ca61c723..84fa170063 100644--- a/backend/plugin/advisor/mysql/rule_index_primary_key_type_allowlist.go+++ b/backend/plugin/advisor/mysql/rule_index_primary_key_type_allowlist.go@@ -14,7 +14,6 @@ import ("github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/store/model")@@ -34,9 +33,10 @@ type IndexPrimaryKeyTypeAllowlistAdvisor struct {// Check checks for primary key type allowlist.func (*IndexPrimaryKeyTypeAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_index_total_number_limit.go b/backend/plugin/advisor/mysql/rule_index_total_number_limit.goindex 76fb980a33..54ca02ae4d 100644--- a/backend/plugin/advisor/mysql/rule_index_total_number_limit.go+++ b/backend/plugin/advisor/mysql/rule_index_total_number_limit.go@@ -9,12 +9,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/store/model")@@ -35,9 +33,10 @@ type IndexTotalNumberLimitAdvisor struct {// Check checks for index total number limit.func (*IndexTotalNumberLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_index_type_allow_list.go b/backend/plugin/advisor/mysql/rule_index_type_allow_list.goindex e12fa72039..efdb5d05eb 100644--- a/backend/plugin/advisor/mysql/rule_index_type_allow_list.go+++ b/backend/plugin/advisor/mysql/rule_index_type_allow_list.go@@ -9,12 +9,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -31,9 +29,10 @@ type IndexTypeAllowListAdvisor struct {}func (*IndexTypeAllowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_index_type_no_blob.go b/backend/plugin/advisor/mysql/rule_index_type_no_blob.goindex 98ce6bb23c..ca77b04ba5 100644--- a/backend/plugin/advisor/mysql/rule_index_type_no_blob.go+++ b/backend/plugin/advisor/mysql/rule_index_type_no_blob.go@@ -14,7 +14,6 @@ import ("github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/store/model")@@ -35,9 +34,10 @@ type IndexTypeNoBlobAdvisor struct {// Check checks for index type no blob.func (*IndexTypeNoBlobAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_insert_disallow_order_by_rand.go b/backend/plugin/advisor/mysql/rule_insert_disallow_order_by_rand.goindex c896bdd81d..3ef855ffdf 100644--- a/backend/plugin/advisor/mysql/rule_insert_disallow_order_by_rand.go+++ b/backend/plugin/advisor/mysql/rule_insert_disallow_order_by_rand.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -35,9 +33,10 @@ type InsertDisallowOrderByRandAdvisor struct {// Check checks for to disallow order by rand in INSERT statements.func (*InsertDisallowOrderByRandAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_insert_must_specify_column.go b/backend/plugin/advisor/mysql/rule_insert_must_specify_column.goindex 5cafa25773..ca7f503ecd 100644--- a/backend/plugin/advisor/mysql/rule_insert_must_specify_column.go+++ b/backend/plugin/advisor/mysql/rule_insert_must_specify_column.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -32,9 +30,10 @@ type InsertMustSpecifyColumnAdvisor struct {// Check checks for to enforce column specified.func (*InsertMustSpecifyColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_insert_row_limit.go b/backend/plugin/advisor/mysql/rule_insert_row_limit.goindex 5bbe60b65c..e593dd00dd 100644--- a/backend/plugin/advisor/mysql/rule_insert_row_limit.go+++ b/backend/plugin/advisor/mysql/rule_insert_row_limit.go@@ -14,7 +14,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +32,10 @@ type InsertRowLimitAdvisor struct {// Check checks for insert row limit.func (*InsertRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql ParseResult")+ list, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_migration_compatibility.go b/backend/plugin/advisor/mysql/rule_migration_compatibility.goindex 28751aa4e0..d7ca644233 100644--- a/backend/plugin/advisor/mysql/rule_migration_compatibility.go+++ b/backend/plugin/advisor/mysql/rule_migration_compatibility.go@@ -5,7 +5,6 @@ import ("fmt""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql"@@ -13,7 +12,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +31,10 @@ type CompatibilityAdvisor struct {// Check checks schema backward compatibility.func (*CompatibilityAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_naming_auto_increment_column.go b/backend/plugin/advisor/mysql/rule_naming_auto_increment_column.goindex 3ce2dfe4cb..119de85efd 100644--- a/backend/plugin/advisor/mysql/rule_naming_auto_increment_column.go+++ b/backend/plugin/advisor/mysql/rule_naming_auto_increment_column.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +31,10 @@ type NamingAutoIncrementColumnAdvisor struct {// Check checks for auto-increment naming convention.func (*NamingAutoIncrementColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_naming_column.go b/backend/plugin/advisor/mysql/rule_naming_column.goindex 91150427b6..b7e3f59f30 100644--- a/backend/plugin/advisor/mysql/rule_naming_column.go+++ b/backend/plugin/advisor/mysql/rule_naming_column.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -31,9 +29,9 @@ type NamingColumnConventionAdvisor struct {// Check checks for column naming convention.func (*NamingColumnConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql ParseResult")+ list, err := getANTLRTree(checkCtx)+ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_naming_foreign_key_convention.go b/backend/plugin/advisor/mysql/rule_naming_foreign_key_convention.goindex 1939024be2..de7cd6196e 100644--- a/backend/plugin/advisor/mysql/rule_naming_foreign_key_convention.go+++ b/backend/plugin/advisor/mysql/rule_naming_foreign_key_convention.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +31,10 @@ type NamingFKConventionAdvisor struct {// Check checks for foreign key naming convention.func (*NamingFKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ root, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)@@ -54,7 +53,7 @@ func (*NamingFKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Cont// Create the generic checker with the rulechecker := NewGenericChecker([]Rule{rule})- for _, stmtNode := range list {+ for _, stmtNode := range root {rule.SetBaseLine(stmtNode.BaseLine)checker.SetBaseLine(stmtNode.BaseLine)antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)diff --git a/backend/plugin/advisor/mysql/rule_naming_identifier_no_keyword.go b/backend/plugin/advisor/mysql/rule_naming_identifier_no_keyword.goindex 0753c45192..3c5ec954e1 100644--- a/backend/plugin/advisor/mysql/rule_naming_identifier_no_keyword.go+++ b/backend/plugin/advisor/mysql/rule_naming_identifier_no_keyword.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -30,9 +28,10 @@ type NamingIdentifierNoKeywordAdvisor struct {// Check checks for identifier naming convention without keyword.func (*NamingIdentifierNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_naming_index_convention.go b/backend/plugin/advisor/mysql/rule_naming_index_convention.goindex b3e8f2eb77..a693d790fc 100644--- a/backend/plugin/advisor/mysql/rule_naming_index_convention.go+++ b/backend/plugin/advisor/mysql/rule_naming_index_convention.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/store/model")@@ -42,9 +40,10 @@ type NamingIndexConventionAdvisor struct {// Check checks for index naming convention.func (*NamingIndexConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ root, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)@@ -63,7 +62,7 @@ func (*NamingIndexConventionAdvisor) Check(_ context.Context, checkCtx advisor.C// Create the generic checker with the rulechecker := NewGenericChecker([]Rule{rule})- for _, stmtNode := range list {+ for _, stmtNode := range root {rule.SetBaseLine(stmtNode.BaseLine)checker.SetBaseLine(stmtNode.BaseLine)antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)diff --git a/backend/plugin/advisor/mysql/rule_naming_table.go b/backend/plugin/advisor/mysql/rule_naming_table.goindex 03626e873d..c744e91fe8 100644--- a/backend/plugin/advisor/mysql/rule_naming_table.go+++ b/backend/plugin/advisor/mysql/rule_naming_table.go@@ -13,7 +13,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,8 +32,8 @@ type NamingTableConventionAdvisor struct {// Check checks for table naming convention.func (*NamingTableConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {+ list, err := getANTLRTree(checkCtx)+ if err != nil {return nil, errors.Errorf("failed to convert to Tree")}diff --git a/backend/plugin/advisor/mysql/rule_naming_unique_key_convention.go b/backend/plugin/advisor/mysql/rule_naming_unique_key_convention.goindex 7a8eb6edea..f17ca85679 100644--- a/backend/plugin/advisor/mysql/rule_naming_unique_key_convention.go+++ b/backend/plugin/advisor/mysql/rule_naming_unique_key_convention.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/store/model")@@ -34,9 +32,10 @@ type NamingUKConventionAdvisor struct {// Check checks for index naming convention.func (*NamingUKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ root, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)@@ -55,7 +54,7 @@ func (*NamingUKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Cont// Create the generic checker with the rulechecker := NewGenericChecker([]Rule{rule})- for _, stmtNode := range list {+ for _, stmtNode := range root {rule.SetBaseLine(stmtNode.BaseLine)checker.SetBaseLine(stmtNode.BaseLine)antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)diff --git a/backend/plugin/advisor/mysql/rule_online_migration.go b/backend/plugin/advisor/mysql/rule_online_migration.goindex bfa0bf3b4b..a11a3a244c 100644--- a/backend/plugin/advisor/mysql/rule_online_migration.go+++ b/backend/plugin/advisor/mysql/rule_online_migration.go@@ -35,8 +35,8 @@ type OnlineMigrationAdvisor struct {// Check checks for using gh-ost to migrate large tables.func (*OnlineMigrationAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {+ stmtList, err := getANTLRTree(checkCtx)+ if err != nil {return nil, errors.Errorf("failed to convert to StmtNode")}diff --git a/backend/plugin/advisor/mysql/rule_statement_add_column_without_position.go b/backend/plugin/advisor/mysql/rule_statement_add_column_without_position.goindex a9c448e0e5..586e7c7bbb 100644--- a/backend/plugin/advisor/mysql/rule_statement_add_column_without_position.go+++ b/backend/plugin/advisor/mysql/rule_statement_add_column_without_position.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -30,9 +28,10 @@ type StatementAddColumnWithoutPositionAdvisor struct {// Check checks for checking no position in ADD COLUMN clause.func (*StatementAddColumnWithoutPositionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_affected_row_limit.go b/backend/plugin/advisor/mysql/rule_statement_affected_row_limit.goindex 26fe57ad25..149990d1db 100644--- a/backend/plugin/advisor/mysql/rule_statement_affected_row_limit.go+++ b/backend/plugin/advisor/mysql/rule_statement_affected_row_limit.go@@ -14,7 +14,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +32,10 @@ type StatementAffectedRowLimitAdvisor struct {// Check checks for UPDATE/DELETE affected row limit.func (*StatementAffectedRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_ddl.go b/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_ddl.goindex 9b1f8e0155..95f4585aea 100644--- a/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_ddl.go+++ b/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_ddl.go@@ -5,13 +5,11 @@ import ("fmt""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +31,10 @@ func (*StatementDisallowMixInDDLAdvisor) Check(_ context.Context, checkCtx advisreturn nil, nil}- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_dml.go b/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_dml.goindex 1c423709fa..44c97316cb 100644--- a/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_dml.go+++ b/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_dml.go@@ -5,13 +5,11 @@ import ("fmt""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +31,10 @@ func (*StatementDisallowMixInDMLAdvisor) Check(_ context.Context, checkCtx advisreturn nil, nil}- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_disallow_using_filesort.go b/backend/plugin/advisor/mysql/rule_statement_disallow_using_filesort.goindex 65f6fd6a0b..3242b65f7f 100644--- a/backend/plugin/advisor/mysql/rule_statement_disallow_using_filesort.go+++ b/backend/plugin/advisor/mysql/rule_statement_disallow_using_filesort.go@@ -14,7 +14,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -31,9 +30,10 @@ type StatementDisallowUsingFilesortAdvisor struct {}func (*StatementDisallowUsingFilesortAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_disallow_using_temporary.go b/backend/plugin/advisor/mysql/rule_statement_disallow_using_temporary.goindex f3786c70a9..9ef1e7bed9 100644--- a/backend/plugin/advisor/mysql/rule_statement_disallow_using_temporary.go+++ b/backend/plugin/advisor/mysql/rule_statement_disallow_using_temporary.go@@ -14,7 +14,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -31,9 +30,10 @@ type StatementDisallowUsingTemporaryAdvisor struct {}func (*StatementDisallowUsingTemporaryAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.go b/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.goindex 12a8633c2b..b8d3e0565e 100644--- a/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.go+++ b/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +31,10 @@ type StatementDmlDryRunAdvisor struct {// Check checks for DML dry run.func (*StatementDmlDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_join_strict_column_attrs.go b/backend/plugin/advisor/mysql/rule_statement_join_strict_column_attrs.goindex 8e234f5720..2a7ed45bc0 100644--- a/backend/plugin/advisor/mysql/rule_statement_join_strict_column_attrs.go+++ b/backend/plugin/advisor/mysql/rule_statement_join_strict_column_attrs.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/store/model")@@ -30,9 +28,10 @@ type StatementJoinStrictColumnAttrsAdvisor struct {}func (*StatementJoinStrictColumnAttrsAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_maximum_join_table_count.go b/backend/plugin/advisor/mysql/rule_statement_maximum_join_table_count.goindex 18167ff6ec..b4aeafe07f 100644--- a/backend/plugin/advisor/mysql/rule_statement_maximum_join_table_count.go+++ b/backend/plugin/advisor/mysql/rule_statement_maximum_join_table_count.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -27,9 +25,10 @@ type StatementMaximumJoinTableCountAdvisor struct {}func (*StatementMaximumJoinTableCountAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_maximum_limit_value.go b/backend/plugin/advisor/mysql/rule_statement_maximum_limit_value.goindex a8e40beaf2..31bd3c0947 100644--- a/backend/plugin/advisor/mysql/rule_statement_maximum_limit_value.go+++ b/backend/plugin/advisor/mysql/rule_statement_maximum_limit_value.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -31,9 +29,10 @@ type StatementMaximumLimitValueAdvisor struct {}func (*StatementMaximumLimitValueAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_maximum_statements_in_transaction.go b/backend/plugin/advisor/mysql/rule_statement_maximum_statements_in_transaction.goindex 3273bf2431..12b905f291 100644--- a/backend/plugin/advisor/mysql/rule_statement_maximum_statements_in_transaction.go+++ b/backend/plugin/advisor/mysql/rule_statement_maximum_statements_in_transaction.go@@ -5,11 +5,9 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -24,9 +22,10 @@ type StatementMaximumStatementsInTransactionAdvisor struct {}func (*StatementMaximumStatementsInTransactionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_merge_alter_table.go b/backend/plugin/advisor/mysql/rule_statement_merge_alter_table.goindex 60c3024190..16703e38a9 100644--- a/backend/plugin/advisor/mysql/rule_statement_merge_alter_table.go+++ b/backend/plugin/advisor/mysql/rule_statement_merge_alter_table.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +31,10 @@ type StatementMergeAlterTableAdvisor struct {// Check checks for merging ALTER TABLE statements.func (*StatementMergeAlterTableAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_query_minimum_plan_level.go b/backend/plugin/advisor/mysql/rule_statement_query_minimum_plan_level.goindex f180e7147b..0d0c37b070 100644--- a/backend/plugin/advisor/mysql/rule_statement_query_minimum_plan_level.go+++ b/backend/plugin/advisor/mysql/rule_statement_query_minimum_plan_level.go@@ -15,7 +15,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -31,9 +30,10 @@ type StatementQueryMinumumPlanLevelAdvisor struct {}func (*StatementQueryMinumumPlanLevelAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_select_full_table_scan.go b/backend/plugin/advisor/mysql/rule_statement_select_full_table_scan.goindex b4236aaaaf..c2fee7a456 100644--- a/backend/plugin/advisor/mysql/rule_statement_select_full_table_scan.go+++ b/backend/plugin/advisor/mysql/rule_statement_select_full_table_scan.go@@ -15,7 +15,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +32,10 @@ type StatementSelectFullTableScanAdvisor struct {}func (*StatementSelectFullTableScanAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_where_disallow_using_function.go b/backend/plugin/advisor/mysql/rule_statement_where_disallow_using_function.goindex 83ae218b8a..ac77af0fca 100644--- a/backend/plugin/advisor/mysql/rule_statement_where_disallow_using_function.go+++ b/backend/plugin/advisor/mysql/rule_statement_where_disallow_using_function.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -28,9 +26,10 @@ type StatementWhereDisallowUsingFunctionAdvisor struct {}func (*StatementWhereDisallowUsingFunctionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_where_maximum_logical_operator_count.go b/backend/plugin/advisor/mysql/rule_statement_where_maximum_logical_operator_count.goindex c2c11bf79f..7e3d7222a0 100644--- a/backend/plugin/advisor/mysql/rule_statement_where_maximum_logical_operator_count.go+++ b/backend/plugin/advisor/mysql/rule_statement_where_maximum_logical_operator_count.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -27,9 +25,10 @@ type StatementWhereMaximumLogicalOperatorCountAdvisor struct {}func (*StatementWhereMaximumLogicalOperatorCountAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_statement_where_no_equal_null.go b/backend/plugin/advisor/mysql/rule_statement_where_no_equal_null.goindex 205c960d29..28fb4ed966 100644--- a/backend/plugin/advisor/mysql/rule_statement_where_no_equal_null.go+++ b/backend/plugin/advisor/mysql/rule_statement_where_no_equal_null.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -27,9 +25,10 @@ type StatementWhereNoEqualNullAdvisor struct {}func (*StatementWhereNoEqualNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_stmt_disallow_commit.go b/backend/plugin/advisor/mysql/rule_stmt_disallow_commit.goindex a930cac370..f6bb47f71e 100644--- a/backend/plugin/advisor/mysql/rule_stmt_disallow_commit.go+++ b/backend/plugin/advisor/mysql/rule_stmt_disallow_commit.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -32,9 +30,10 @@ type StatementDisallowCommitAdvisor struct {// Check checks for disallowing commit.func (*StatementDisallowCommitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_stmt_disallow_limit.go b/backend/plugin/advisor/mysql/rule_stmt_disallow_limit.goindex e671dfcb7c..989e4662bf 100644--- a/backend/plugin/advisor/mysql/rule_stmt_disallow_limit.go+++ b/backend/plugin/advisor/mysql/rule_stmt_disallow_limit.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -31,9 +29,10 @@ type StatementDisallowLimitAdvisor struct {// Check checks for no LIMIT clause in INSERT/UPDATE statement.func (*StatementDisallowLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_stmt_disallow_order_by.go b/backend/plugin/advisor/mysql/rule_stmt_disallow_order_by.goindex e86749392d..d08d3f0cd5 100644--- a/backend/plugin/advisor/mysql/rule_stmt_disallow_order_by.go+++ b/backend/plugin/advisor/mysql/rule_stmt_disallow_order_by.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -31,9 +29,10 @@ type DisallowOrderByAdvisor struct {// Check checks for no ORDER BY clause in DELETE/UPDATE statements.func (*DisallowOrderByAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_stmt_max_execution_time.go b/backend/plugin/advisor/mysql/rule_stmt_max_execution_time.goindex 06488224c7..61a68b0424 100644--- a/backend/plugin/advisor/mysql/rule_stmt_max_execution_time.go+++ b/backend/plugin/advisor/mysql/rule_stmt_max_execution_time.go@@ -13,7 +13,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -30,8 +29,8 @@ type MaxExecutionTimeAdvisor struct {}func (*MaxExecutionTimeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {+ stmtList, err := getANTLRTree(checkCtx)+ if err != nil {return nil, errors.Errorf("failed to convert to stmt list")}diff --git a/backend/plugin/advisor/mysql/rule_stmt_no_leading_wildcard_like.go b/backend/plugin/advisor/mysql/rule_stmt_no_leading_wildcard_like.goindex 5ab62559be..9f7c8b8274 100644--- a/backend/plugin/advisor/mysql/rule_stmt_no_leading_wildcard_like.go+++ b/backend/plugin/advisor/mysql/rule_stmt_no_leading_wildcard_like.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -32,9 +30,10 @@ type NoLeadingWildcardLikeAdvisor struct {// Check checks for no leading wildcard LIKE.func (*NoLeadingWildcardLikeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ root, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_stmt_no_select_all.go b/backend/plugin/advisor/mysql/rule_stmt_no_select_all.goindex d92824747e..1d12e6ca2d 100644--- a/backend/plugin/advisor/mysql/rule_stmt_no_select_all.go+++ b/backend/plugin/advisor/mysql/rule_stmt_no_select_all.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -31,9 +29,10 @@ type NoSelectAllAdvisor struct {// Check checks for no "select *".func (*NoSelectAllAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ root, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_stmt_require_algorithm_or_lock_options.go b/backend/plugin/advisor/mysql/rule_stmt_require_algorithm_or_lock_options.goindex c1cb8804ea..f2cd48ae63 100644--- a/backend/plugin/advisor/mysql/rule_stmt_require_algorithm_or_lock_options.go+++ b/backend/plugin/advisor/mysql/rule_stmt_require_algorithm_or_lock_options.go@@ -11,7 +11,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -32,8 +31,8 @@ type RequireAlgorithmOrLockOptionAdvisor struct {}func (*RequireAlgorithmOrLockOptionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {+ stmtList, err := getANTLRTree(checkCtx)+ if err != nil {return nil, errors.Errorf("failed to convert to stmt list")}diff --git a/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_select.go b/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_select.goindex ffbad63900..d8b26a230f 100644--- a/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_select.go+++ b/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_select.go@@ -12,7 +12,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -31,8 +30,8 @@ type WhereRequirementForSelectAdvisor struct {// Check checks for the WHERE clause requirement.func (*WhereRequirementForSelectAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {+ root, err := getANTLRTree(checkCtx)+ if err != nil {return nil, errors.Errorf("failed to convert to StmtNode")}@@ -47,7 +46,7 @@ func (*WhereRequirementForSelectAdvisor) Check(_ context.Context, checkCtx advis// Create the generic checker with the rulechecker := NewGenericChecker([]Rule{rule})- for _, stmtNode := range stmtList {+ for _, stmtNode := range root {rule.SetBaseLine(stmtNode.BaseLine)checker.SetBaseLine(stmtNode.BaseLine)antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)diff --git a/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_update_delete.go b/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_update_delete.goindex 79f63a5147..b152210151 100644--- a/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_update_delete.go+++ b/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_update_delete.go@@ -12,7 +12,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -32,8 +31,8 @@ type WhereRequirementForUpdateDeleteAdvisor struct {// Check checks for the WHERE clause requirement.func (*WhereRequirementForUpdateDeleteAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {+ stmtList, err := getANTLRTree(checkCtx)+ if err != nil {return nil, errors.Errorf("failed to convert to StmtNode")}diff --git a/backend/plugin/advisor/mysql/rule_table_comment_convention.go b/backend/plugin/advisor/mysql/rule_table_comment_convention.goindex d518fd0f84..3d4ed08987 100644--- a/backend/plugin/advisor/mysql/rule_table_comment_convention.go+++ b/backend/plugin/advisor/mysql/rule_table_comment_convention.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -32,9 +30,10 @@ type TableCommentConventionAdvisor struct {// Check checks for table comment convention.func (*TableCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ list, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_ddl.go b/backend/plugin/advisor/mysql/rule_table_disallow_ddl.goindex 3510d623d2..7c8b398480 100644--- a/backend/plugin/advisor/mysql/rule_table_disallow_ddl.go+++ b/backend/plugin/advisor/mysql/rule_table_disallow_ddl.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -30,9 +28,10 @@ type TableDisallowDDLAdvisor struct {}func (*TableDisallowDDLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ list, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_dml.go b/backend/plugin/advisor/mysql/rule_table_disallow_dml.goindex fad8bf95a0..4590a10537 100644--- a/backend/plugin/advisor/mysql/rule_table_disallow_dml.go+++ b/backend/plugin/advisor/mysql/rule_table_disallow_dml.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -30,9 +28,10 @@ type TableDisallowDMLAdvisor struct {}func (*TableDisallowDMLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ list, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_partition.go b/backend/plugin/advisor/mysql/rule_table_disallow_partition.goindex ded6032c1a..02859bba08 100644--- a/backend/plugin/advisor/mysql/rule_table_disallow_partition.go+++ b/backend/plugin/advisor/mysql/rule_table_disallow_partition.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -33,9 +31,10 @@ type TableDisallowPartitionAdvisor struct {// Check checks for disallow table partition.func (*TableDisallowPartitionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_set_charset.go b/backend/plugin/advisor/mysql/rule_table_disallow_set_charset.goindex a1b6f2f12f..1f8781e129 100644--- a/backend/plugin/advisor/mysql/rule_table_disallow_set_charset.go+++ b/backend/plugin/advisor/mysql/rule_table_disallow_set_charset.go@@ -5,7 +5,6 @@ import ("fmt""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql"@@ -13,7 +12,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -29,9 +27,10 @@ type TableDisallowSetCharsetAdvisor struct {}func (*TableDisallowSetCharsetAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_trigger.go b/backend/plugin/advisor/mysql/rule_table_disallow_trigger.goindex 7cb3764971..e505d65c44 100644--- a/backend/plugin/advisor/mysql/rule_table_disallow_trigger.go+++ b/backend/plugin/advisor/mysql/rule_table_disallow_trigger.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -31,9 +29,10 @@ type TableDisallowTriggerAdvisor struct {// Check checks for disallow table trigger.func (*TableDisallowTriggerAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_table_drop_naming_convention.go b/backend/plugin/advisor/mysql/rule_table_drop_naming_convention.goindex 1abd01bc17..ee7d0872d2 100644--- a/backend/plugin/advisor/mysql/rule_table_drop_naming_convention.go+++ b/backend/plugin/advisor/mysql/rule_table_drop_naming_convention.go@@ -9,12 +9,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -34,9 +32,10 @@ type TableDropNamingConventionAdvisor struct {// Check checks for drop table naming convention.func (*TableDropNamingConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ list, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)if err != nil {diff --git a/backend/plugin/advisor/mysql/rule_table_limit_size.go b/backend/plugin/advisor/mysql/rule_table_limit_size.goindex 3b2822f170..3a946fe6c7 100644--- a/backend/plugin/advisor/mysql/rule_table_limit_size.go+++ b/backend/plugin/advisor/mysql/rule_table_limit_size.go@@ -7,13 +7,11 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/plugin/advisor"@@ -37,9 +35,10 @@ func (*MaximumTableSizeAdvisor) Check(_ context.Context, checkCtx advisor.Contexreturn nil, err}- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}// User defined rule level.diff --git a/backend/plugin/advisor/mysql/rule_table_no_duplicate_index.go b/backend/plugin/advisor/mysql/rule_table_no_duplicate_index.goindex 154f259a04..57734b14c9 100644--- a/backend/plugin/advisor/mysql/rule_table_no_duplicate_index.go+++ b/backend/plugin/advisor/mysql/rule_table_no_duplicate_index.go@@ -10,14 +10,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -35,9 +33,10 @@ type TableNoDuplicateIndexAdvisor struct {// Check checks for no duplicate index in table.func (*TableNoDuplicateIndexAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_table_no_fk.go b/backend/plugin/advisor/mysql/rule_table_no_fk.goindex 47e47e36f3..672fbc19b5 100644--- a/backend/plugin/advisor/mysql/rule_table_no_fk.go+++ b/backend/plugin/advisor/mysql/rule_table_no_fk.go@@ -8,14 +8,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -35,9 +33,10 @@ type TableNoFKAdvisor struct {// Check checks table disallow foreign key.func (*TableNoFKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ root, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)if err != nil {@@ -50,7 +49,7 @@ func (*TableNoFKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*// Create the generic checker with the rulechecker := NewGenericChecker([]Rule{rule})- for _, stmtNode := range list {+ for _, stmtNode := range root {rule.SetBaseLine(stmtNode.BaseLine)checker.SetBaseLine(stmtNode.BaseLine)antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)diff --git a/backend/plugin/advisor/mysql/rule_table_require_charset.go b/backend/plugin/advisor/mysql/rule_table_require_charset.goindex 02fbcb73eb..812df713b3 100644--- a/backend/plugin/advisor/mysql/rule_table_require_charset.go+++ b/backend/plugin/advisor/mysql/rule_table_require_charset.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -30,9 +28,10 @@ type TableRequireCharsetAdvisor struct {}func (*TableRequireCharsetAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_table_require_collation.go b/backend/plugin/advisor/mysql/rule_table_require_collation.goindex 7f3f60dbfc..9cee504035 100644--- a/backend/plugin/advisor/mysql/rule_table_require_collation.go+++ b/backend/plugin/advisor/mysql/rule_table_require_collation.go@@ -8,12 +8,10 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -30,9 +28,10 @@ type TableRequireCollationAdvisor struct {}func (*TableRequireCollationAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_table_require_pk.go b/backend/plugin/advisor/mysql/rule_table_require_pk.goindex 6dad9374d4..950ba98e1d 100644--- a/backend/plugin/advisor/mysql/rule_table_require_pk.go+++ b/backend/plugin/advisor/mysql/rule_table_require_pk.go@@ -6,7 +6,6 @@ import ("strings""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql"@@ -14,7 +13,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/store/model")@@ -39,9 +37,10 @@ type TableRequirePKAdvisor struct {// Check checks table requires PK.func (*TableRequirePKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ root, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)@@ -55,7 +54,7 @@ func (*TableRequirePKAdvisor) Check(_ context.Context, checkCtx advisor.Context)// Create the generic checker with the rulechecker := NewGenericChecker([]Rule{rule})- for _, stmtNode := range list {+ for _, stmtNode := range root {rule.SetBaseLine(stmtNode.BaseLine)checker.SetBaseLine(stmtNode.BaseLine)antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)diff --git a/backend/plugin/advisor/mysql/rule_table_text_fields_total_length.go b/backend/plugin/advisor/mysql/rule_table_text_fields_total_length.goindex f9aba9ede9..70122bccd1 100644--- a/backend/plugin/advisor/mysql/rule_table_text_fields_total_length.go+++ b/backend/plugin/advisor/mysql/rule_table_text_fields_total_length.go@@ -10,14 +10,12 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql""github.com/bytebase/bytebase/backend/store/model")@@ -34,9 +32,10 @@ type TableMaximumVarcharLengthAdvisor struct {}func (*TableMaximumVarcharLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/rule_use_innodb.go b/backend/plugin/advisor/mysql/rule_use_innodb.goindex 7d71793fea..159cf3cb13 100644--- a/backend/plugin/advisor/mysql/rule_use_innodb.go+++ b/backend/plugin/advisor/mysql/rule_use_innodb.go@@ -14,7 +14,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -36,8 +35,8 @@ type UseInnoDBAdvisor struct {// Check checks for using InnoDB engine.func (*UseInnoDBAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {+ list, err := getANTLRTree(checkCtx)+ if err != nil {return nil, errors.Errorf("failed to convert to Tree")}diff --git a/backend/plugin/advisor/mysql/rule_view_disallow_create.go b/backend/plugin/advisor/mysql/rule_view_disallow_create.goindex ee643f1687..d20f554a69 100644--- a/backend/plugin/advisor/mysql/rule_view_disallow_create.go+++ b/backend/plugin/advisor/mysql/rule_view_disallow_create.go@@ -5,7 +5,6 @@ import ("fmt""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql"@@ -13,7 +12,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -31,9 +29,10 @@ type ViewDisallowCreateAdvisor struct {// Check checks for disallow creating view.func (*ViewDisallowCreateAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/mysql/utils.go b/backend/plugin/advisor/mysql/utils.goindex c6d1afab40..68fac0ac3a 100644--- a/backend/plugin/advisor/mysql/utils.go+++ b/backend/plugin/advisor/mysql/utils.go@@ -7,6 +7,10 @@ import ("strings""github.com/bytebase/parser/mysql"+ "github.com/pkg/errors"++ "github.com/bytebase/bytebase/backend/plugin/advisor"+ "github.com/bytebase/bytebase/backend/plugin/parser/base")type columnSet map[string]bool@@ -88,3 +92,29 @@ func isCharsetDataType(dataType mysql.IDataTypeContext) bool {dataType.MEDIUMTEXT_SYMBOL() != nil ||dataType.LONGTEXT_SYMBOL() != nil)}++// getANTLRTree extracts the ANTLR parse trees from the advisor context.+// The AST must be pre-parsed and passed via checkCtx.AST.+// Returns all parse results for multi-statement SQL review.+func getANTLRTree(checkCtx advisor.Context) ([]*base.ParseResult, error) {+ if checkCtx.AST == nil {+ return nil, errors.New("AST is not provided in context - must be parsed before calling advisor")+ }++ var parseResults []*base.ParseResult+ for _, unifiedAST := range checkCtx.AST {+ antlrAST, ok := base.GetANTLRAST(unifiedAST)+ if !ok {+ return nil, errors.New("AST type mismatch: expected ANTLR-based parser result")+ }++ // Reconstruct base.ParseResult from AST+ parseResults = append(parseResults, &base.ParseResult{+ Tree: antlrAST.Tree,+ Tokens: antlrAST.Tokens,+ BaseLine: base.GetLineOffset(antlrAST.StartPosition),+ })+ }++ return parseResults, nil+}diff --git a/backend/plugin/advisor/oceanbase/advisor_disallow_offline_ddl.go b/backend/plugin/advisor/oceanbase/advisor_disallow_offline_ddl.goindex bda675fed9..d513da0429 100644--- a/backend/plugin/advisor/oceanbase/advisor_disallow_offline_ddl.go+++ b/backend/plugin/advisor/oceanbase/advisor_disallow_offline_ddl.go@@ -9,7 +9,6 @@ import ("strings""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql"@@ -17,7 +16,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -35,9 +33,10 @@ type DisallowOfflineDdlAdvisor struct {// Check checks for disallow Offline DDL.func (*DisallowOfflineDdlAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parser result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oceanbase/advisor_insert_row_limit.go b/backend/plugin/advisor/oceanbase/advisor_insert_row_limit.goindex 5325d0584b..0f7074e902 100644--- a/backend/plugin/advisor/oceanbase/advisor_insert_row_limit.go+++ b/backend/plugin/advisor/oceanbase/advisor_insert_row_limit.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4""github.com/bytebase/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -31,9 +29,10 @@ type InsertRowLimitAdvisor struct {// Check checks for insert row limit.func (*InsertRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- list, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql ParseResult")+ list, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oceanbase/advisor_statement_affected_row_limit.go b/backend/plugin/advisor/oceanbase/advisor_statement_affected_row_limit.goindex a6cd3cf50f..b57e0c0c23 100644--- a/backend/plugin/advisor/oceanbase/advisor_statement_affected_row_limit.go+++ b/backend/plugin/advisor/oceanbase/advisor_statement_affected_row_limit.go@@ -6,7 +6,6 @@ import ("fmt""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors""github.com/bytebase/parser/mysql"@@ -14,7 +13,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql")@@ -32,9 +30,10 @@ type StatementAffectedRowLimitAdvisor struct {// Check checks for UPDATE/DELETE affected row limit.func (*StatementAffectedRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to mysql parse result")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oceanbase/utils.go b/backend/plugin/advisor/oceanbase/utils.gonew file mode 100644index 0000000000..60d40fe58d--- /dev/null+++ b/backend/plugin/advisor/oceanbase/utils.go@@ -0,0 +1,29 @@+package oceanbase++import (+ "github.com/pkg/errors"++ "github.com/bytebase/bytebase/backend/plugin/advisor"+ "github.com/bytebase/bytebase/backend/plugin/parser/base"+)++// getANTLRTree extracts MySQL ANTLR parse trees from the advisor context.+// OceanBase uses the MySQL parser.+func getANTLRTree(checkCtx advisor.Context) ([]*base.ParseResult, error) {+ if checkCtx.AST == nil {+ return nil, errors.New("AST is not provided in context")+ }+ var parseResults []*base.ParseResult+ for _, unifiedAST := range checkCtx.AST {+ antlrAST, ok := base.GetANTLRAST(unifiedAST)+ if !ok {+ return nil, errors.New("AST type mismatch: expected ANTLR-based parser result")+ }+ parseResults = append(parseResults, &base.ParseResult{+ Tree: antlrAST.Tree,+ Tokens: antlrAST.Tokens,+ BaseLine: base.GetLineOffset(antlrAST.StartPosition),+ })+ }+ return parseResults, nil+}diff --git a/backend/plugin/advisor/oracle/rule_builtin_prior_backup_check.go b/backend/plugin/advisor/oracle/rule_builtin_prior_backup_check.goindex 68c53d4974..9d0cc4da0d 100644--- a/backend/plugin/advisor/oracle/rule_builtin_prior_backup_check.go+++ b/backend/plugin/advisor/oracle/rule_builtin_prior_backup_check.go@@ -13,7 +13,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql")@@ -33,9 +32,10 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx advreturn nil, nil}- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_column_add_not_null_column_require_default.go b/backend/plugin/advisor/oracle/rule_column_add_not_null_column_require_default.goindex 77bc2b0ac9..e784a8250d 100644--- a/backend/plugin/advisor/oracle/rule_column_add_not_null_column_require_default.go+++ b/backend/plugin/advisor/oracle/rule_column_add_not_null_column_require_default.go@@ -9,12 +9,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -31,9 +29,10 @@ type ColumnAddNotNullColumnRequireDefaultAdvisor struct {// Check checks for adding not null column requires default.func (*ColumnAddNotNullColumnRequireDefaultAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_column_comment_convention.go b/backend/plugin/advisor/oracle/rule_column_comment_convention.goindex 25663f9738..e87ea7736b 100644--- a/backend/plugin/advisor/oracle/rule_column_comment_convention.go+++ b/backend/plugin/advisor/oracle/rule_column_comment_convention.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql")@@ -30,9 +28,10 @@ type ColumnCommentConventionAdvisor struct {}func (*ColumnCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_column_maximum_character_length.go b/backend/plugin/advisor/oracle/rule_column_maximum_character_length.goindex d9ffe3695d..b210bec59a 100644--- a/backend/plugin/advisor/oracle/rule_column_maximum_character_length.go+++ b/backend/plugin/advisor/oracle/rule_column_maximum_character_length.go@@ -10,12 +10,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -32,9 +30,10 @@ type ColumnMaximumCharacterLengthAdvisor struct {// Check checks for maximum character length.func (*ColumnMaximumCharacterLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_column_maximum_varchar_length.go b/backend/plugin/advisor/oracle/rule_column_maximum_varchar_length.goindex e3724012e7..42927e7164 100644--- a/backend/plugin/advisor/oracle/rule_column_maximum_varchar_length.go+++ b/backend/plugin/advisor/oracle/rule_column_maximum_varchar_length.go@@ -10,12 +10,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -32,9 +30,10 @@ type ColumnMaximumVarcharLengthAdvisor struct {// Check checks for maximum varchar length.func (*ColumnMaximumVarcharLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_column_no_null.go b/backend/plugin/advisor/oracle/rule_column_no_null.goindex df0a189e47..7f037e2b9f 100644--- a/backend/plugin/advisor/oracle/rule_column_no_null.go+++ b/backend/plugin/advisor/oracle/rule_column_no_null.go@@ -8,13 +8,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -33,9 +31,10 @@ type ColumnNoNullAdvisor struct {// Check checks for column no NULL value.func (*ColumnNoNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_column_require.go b/backend/plugin/advisor/oracle/rule_column_require.goindex ad28b8f1b8..15f2d60bb5 100644--- a/backend/plugin/advisor/oracle/rule_column_require.go+++ b/backend/plugin/advisor/oracle/rule_column_require.go@@ -11,12 +11,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -33,9 +31,10 @@ type ColumnRequireAdvisor struct {// Check checks for column requirement.func (*ColumnRequireAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_column_require_default.go b/backend/plugin/advisor/oracle/rule_column_require_default.goindex c7af634354..9674b81c49 100644--- a/backend/plugin/advisor/oracle/rule_column_require_default.go+++ b/backend/plugin/advisor/oracle/rule_column_require_default.go@@ -10,12 +10,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -32,9 +30,10 @@ type ColumnRequireDefaultAdvisor struct {// Check checks for column default requirement.func (*ColumnRequireDefaultAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_column_type_disallow_list.go b/backend/plugin/advisor/oracle/rule_column_type_disallow_list.goindex b98c4e069f..f11a2810c9 100644--- a/backend/plugin/advisor/oracle/rule_column_type_disallow_list.go+++ b/backend/plugin/advisor/oracle/rule_column_type_disallow_list.go@@ -9,12 +9,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql")@@ -32,9 +30,10 @@ type ColumnTypeDisallowListAdvisor struct {// Check checks for column type disallow list.func (*ColumnTypeDisallowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_index_key_number_limit.go b/backend/plugin/advisor/oracle/rule_index_key_number_limit.goindex 3acd19f9f0..7184a98566 100644--- a/backend/plugin/advisor/oracle/rule_index_key_number_limit.go+++ b/backend/plugin/advisor/oracle/rule_index_key_number_limit.go@@ -9,12 +9,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -31,9 +29,10 @@ type IndexKeyNumberLimitAdvisor struct {// Check checks for index key number limit.func (*IndexKeyNumberLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_insert_must_specify_column.go b/backend/plugin/advisor/oracle/rule_insert_must_specify_column.goindex c5956cc6b9..8437ec388e 100644--- a/backend/plugin/advisor/oracle/rule_insert_must_specify_column.go+++ b/backend/plugin/advisor/oracle/rule_insert_must_specify_column.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -29,9 +27,10 @@ type InsertMustSpecifyColumnAdvisor struct {// Check checks for to enforce column specified.func (*InsertMustSpecifyColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_naming_identifier_case.go b/backend/plugin/advisor/oracle/rule_naming_identifier_case.goindex 7c3b259e04..2bcb876700 100644--- a/backend/plugin/advisor/oracle/rule_naming_identifier_case.go+++ b/backend/plugin/advisor/oracle/rule_naming_identifier_case.go@@ -8,13 +8,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -31,9 +29,10 @@ type NamingIdentifierCaseAdvisor struct {// Check checks for identifier case.func (*NamingIdentifierCaseAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_naming_identifier_no_keyword.go b/backend/plugin/advisor/oracle/rule_naming_identifier_no_keyword.goindex 7e578c14a2..dc05149a14 100644--- a/backend/plugin/advisor/oracle/rule_naming_identifier_no_keyword.go+++ b/backend/plugin/advisor/oracle/rule_naming_identifier_no_keyword.go@@ -9,12 +9,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql")@@ -32,9 +30,10 @@ type NamingIdentifierNoKeywordAdvisor struct {// Check checks for identifier naming convention without keyword.func (*NamingIdentifierNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_naming_table.go b/backend/plugin/advisor/oracle/rule_naming_table.goindex 863a331ed6..1cfaa995fe 100644--- a/backend/plugin/advisor/oracle/rule_naming_table.go+++ b/backend/plugin/advisor/oracle/rule_naming_table.go@@ -8,13 +8,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -31,9 +29,10 @@ type NamingTableAdvisor struct {// Check checks for table naming convention.func (*NamingTableAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_naming_table_no_keyword.go b/backend/plugin/advisor/oracle/rule_naming_table_no_keyword.goindex f8fd00849b..cb06250bf7 100644--- a/backend/plugin/advisor/oracle/rule_naming_table_no_keyword.go+++ b/backend/plugin/advisor/oracle/rule_naming_table_no_keyword.go@@ -9,12 +9,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base"plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql")@@ -32,9 +30,10 @@ type NamingTableNoKeywordAdvisor struct {// Check checks for table naming convention without keyword.func (*NamingTableNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_select_no_select_all.go b/backend/plugin/advisor/oracle/rule_select_no_select_all.goindex ccb8081673..c6ca583b50 100644--- a/backend/plugin/advisor/oracle/rule_select_no_select_all.go+++ b/backend/plugin/advisor/oracle/rule_select_no_select_all.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -29,9 +27,10 @@ type SelectNoSelectAllAdvisor struct {// Check checks for no select all.func (*SelectNoSelectAllAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_ddl.go b/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_ddl.goindex 1476135437..082359c32c 100644--- a/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_ddl.go+++ b/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_ddl.go@@ -4,7 +4,6 @@ import ("context""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors"parser "github.com/bytebase/parser/plsql"@@ -12,7 +11,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -32,9 +30,10 @@ func (*StatementDisallowMixInDDLAdvisor) Check(_ context.Context, checkCtx advisdefault:return nil, nil}- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_dml.go b/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_dml.goindex 27ab30fe88..1354b220a0 100644--- a/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_dml.go+++ b/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_dml.go@@ -4,7 +4,6 @@ import ("context""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors"parser "github.com/bytebase/parser/plsql"@@ -12,7 +11,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -33,9 +31,10 @@ func (*StatementDisallowMixInDMLAdvisor) Check(_ context.Context, checkCtx advisreturn nil, nil}- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.go b/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.goindex 8cba2c1f04..b4be71909e 100644--- a/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.go+++ b/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.go@@ -6,7 +6,6 @@ import ("fmt""github.com/antlr4-go/antlr/v4"- "github.com/pkg/errors"parser "github.com/bytebase/parser/plsql"@@ -14,7 +13,6 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base""github.com/bytebase/bytebase/backend/plugin/parser/plsql")@@ -30,9 +28,10 @@ type StatementDmlDryRunAdvisor struct {}func (*StatementDmlDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_table_comment_convention.go b/backend/plugin/advisor/oracle/rule_table_comment_convention.goindex f461412918..8ba43e0055 100644--- a/backend/plugin/advisor/oracle/rule_table_comment_convention.go+++ b/backend/plugin/advisor/oracle/rule_table_comment_convention.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base"plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql")@@ -30,9 +28,10 @@ type TableCommentConventionAdvisor struct {}func (*TableCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_table_no_foreign_key.go b/backend/plugin/advisor/oracle/rule_table_no_foreign_key.goindex 353b4bae6f..ab52ed68a1 100644--- a/backend/plugin/advisor/oracle/rule_table_no_foreign_key.go+++ b/backend/plugin/advisor/oracle/rule_table_no_foreign_key.go@@ -9,12 +9,10 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -31,9 +29,10 @@ type TableNoForeignKeyAdvisor struct {// Check checks for table disallow foreign key.func (*TableNoForeignKeyAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_table_require_pk.go b/backend/plugin/advisor/oracle/rule_table_require_pk.goindex c16b4baecf..ae8d573235 100644--- a/backend/plugin/advisor/oracle/rule_table_require_pk.go+++ b/backend/plugin/advisor/oracle/rule_table_require_pk.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -30,9 +28,10 @@ type TableRequirePKAdvisor struct {// Check checks table requires PK.func (*TableRequirePKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_where_no_leading_wildcard_like.go b/backend/plugin/advisor/oracle/rule_where_no_leading_wildcard_like.goindex 087d1bd9e8..45a87effbf 100644--- a/backend/plugin/advisor/oracle/rule_where_no_leading_wildcard_like.go+++ b/backend/plugin/advisor/oracle/rule_where_no_leading_wildcard_like.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -30,9 +28,10 @@ type WhereNoLeadingWildcardLikeAdvisor struct {// Check checks for no leading wildcard LIKE.func (*WhereNoLeadingWildcardLikeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_where_require_for_select.go b/backend/plugin/advisor/oracle/rule_where_require_for_select.goindex 9040607ddd..34365a88ff 100644--- a/backend/plugin/advisor/oracle/rule_where_require_for_select.go+++ b/backend/plugin/advisor/oracle/rule_where_require_for_select.go@@ -7,13 +7,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -30,9 +28,10 @@ type WhereRequireForSelectAdvisor struct {// Check checks for WHERE clause requirement.func (*WhereRequireForSelectAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/rule_where_require_for_update_delete.go b/backend/plugin/advisor/oracle/rule_where_require_for_update_delete.goindex cf9b640b9d..bf1e651e06 100644--- a/backend/plugin/advisor/oracle/rule_where_require_for_update_delete.go+++ b/backend/plugin/advisor/oracle/rule_where_require_for_update_delete.go@@ -6,13 +6,11 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/plsql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor""github.com/bytebase/bytebase/backend/plugin/advisor/code"- "github.com/bytebase/bytebase/backend/plugin/parser/base")var (@@ -29,9 +27,10 @@ type WhereRequireForUpdateDeleteAdvisor struct {// Check checks for WHERE clause requirement.func (*WhereRequireForUpdateDeleteAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert to ParseResult")+ stmtList, err := getANTLRTree(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/oracle/utils.go b/backend/plugin/advisor/oracle/utils.gonew file mode 100644index 0000000000..2fd0173df4--- /dev/null+++ b/backend/plugin/advisor/oracle/utils.go@@ -0,0 +1,28 @@+package oracle++import (+ "github.com/pkg/errors"++ "github.com/bytebase/bytebase/backend/plugin/advisor"+ "github.com/bytebase/bytebase/backend/plugin/parser/base"+)++// getANTLRTree extracts PL/SQL ANTLR parse trees from the advisor context.+func getANTLRTree(checkCtx advisor.Context) ([]*base.ParseResult, error) {+ if checkCtx.AST == nil {+ return nil, errors.New("AST is not provided in context")+ }+ var parseResults []*base.ParseResult+ for _, unifiedAST := range checkCtx.AST {+ antlrAST, ok := base.GetANTLRAST(unifiedAST)+ if !ok {+ return nil, errors.New("AST type mismatch: expected ANTLR-based parser result")+ }+ parseResults = append(parseResults, &base.ParseResult{+ Tree: antlrAST.Tree,+ Tokens: antlrAST.Tokens,+ BaseLine: base.GetLineOffset(antlrAST.StartPosition),+ })+ }+ return parseResults, nil+}diff --git a/backend/plugin/advisor/pg/test_helper.go b/backend/plugin/advisor/pg/test_helper.goindex cf64c8b97f..c85dd7da94 100644--- a/backend/plugin/advisor/pg/test_helper.go+++ b/backend/plugin/advisor/pg/test_helper.go@@ -15,7 +15,10 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"- "github.com/bytebase/bytebase/backend/plugin/parser/pg"+ "github.com/bytebase/bytebase/backend/plugin/parser/base"++ // Import pg parser to register PostgreSQL parser via init()+ _ "github.com/bytebase/bytebase/backend/plugin/parser/pg""github.com/bytebase/bytebase/backend/plugin/schema""github.com/bytebase/bytebase/backend/store/model")@@ -80,12 +83,21 @@ func RunANTLRAdvisorRuleTest(t *testing.T, rule advisor.SQLReviewRuleType, dbTyppayload = ""}- // Parse SQL using ANTLR for pg advisors- trees, err := pg.ParsePostgreSQL(tc.Statement)+ // Parse SQL using base.Parse() to get AST+ unifiedASTs, err := base.Parse(dbType, tc.Statement)require.NoError(t, err, "Failed to parse SQL: %s", tc.Statement)- // Always walk through the catalog to build metadata.- advice := schema.WalkThrough(dbType, finalMetadata, trees)+ // Skip test cases with only comments or no SQL statements (parser returns nil/empty)+ if len(unifiedASTs) == 0 {+ // For empty/comment-only statements, the advisor should return no advice+ if len(tc.Want) > 0 {+ t.Fatalf("Test case expects advice but statement has no SQL: %s", tc.Statement)+ }+ continue+ }++ // Walk through the catalog to build metadata using AST directly+ advice := schema.WalkThrough(dbType, finalMetadata, unifiedASTs)require.Nil(t, advice, "Failed to walk through final catalog: %s", tc.Statement)ruleList := []*storepb.SQLReviewRule{@@ -105,7 +117,7 @@ func RunANTLRAdvisorRuleTest(t *testing.T, rule advisor.SQLReviewRuleType, dbTypDBSchema: schemaMetadata,ChangeType: tc.ChangeType,EnablePriorBackup: true,- AST: trees, // Pass ANTLR parse result list+ AST: unifiedASTs, // Pass AST listStatements: tc.Statement,Rule: ruleList[0],OriginalMetadata: originalMetadata,diff --git a/backend/plugin/advisor/pg/utils.go b/backend/plugin/advisor/pg/utils.goindex ab656de763..8cabff5166 100644--- a/backend/plugin/advisor/pg/utils.go+++ b/backend/plugin/advisor/pg/utils.go@@ -40,9 +40,19 @@ func getANTLRTree(checkCtx advisor.Context) ([]*base.ParseResult, error) {return nil, errors.New("AST is not provided in context - must be parsed before calling advisor")}- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("AST type mismatch: expected []*base.ParseResult, got %T", checkCtx.AST)+ var parseResults []*base.ParseResult+ for _, unifiedAST := range checkCtx.AST {+ antlrAST, ok := base.GetANTLRAST(unifiedAST)+ if !ok {+ return nil, errors.New("AST type mismatch: expected ANTLR-based parser result")+ }++ // Reconstruct base.ParseResult from AST+ parseResults = append(parseResults, &base.ParseResult{+ Tree: antlrAST.Tree,+ Tokens: antlrAST.Tokens,+ BaseLine: base.GetLineOffset(antlrAST.StartPosition),+ })}return parseResults, nildiff --git a/backend/plugin/advisor/redshift/advisor_table_drop_naming_convention.go b/backend/plugin/advisor/redshift/advisor_table_drop_naming_convention.goindex 69c61e7d01..b1407f2fdb 100644--- a/backend/plugin/advisor/redshift/advisor_table_drop_naming_convention.go+++ b/backend/plugin/advisor/redshift/advisor_table_drop_naming_convention.go@@ -9,7 +9,6 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/redshift"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -30,9 +29,9 @@ type TableDropNamingConventionAdvisor struct {// Check checks for table drop with naming convention.func (*TableDropNamingConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- tree, ok := checkCtx.AST.(antlr.Tree)- if !ok {- return nil, errors.Errorf("failed to convert to ANTLR Tree")+ tree, err := getANTLRTree(checkCtx)+ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/redshift/utils.go b/backend/plugin/advisor/redshift/utils.gonew file mode 100644index 0000000000..df20910ed6--- /dev/null+++ b/backend/plugin/advisor/redshift/utils.go@@ -0,0 +1,27 @@+package redshift++import (+ "github.com/antlr4-go/antlr/v4"+ "github.com/pkg/errors"++ "github.com/bytebase/bytebase/backend/plugin/advisor"+ "github.com/bytebase/bytebase/backend/plugin/parser/base"+)++// getANTLRTree extracts a single ANTLR tree from the advisor context.+// Redshift advisors use a single parse tree instead of a list of ParseResults.+func getANTLRTree(checkCtx advisor.Context) (antlr.Tree, error) {+ if checkCtx.AST == nil {+ return nil, errors.New("AST is not provided in context")+ }+ if len(checkCtx.AST) == 0 {+ return nil, errors.New("AST is empty")+ }+ // Redshift typically processes a single statement+ unifiedAST := checkCtx.AST[0]+ antlrAST, ok := base.GetANTLRAST(unifiedAST)+ if !ok {+ return nil, errors.New("AST type mismatch: expected ANTLR-based parser result")+ }+ return antlrAST.Tree, nil+}diff --git a/backend/plugin/advisor/snowflake/utils.go b/backend/plugin/advisor/snowflake/utils.goindex 01443eebe6..6292bc285f 100644--- a/backend/plugin/advisor/snowflake/utils.go+++ b/backend/plugin/advisor/snowflake/utils.go@@ -8,18 +8,21 @@ import ()// getANTLRTree extracts the ANTLR parse trees from the advisor context.-// The AST must be pre-parsed and passed via checkCtx.AST (e.g., in tests or by the framework).-// This enforces proper AST caching and makes any missing cache obvious.-// Returns all parse results for multi-statement SQL review.func getANTLRTree(checkCtx advisor.Context) ([]*base.ParseResult, error) {if checkCtx.AST == nil {- return nil, errors.New("AST is not provided in context - must be parsed before calling advisor")+ return nil, errors.New("AST is not provided in context")}-- parseResults, ok := checkCtx.AST.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("AST type mismatch: expected []*base.ParseResult, got %T", checkCtx.AST)+ var parseResults []*base.ParseResult+ for _, unifiedAST := range checkCtx.AST {+ antlrAST, ok := base.GetANTLRAST(unifiedAST)+ if !ok {+ return nil, errors.New("AST type mismatch: expected ANTLR-based parser result")+ }+ parseResults = append(parseResults, &base.ParseResult{+ Tree: antlrAST.Tree,+ Tokens: antlrAST.Tokens,+ BaseLine: base.GetLineOffset(antlrAST.StartPosition),+ })}-return parseResults, nil}diff --git a/backend/plugin/advisor/tidb/advisor_builtin_prior_backup_check.go b/backend/plugin/advisor/tidb/advisor_builtin_prior_backup_check.goindex 08e120986d..a9889eecb0 100644--- a/backend/plugin/advisor/tidb/advisor_builtin_prior_backup_check.go+++ b/backend/plugin/advisor/tidb/advisor_builtin_prior_backup_check.go@@ -40,9 +40,10 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx adv}var adviceList []*storepb.Advice- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_charset_allowlist.go b/backend/plugin/advisor/tidb/advisor_charset_allowlist.goindex 15ca8825fa..fa4e5cc1cb 100644--- a/backend/plugin/advisor/tidb/advisor_charset_allowlist.go+++ b/backend/plugin/advisor/tidb/advisor_charset_allowlist.go@@ -8,7 +8,6 @@ import ("strings""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type CharsetAllowlistAdvisor struct {// Check checks for charset allowlist.func (*CharsetAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)if err != nil {diff --git a/backend/plugin/advisor/tidb/advisor_collation_allowlist.go b/backend/plugin/advisor/tidb/advisor_collation_allowlist.goindex 7c0bd3e357..c1f0091eb8 100644--- a/backend/plugin/advisor/tidb/advisor_collation_allowlist.go+++ b/backend/plugin/advisor/tidb/advisor_collation_allowlist.go@@ -8,7 +8,6 @@ import ("strings""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type CollationAllowlistAdvisor struct {// Check checks for collation allowlist.func (*CollationAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_auto_increment_initial_value.go b/backend/plugin/advisor/tidb/advisor_column_auto_increment_initial_value.goindex a328981420..59e149fdfd 100644--- a/backend/plugin/advisor/tidb/advisor_column_auto_increment_initial_value.go+++ b/backend/plugin/advisor/tidb/advisor_column_auto_increment_initial_value.go@@ -9,7 +9,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type ColumnAutoIncrementInitialValueAdvisor struct {// Check checks for auto-increment column initial value.func (*ColumnAutoIncrementInitialValueAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_auto_increment_must_integer.go b/backend/plugin/advisor/tidb/advisor_column_auto_increment_must_integer.goindex 995785cfdf..d6e1dff0bf 100644--- a/backend/plugin/advisor/tidb/advisor_column_auto_increment_must_integer.go+++ b/backend/plugin/advisor/tidb/advisor_column_auto_increment_must_integer.go@@ -11,7 +11,6 @@ import ("github.com/pingcap/tidb/pkg/parser/ast""github.com/pingcap/tidb/pkg/parser/mysql""github.com/pingcap/tidb/pkg/parser/types"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -33,9 +32,10 @@ type ColumnAutoIncrementMustIntegerAdvisor struct {// Check checks for auto-increment column type.func (*ColumnAutoIncrementMustIntegerAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_auto_increment_must_unsigned.go b/backend/plugin/advisor/tidb/advisor_column_auto_increment_must_unsigned.goindex b986cecdfe..f47ffc6180 100644--- a/backend/plugin/advisor/tidb/advisor_column_auto_increment_must_unsigned.go+++ b/backend/plugin/advisor/tidb/advisor_column_auto_increment_must_unsigned.go@@ -10,7 +10,6 @@ import ("github.com/pingcap/tidb/pkg/parser/ast""github.com/pingcap/tidb/pkg/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -32,9 +31,10 @@ type ColumnAutoIncrementMustUnsignedAdvisor struct {// Check checks for unsigned auto-increment column.func (*ColumnAutoIncrementMustUnsignedAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_comment_convention.go b/backend/plugin/advisor/tidb/advisor_column_comment_convention.goindex 8b99617d2d..34ad5a44de 100644--- a/backend/plugin/advisor/tidb/advisor_column_comment_convention.go+++ b/backend/plugin/advisor/tidb/advisor_column_comment_convention.go@@ -8,7 +8,6 @@ import ("github.com/pingcap/tidb/pkg/parser/ast""github.com/pingcap/tidb/pkg/parser/format"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type ColumnCommentConventionAdvisor struct {// Check checks for column comment convention.func (*ColumnCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_current_time_count_limit.go b/backend/plugin/advisor/tidb/advisor_column_current_time_count_limit.goindex 488649cdc0..0a883750e4 100644--- a/backend/plugin/advisor/tidb/advisor_column_current_time_count_limit.go+++ b/backend/plugin/advisor/tidb/advisor_column_current_time_count_limit.go@@ -12,7 +12,6 @@ import ("github.com/pingcap/tidb/pkg/parser/ast""github.com/pingcap/tidb/pkg/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -39,9 +38,10 @@ type ColumnCurrentTimeCountLimitAdvisor struct {// Check checks for current time column count limit.func (*ColumnCurrentTimeCountLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_disallow_changing.go b/backend/plugin/advisor/tidb/advisor_column_disallow_changing.goindex 6a1f519f82..8f783c55ed 100644--- a/backend/plugin/advisor/tidb/advisor_column_disallow_changing.go+++ b/backend/plugin/advisor/tidb/advisor_column_disallow_changing.go@@ -9,7 +9,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type ColumnDisallowChangingAdvisor struct {// Check checks for disallow CHANGE COLUMN statement.func (*ColumnDisallowChangingAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_disallow_changing_order.go b/backend/plugin/advisor/tidb/advisor_column_disallow_changing_order.goindex 52fdae909c..70e848712f 100644--- a/backend/plugin/advisor/tidb/advisor_column_disallow_changing_order.go+++ b/backend/plugin/advisor/tidb/advisor_column_disallow_changing_order.go@@ -9,7 +9,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type ColumnDisallowChangingOrderAdvisor struct {// Check checks for disallow changing column order.func (*ColumnDisallowChangingOrderAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_disallow_changing_type.go b/backend/plugin/advisor/tidb/advisor_column_disallow_changing_type.goindex d25891f028..42d29fd4b2 100644--- a/backend/plugin/advisor/tidb/advisor_column_disallow_changing_type.go+++ b/backend/plugin/advisor/tidb/advisor_column_disallow_changing_type.go@@ -10,7 +10,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -33,9 +32,10 @@ type ColumnDisallowChangingTypeAdvisor struct {// Check checks for disallow changing column type..func (*ColumnDisallowChangingTypeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_disallow_drop_in_index.go b/backend/plugin/advisor/tidb/advisor_column_disallow_drop_in_index.goindex f5af8fc335..452213364a 100644--- a/backend/plugin/advisor/tidb/advisor_column_disallow_drop_in_index.go+++ b/backend/plugin/advisor/tidb/advisor_column_disallow_drop_in_index.go@@ -9,7 +9,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -32,9 +31,10 @@ type ColumnDisallowDropInIndexAdvisor struct {// Check checks for disallow Drop COLUMN in index statement.func (*ColumnDisallowDropInIndexAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_disallow_set_charset.go b/backend/plugin/advisor/tidb/advisor_column_disallow_set_charset.goindex c93563f537..dd894778f0 100644--- a/backend/plugin/advisor/tidb/advisor_column_disallow_set_charset.go+++ b/backend/plugin/advisor/tidb/advisor_column_disallow_set_charset.go@@ -9,7 +9,6 @@ import (advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type ColumnDisallowSetCharsetAdvisor struct {// Check checks for disallow set column charset.func (*ColumnDisallowSetCharsetAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_maximum_character_length.go b/backend/plugin/advisor/tidb/advisor_column_maximum_character_length.goindex f44e3e9a40..db89c8a79e 100644--- a/backend/plugin/advisor/tidb/advisor_column_maximum_character_length.go+++ b/backend/plugin/advisor/tidb/advisor_column_maximum_character_length.go@@ -10,7 +10,6 @@ import ("github.com/pingcap/tidb/pkg/parser/ast""github.com/pingcap/tidb/pkg/parser/mysql"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -32,9 +31,10 @@ type ColumnMaximumCharacterLengthAdvisor struct {// Check checks for maximum character length.func (*ColumnMaximumCharacterLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_no_null.go b/backend/plugin/advisor/tidb/advisor_column_no_null.goindex 7317465793..d1a7dffc20 100644--- a/backend/plugin/advisor/tidb/advisor_column_no_null.go+++ b/backend/plugin/advisor/tidb/advisor_column_no_null.go@@ -6,7 +6,6 @@ import ("slices""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -30,9 +29,10 @@ type ColumnNoNullAdvisor struct {// Check checks for column no NULL value.func (*ColumnNoNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_require_default.go b/backend/plugin/advisor/tidb/advisor_column_require_default.goindex b46093e017..2ae8d93e49 100644--- a/backend/plugin/advisor/tidb/advisor_column_require_default.go+++ b/backend/plugin/advisor/tidb/advisor_column_require_default.go@@ -9,7 +9,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type ColumRequireDefaultAdvisor struct {// Check checks for column default requirement.func (*ColumRequireDefaultAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_required.go b/backend/plugin/advisor/tidb/advisor_column_required.goindex 2b9f090baa..bcf678bc54 100644--- a/backend/plugin/advisor/tidb/advisor_column_required.go+++ b/backend/plugin/advisor/tidb/advisor_column_required.go@@ -9,7 +9,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type ColumnRequirementAdvisor struct {// Check checks for the column requirement.func (*ColumnRequirementAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_set_default_for_not_null.go b/backend/plugin/advisor/tidb/advisor_column_set_default_for_not_null.goindex afeb98c85d..52840eeefb 100644--- a/backend/plugin/advisor/tidb/advisor_column_set_default_for_not_null.go+++ b/backend/plugin/advisor/tidb/advisor_column_set_default_for_not_null.go@@ -9,7 +9,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type ColumnSetDefaultForNotNullAdvisor struct {// Check checks for set default value for not null column.func (*ColumnSetDefaultForNotNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_column_type_disallow_list.go b/backend/plugin/advisor/tidb/advisor_column_type_disallow_list.goindex c31dceb8e6..350a9a4da1 100644--- a/backend/plugin/advisor/tidb/advisor_column_type_disallow_list.go+++ b/backend/plugin/advisor/tidb/advisor_column_type_disallow_list.go@@ -10,7 +10,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -32,9 +31,10 @@ type ColumnTypeDisallowListAdvisor struct {// Check checks for column type restriction.func (*ColumnTypeDisallowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_database_drop_empty_db.go b/backend/plugin/advisor/tidb/advisor_database_drop_empty_db.goindex c404b18cd3..34b4a82e46 100644--- a/backend/plugin/advisor/tidb/advisor_database_drop_empty_db.go+++ b/backend/plugin/advisor/tidb/advisor_database_drop_empty_db.go@@ -7,7 +7,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -30,9 +29,10 @@ type DatabaseAllowDropIfEmptyAdvisor struct {// Check checks for drop table naming convention.func (*DatabaseAllowDropIfEmptyAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_index_key_number_limit.go b/backend/plugin/advisor/tidb/advisor_index_key_number_limit.goindex a952e9aa9a..dba1a8cbae 100644--- a/backend/plugin/advisor/tidb/advisor_index_key_number_limit.go+++ b/backend/plugin/advisor/tidb/advisor_index_key_number_limit.go@@ -9,7 +9,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type IndexKeyNumberLimitAdvisor struct {// Check checks for index key number limit.func (*IndexKeyNumberLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_index_no_duplicate_column.go b/backend/plugin/advisor/tidb/advisor_index_no_duplicate_column.goindex edf536e696..349ac2c36b 100644--- a/backend/plugin/advisor/tidb/advisor_index_no_duplicate_column.go+++ b/backend/plugin/advisor/tidb/advisor_index_no_duplicate_column.go@@ -9,7 +9,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type IndexNoDuplicateColumnAdvisor struct {// Check checks for no duplicate columns in index.func (*IndexNoDuplicateColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_index_pk_type.go b/backend/plugin/advisor/tidb/advisor_index_pk_type.goindex 58e2256037..9d7c27456a 100644--- a/backend/plugin/advisor/tidb/advisor_index_pk_type.go+++ b/backend/plugin/advisor/tidb/advisor_index_pk_type.go@@ -34,9 +34,10 @@ type IndexPkTypeAdvisor struct {// Check checks for correct type of PK.func (*IndexPkTypeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_index_primary_key_type_allowlist.go b/backend/plugin/advisor/tidb/advisor_index_primary_key_type_allowlist.goindex b1238f0fee..3a6566ce4a 100644--- a/backend/plugin/advisor/tidb/advisor_index_primary_key_type_allowlist.go+++ b/backend/plugin/advisor/tidb/advisor_index_primary_key_type_allowlist.go@@ -34,9 +34,10 @@ type IndexPrimaryKeyTypeAllowlistAdvisor struct {// Check checks for primary key type allowlist.func (*IndexPrimaryKeyTypeAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_index_total_number_limit.go b/backend/plugin/advisor/tidb/advisor_index_total_number_limit.goindex 6d6214bc48..025101f58f 100644--- a/backend/plugin/advisor/tidb/advisor_index_total_number_limit.go+++ b/backend/plugin/advisor/tidb/advisor_index_total_number_limit.go@@ -10,7 +10,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -33,9 +32,10 @@ type IndexTotalNumberLimitAdvisor struct {// Check checks for index total number limit.func (*IndexTotalNumberLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_index_type_no_blob.go b/backend/plugin/advisor/tidb/advisor_index_type_no_blob.goindex a0a68235ef..bb695a2de7 100644--- a/backend/plugin/advisor/tidb/advisor_index_type_no_blob.go+++ b/backend/plugin/advisor/tidb/advisor_index_type_no_blob.go@@ -35,9 +35,10 @@ type IndexTypeNoBlobAdvisor struct {// Check checks for index type no blob.func (*IndexTypeNoBlobAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_insert_disallow_order_by_rand.go b/backend/plugin/advisor/tidb/advisor_insert_disallow_order_by_rand.goindex d6ca8291a5..344330d82c 100644--- a/backend/plugin/advisor/tidb/advisor_insert_disallow_order_by_rand.go+++ b/backend/plugin/advisor/tidb/advisor_insert_disallow_order_by_rand.go@@ -7,7 +7,6 @@ import ("fmt""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -30,9 +29,10 @@ type InsertDisallowOrderByRandAdvisor struct {// Check checks for to disallow order by rand in INSERT statements.func (*InsertDisallowOrderByRandAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_insert_must_specify_column.go b/backend/plugin/advisor/tidb/advisor_insert_must_specify_column.goindex 0406781f72..bbd3b30cec 100644--- a/backend/plugin/advisor/tidb/advisor_insert_must_specify_column.go+++ b/backend/plugin/advisor/tidb/advisor_insert_must_specify_column.go@@ -7,7 +7,6 @@ import ("fmt""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -30,9 +29,10 @@ type InsertMustSpecifyColumnAdvisor struct {// Check checks for to enforce column specified.func (*InsertMustSpecifyColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_migration_compatibility.go b/backend/plugin/advisor/tidb/advisor_migration_compatibility.goindex 8585f0a2d0..db80f96366 100644--- a/backend/plugin/advisor/tidb/advisor_migration_compatibility.go+++ b/backend/plugin/advisor/tidb/advisor_migration_compatibility.go@@ -4,8 +4,6 @@ import ("context""fmt"- "github.com/pkg/errors"-"github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"@@ -29,9 +27,10 @@ type CompatibilityAdvisor struct {// Check checks schema backward compatibility.func (*CompatibilityAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_naming_auto_increment_column.go b/backend/plugin/advisor/tidb/advisor_naming_auto_increment_column.goindex 8ba217c082..56db09a6e4 100644--- a/backend/plugin/advisor/tidb/advisor_naming_auto_increment_column.go+++ b/backend/plugin/advisor/tidb/advisor_naming_auto_increment_column.go@@ -8,7 +8,6 @@ import ("regexp""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type NamingAutoIncrementColumnAdvisor struct {// Check checks for auto-increment naming convention.func (*NamingAutoIncrementColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_naming_column.go b/backend/plugin/advisor/tidb/advisor_naming_column.goindex 5404da72aa..4d07be7c1b 100644--- a/backend/plugin/advisor/tidb/advisor_naming_column.go+++ b/backend/plugin/advisor/tidb/advisor_naming_column.go@@ -6,7 +6,6 @@ import ("regexp""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -29,9 +28,10 @@ type NamingColumnConventionAdvisor struct {// Check checks for column naming convention.func (*NamingColumnConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_naming_foreign_key_convention.go b/backend/plugin/advisor/tidb/advisor_naming_foreign_key_convention.goindex 67260bce00..9b7dab7a56 100644--- a/backend/plugin/advisor/tidb/advisor_naming_foreign_key_convention.go+++ b/backend/plugin/advisor/tidb/advisor_naming_foreign_key_convention.go@@ -6,7 +6,6 @@ import ("strings""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -29,9 +28,10 @@ type NamingFKConventionAdvisor struct {// Check checks for foreign key naming convention.func (*NamingFKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_naming_index_convention.go b/backend/plugin/advisor/tidb/advisor_naming_index_convention.goindex 77e0e27c41..6238c7bc6f 100644--- a/backend/plugin/advisor/tidb/advisor_naming_index_convention.go+++ b/backend/plugin/advisor/tidb/advisor_naming_index_convention.go@@ -7,7 +7,6 @@ import ("strings""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type NamingIndexConventionAdvisor struct {// Check checks for index naming convention.func (*NamingIndexConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_naming_table.go b/backend/plugin/advisor/tidb/advisor_naming_table.goindex 9fa59fc191..9075fd3bca 100644--- a/backend/plugin/advisor/tidb/advisor_naming_table.go+++ b/backend/plugin/advisor/tidb/advisor_naming_table.go@@ -6,7 +6,6 @@ import ("regexp""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -29,9 +28,10 @@ type NamingTableConventionAdvisor struct {// Check checks for table naming convention.func (*NamingTableConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_naming_unique_key_convention.go b/backend/plugin/advisor/tidb/advisor_naming_unique_key_convention.goindex 1218e5949b..4258186112 100644--- a/backend/plugin/advisor/tidb/advisor_naming_unique_key_convention.go+++ b/backend/plugin/advisor/tidb/advisor_naming_unique_key_convention.go@@ -6,7 +6,6 @@ import ("strings""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -30,9 +29,10 @@ type NamingUKConventionAdvisor struct {// Check checks for index naming convention.func (*NamingUKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_ddl.go b/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_ddl.goindex 1446fa0ce1..5752d4d5f1 100644--- a/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_ddl.go+++ b/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_ddl.go@@ -5,7 +5,6 @@ import ("fmt""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -32,9 +31,10 @@ func (*StatementDisallowMixInDDLAdvisor) Check(_ context.Context, checkCtx advisdefault:return nil, nil}- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_dml.go b/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_dml.goindex 9dd8288d9e..34dc8c7b23 100644--- a/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_dml.go+++ b/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_dml.go@@ -5,7 +5,6 @@ import ("fmt""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -32,9 +31,10 @@ func (*StatementDisallowMixInDMLAdvisor) Check(_ context.Context, checkCtx advisdefault:return nil, nil}- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_statement_dml_dry_run.go b/backend/plugin/advisor/tidb/advisor_statement_dml_dry_run.goindex 55f33f71df..4e06839786 100644--- a/backend/plugin/advisor/tidb/advisor_statement_dml_dry_run.go+++ b/backend/plugin/advisor/tidb/advisor_statement_dml_dry_run.go@@ -8,7 +8,6 @@ import ("fmt""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type StatementDmlDryRunAdvisor struct {// Check checks for DML dry run.func (*StatementDmlDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_statement_maximum_limit_value.go b/backend/plugin/advisor/tidb/advisor_statement_maximum_limit_value.goindex afd9b0cbd8..bcf9c33b29 100644--- a/backend/plugin/advisor/tidb/advisor_statement_maximum_limit_value.go+++ b/backend/plugin/advisor/tidb/advisor_statement_maximum_limit_value.go@@ -8,7 +8,6 @@ import ("github.com/pingcap/tidb/pkg/parser/ast"driver "github.com/pingcap/tidb/pkg/types/parser_driver"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type StatementMaximumLimitValueAdvisor struct {// Check checks for LIMIT maximum value in SELECT statements.func (*StatementMaximumLimitValueAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_statement_merge_alter_table.go b/backend/plugin/advisor/tidb/advisor_statement_merge_alter_table.goindex d9961a2a9a..bccc1c9c95 100644--- a/backend/plugin/advisor/tidb/advisor_statement_merge_alter_table.go+++ b/backend/plugin/advisor/tidb/advisor_statement_merge_alter_table.go@@ -8,7 +8,6 @@ import ("slices""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type StatementMergeAlterTableAdvisor struct {// Check checks for merging ALTER TABLE statements.func (*StatementMergeAlterTableAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_stmt_disallow_commit.go b/backend/plugin/advisor/tidb/advisor_stmt_disallow_commit.goindex 50f680723e..b86edd3237 100644--- a/backend/plugin/advisor/tidb/advisor_stmt_disallow_commit.go+++ b/backend/plugin/advisor/tidb/advisor_stmt_disallow_commit.go@@ -7,7 +7,6 @@ import ("fmt""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -30,9 +29,10 @@ type StatementDisallowCommitAdvisor struct {// Check checks for index type no blob.func (*StatementDisallowCommitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_stmt_disallow_limit.go b/backend/plugin/advisor/tidb/advisor_stmt_disallow_limit.goindex 5cfefe6cf1..735f468317 100644--- a/backend/plugin/advisor/tidb/advisor_stmt_disallow_limit.go+++ b/backend/plugin/advisor/tidb/advisor_stmt_disallow_limit.go@@ -7,7 +7,6 @@ import ("fmt""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -30,9 +29,10 @@ type StatementDisallowLimitAdvisor struct {// Check checks for no LIMIT clause in INSERT/UPDATE statement.func (*StatementDisallowLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_stmt_disallow_order_by.go b/backend/plugin/advisor/tidb/advisor_stmt_disallow_order_by.goindex 139b6b51b5..4d3114c831 100644--- a/backend/plugin/advisor/tidb/advisor_stmt_disallow_order_by.go+++ b/backend/plugin/advisor/tidb/advisor_stmt_disallow_order_by.go@@ -7,7 +7,6 @@ import ("fmt""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -30,9 +29,10 @@ type DisallowOrderByAdvisor struct {// Check checks for no ORDER BY clause in DELETE/UPDATE statements.func (*DisallowOrderByAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_stmt_no_leading_wildcard_like.go b/backend/plugin/advisor/tidb/advisor_stmt_no_leading_wildcard_like.goindex 5004c6c181..d544293ec4 100644--- a/backend/plugin/advisor/tidb/advisor_stmt_no_leading_wildcard_like.go+++ b/backend/plugin/advisor/tidb/advisor_stmt_no_leading_wildcard_like.go@@ -6,7 +6,6 @@ import ("github.com/pingcap/tidb/pkg/parser/ast""github.com/pingcap/tidb/pkg/parser/format"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -33,9 +32,10 @@ type NoLeadingWildcardLikeAdvisor struct {// Check checks for no leading wildcard LIKE.func (*NoLeadingWildcardLikeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_stmt_no_select_all.go b/backend/plugin/advisor/tidb/advisor_stmt_no_select_all.goindex 7cc606022e..2c071221f7 100644--- a/backend/plugin/advisor/tidb/advisor_stmt_no_select_all.go+++ b/backend/plugin/advisor/tidb/advisor_stmt_no_select_all.go@@ -5,7 +5,6 @@ import ("fmt""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -28,9 +27,10 @@ type NoSelectAllAdvisor struct {// Check checks for no "select *".func (*NoSelectAllAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_stmt_where_required_for_select.go b/backend/plugin/advisor/tidb/advisor_stmt_where_required_for_select.goindex 6207a634c9..1b5d809d8b 100644--- a/backend/plugin/advisor/tidb/advisor_stmt_where_required_for_select.go+++ b/backend/plugin/advisor/tidb/advisor_stmt_where_required_for_select.go@@ -4,8 +4,6 @@ import ("context""fmt"- "github.com/pkg/errors"-"github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"@@ -29,9 +27,10 @@ type WhereRequirementForSelectAdvisor struct {// Check checks for the WHERE clause requirement.func (*WhereRequirementForSelectAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_stmt_where_required_for_update_delete.go b/backend/plugin/advisor/tidb/advisor_stmt_where_required_for_update_delete.goindex a79bd3098d..d6f3441e04 100644--- a/backend/plugin/advisor/tidb/advisor_stmt_where_required_for_update_delete.go+++ b/backend/plugin/advisor/tidb/advisor_stmt_where_required_for_update_delete.go@@ -4,8 +4,6 @@ import ("context""fmt"- "github.com/pkg/errors"-"github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor"@@ -29,9 +27,10 @@ type WhereRequirementForUpdateDeleteAdvisor struct {// Check checks for the WHERE clause requirement.func (*WhereRequirementForUpdateDeleteAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_table_comment_convention.go b/backend/plugin/advisor/tidb/advisor_table_comment_convention.goindex a36642b32a..5e477de409 100644--- a/backend/plugin/advisor/tidb/advisor_table_comment_convention.go+++ b/backend/plugin/advisor/tidb/advisor_table_comment_convention.go@@ -7,7 +7,6 @@ import ("fmt""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -30,9 +29,10 @@ type TableCommentConventionAdvisor struct {// Check checks for table comment convention.func (*TableCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_table_disallow_partition.go b/backend/plugin/advisor/tidb/advisor_table_disallow_partition.goindex 5a48c3736f..2abb002ca2 100644--- a/backend/plugin/advisor/tidb/advisor_table_disallow_partition.go+++ b/backend/plugin/advisor/tidb/advisor_table_disallow_partition.go@@ -9,7 +9,6 @@ import (advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -31,9 +30,10 @@ type TableDisallowPartitionAdvisor struct {// Check checks for disallow table partition.func (*TableDisallowPartitionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- stmtList, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ stmtList, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_table_drop_naming_convention.go b/backend/plugin/advisor/tidb/advisor_table_drop_naming_convention.goindex 797a5bde61..5c78e3619a 100644--- a/backend/plugin/advisor/tidb/advisor_table_drop_naming_convention.go+++ b/backend/plugin/advisor/tidb/advisor_table_drop_naming_convention.go@@ -8,7 +8,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -30,9 +29,10 @@ type TableDropNamingConventionAdvisor struct {// Check checks for drop table naming convention.func (*TableDropNamingConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/advisor_table_no_fk.go b/backend/plugin/advisor/tidb/advisor_table_no_fk.goindex 0c6f699f66..9c041f3679 100644--- a/backend/plugin/advisor/tidb/advisor_table_no_fk.go+++ b/backend/plugin/advisor/tidb/advisor_table_no_fk.go@@ -7,7 +7,6 @@ import ("github.com/bytebase/bytebase/backend/plugin/advisor/code""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -29,9 +28,10 @@ type TableNoFKAdvisor struct {// Check checks table disallow foreign key.func (*TableNoFKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)if err != nil {diff --git a/backend/plugin/advisor/tidb/advisor_table_require_pk.go b/backend/plugin/advisor/tidb/advisor_table_require_pk.goindex 9a62d23f1a..05ea79a309 100644--- a/backend/plugin/advisor/tidb/advisor_table_require_pk.go+++ b/backend/plugin/advisor/tidb/advisor_table_require_pk.go@@ -6,7 +6,6 @@ import ("strings""github.com/pingcap/tidb/pkg/parser/ast"- "github.com/pkg/errors""github.com/bytebase/bytebase/backend/common"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -34,9 +33,10 @@ type TableRequirePKAdvisor struct {// Check checks table requires PK.func (*TableRequirePKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {- root, ok := checkCtx.AST.([]ast.StmtNode)- if !ok {- return nil, errors.Errorf("failed to convert to StmtNode")+ root, err := getTiDBNodes(checkCtx)++ if err != nil {+ return nil, err}level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)diff --git a/backend/plugin/advisor/tidb/utils.go b/backend/plugin/advisor/tidb/utils.goindex 678bea4473..175dd089a9 100644--- a/backend/plugin/advisor/tidb/utils.go+++ b/backend/plugin/advisor/tidb/utils.go@@ -9,6 +9,10 @@ import ("github.com/pingcap/tidb/pkg/parser/format""github.com/pingcap/tidb/pkg/parser/mysql""github.com/pingcap/tidb/pkg/parser/types"+ "github.com/pkg/errors"++ "github.com/bytebase/bytebase/backend/plugin/advisor"+ tidbparser "github.com/bytebase/bytebase/backend/plugin/parser/tidb")type columnSet map[string]bool@@ -75,3 +79,19 @@ func needDefault(column *ast.ColumnDef) bool {}return true}++// getTiDBNodes extracts TiDB AST nodes from the advisor context.+func getTiDBNodes(checkCtx advisor.Context) ([]ast.StmtNode, error) {+ if checkCtx.AST == nil {+ return nil, errors.New("AST is not provided in context")+ }+ var stmtNodes []ast.StmtNode+ for _, unifiedAST := range checkCtx.AST {+ tidbAST, ok := tidbparser.GetTiDBAST(unifiedAST)+ if !ok {+ return nil, errors.New("AST type mismatch: expected TiDB parser result")+ }+ stmtNodes = append(stmtNodes, tidbAST.Node)+ }+ return stmtNodes, nil+}diff --git a/backend/plugin/parser/base/ast.go b/backend/plugin/parser/base/ast.gonew file mode 100644index 0000000000..bee0f60e18--- /dev/null+++ b/backend/plugin/parser/base/ast.go@@ -0,0 +1,44 @@+package base++import (+ "github.com/antlr4-go/antlr/v4"++ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+)++// AST is the interface that all parser AST types must implement.+// Each parser package defines its own concrete AST type with parser-specific fields.+type AST interface {+ // ASTStartPosition returns the 1-based position where this SQL statement starts+ // in the original multi-statement input. Used for error position reporting.+ // Returns nil if position is unknown.+ // Named to avoid collision with protobuf-generated GetStartPosition methods.+ ASTStartPosition() *storepb.Position+}++// ANTLRAST is the AST implementation for ANTLR-based parsers.+// Supported engines: PostgreSQL, MySQL, MariaDB, OceanBase, MSSQL, Oracle, Redshift,+// Snowflake, BigQuery, Spanner, Doris, Cassandra, Trino, PartiQL, CosmosDB.+//+// Parser packages can use this directly or embed it to add engine-specific fields.+type ANTLRAST struct {+ // StartPosition is the 1-based position where this statement starts.+ StartPosition *storepb.Position+ Tree antlr.Tree+ Tokens *antlr.CommonTokenStream+}++// ASTStartPosition implements AST interface.+func (a *ANTLRAST) ASTStartPosition() *storepb.Position {+ return a.StartPosition+}++// GetANTLRAST extracts the ANTLRAST from an AST interface.+// Returns the ANTLRAST and true if it is an ANTLR-based AST, nil and false otherwise.+func GetANTLRAST(a AST) (*ANTLRAST, bool) {+ if a == nil {+ return nil, false+ }+ antlrAST, ok := a.(*ANTLRAST)+ return antlrAST, ok+}diff --git a/backend/plugin/parser/base/base.go b/backend/plugin/parser/base/base.goindex f345f7dba9..c4bc281a41 100644--- a/backend/plugin/parser/base/base.go+++ b/backend/plugin/parser/base/base.go@@ -46,9 +46,11 @@ func (e *SyntaxError) Error() string {// ParseErrorListener is a custom error listener for PLSQL parser.type ParseErrorListener struct {- BaseLine int- Err *SyntaxError- Statement string+ // StartPosition is the 1-based position where this statement starts in the original multi-statement input.+ // Used to calculate error positions relative to the original script.+ StartPosition *storepb.Position+ Err *SyntaxError+ Statement string}// SyntaxError returns the errors.@@ -57,6 +59,12 @@ func (l *ParseErrorListener) SyntaxError(_ antlr.Recognizer, token any, line, coreturn}+ // Get 0-based line offset from StartPosition (1-based) for calculations+ lineOffset := int32(0)+ if l.StartPosition != nil {+ lineOffset = l.StartPosition.Line - 1+ }+errMessage := ""if token, ok := token.(*antlr.CommonToken); ok {stream := token.GetInputStream()@@ -73,7 +81,7 @@ func (l *ParseErrorListener) SyntaxError(_ antlr.Recognizer, token any, line, coif l.Statement == "" {// ANTLR provides 1-based line and 0-based column// Store as 1-based line and 1-based column in Position- posLine := int32(line + l.BaseLine)+ posLine := int32(line) + lineOffsetposColumn := int32(column + 1)l.Err = &SyntaxError{Position: &storepb.Position{@@ -91,7 +99,7 @@ func (l *ParseErrorListener) SyntaxError(_ antlr.Recognizer, token any, line, coLine: int32(line),Column: int32(column),}, l.Statement)- p.Line += int32(l.BaseLine)+ p.Line += lineOffsetl.Err = &SyntaxError{Position: &storepb.Position{Line: p.Line,@@ -158,6 +166,16 @@ type ParseResult struct {// When splitting a multi-statement SQL script (e.g., "SELECT 1;\nSELECT 2;"), each statement is parsed separately.// BaseLine tracks the original line number (minus 1) of the first token in this statement, allowing error messages// and positions to be correctly reported relative to the original script rather than the isolated statement.- // Calculated as: token.GetLine() - 1 (since ANTLR uses 1-based line numbers, but BaseLine is 0-based for offset arithmetic).+ // Calculated from StartPosition.Line - 1 (since StartPosition uses 1-based line numbers, but BaseLine is 0-based for offset arithmetic).BaseLine int}++// GetLineOffset returns the 0-based line offset from a StartPosition.+// This is useful for converting from the 1-based StartPosition to the 0-based offset+// needed for some calculations.+func GetLineOffset(startPosition *storepb.Position) int {+ if startPosition == nil {+ return 0+ }+ return int(startPosition.Line) - 1+}diff --git a/backend/plugin/parser/base/interface.go b/backend/plugin/parser/base/interface.goindex 843d11f584..fd2a7cf277 100644--- a/backend/plugin/parser/base/interface.go+++ b/backend/plugin/parser/base/interface.go@@ -32,7 +32,7 @@ var ()type ValidateSQLForEditorFunc func(string) (bool, bool, error)-type ExtractChangedResourcesFunc func(string, string, *model.DatabaseMetadata, any, string) (*ChangeSummary, error)+type ExtractChangedResourcesFunc func(string, string, *model.DatabaseMetadata, []AST, string) (*ChangeSummary, error)type SplitMultiSQLFunc func(string) ([]SingleSQL, error)type CompletionFunc func(ctx context.Context, cCtx CompletionContext, statement string, caretLine int, caretOffset int) ([]Candidate, error)type DiagnoseFunc func(ctx context.Context, dCtx DiagnoseContext, statement string) ([]Diagnostic, error)@@ -46,10 +46,10 @@ type TransformDMLToSelectFunc func(ctx context.Context, tCtx TransformContext, stype GenerateRestoreSQLFunc func(ctx context.Context, rCtx RestoreContext, statement string, backupItem *storepb.PriorBackupDetail_Item) (string, error)-// ParseFunc is the interface for parsing SQL statements and returning an AST.-// The return type varies by database engine. See RegisterParser() in each parser package for details.-// Common types: []ast.Node, antlr.Tree, []*ParseResult, statements.Statements.-type ParseFunc func(statement string) (any, error)+// ParseFunc is the interface for parsing SQL statements and returning []AST.+// Each parser package is responsible for creating AST instances with the appropriate data.+// Parser packages can return *ANTLRAST for ANTLR-based parsers or their own concrete types.+type ParseFunc func(statement string) ([]AST, error)func RegisterQueryValidator(engine storepb.Engine, f ValidateSQLForEditorFunc) {mux.Lock()@@ -84,12 +84,12 @@ func RegisterExtractChangedResourcesFunc(engine storepb.Engine, f ExtractChanged}// ExtractChangedResources extracts the changed resources from the SQL.-func ExtractChangedResources(engine storepb.Engine, currentDatabase string, currentSchema string, dbMetadata *model.DatabaseMetadata, ast any, statement string) (*ChangeSummary, error) {+func ExtractChangedResources(engine storepb.Engine, currentDatabase string, currentSchema string, dbMetadata *model.DatabaseMetadata, asts []AST, statement string) (*ChangeSummary, error) {f, ok := changedResourcesGetters[engine]if !ok {return nil, errors.Errorf("engine %s is not supported", engine)}- return f(currentDatabase, currentSchema, dbMetadata, ast, statement)+ return f(currentDatabase, currentSchema, dbMetadata, asts, statement)}func RegisterSplitterFunc(engine storepb.Engine, f SplitMultiSQLFunc) {@@ -263,19 +263,9 @@ func RegisterParseFunc(engine storepb.Engine, f ParseFunc) {parsers[engine] = f}-// Parse parses the SQL statement and returns the AST.-// The return type (any) varies by database engine:-// - TiDB: []ast.StmtNode (github.com/pingcap/tidb/pkg/parser/ast)-// - MySQL, MariaDB, OceanBase: []*base.ParseResult (github.com/bytebase/bytebase/backend/plugin/parser/base)-// - PostgreSQL: []*base.ParseResult (github.com/bytebase/bytebase/backend/plugin/parser/base) - ANTLR-based-// - CockroachDB: statements.Statements (github.com/cockroachdb/cockroachdb-parser/pkg/sql/parser/statements)-// - Redshift: antlr.Tree-// - Oracle: antlr.Tree-// - Snowflake: []*base.ParseResult (github.com/bytebase/bytebase/backend/plugin/parser/base) - ANTLR-based-// - MSSQL: antlr.Tree-// - DynamoDB (PartiQL): antlr.Tree-// - Doris: *base.ParseResult (github.com/bytebase/bytebase/backend/plugin/parser/base)-func Parse(engine storepb.Engine, statement string) (any, error) {+// Parse parses the SQL statement and returns an AST representation.+// Each parser is responsible for creating []AST instances directly.+func Parse(engine storepb.Engine, statement string) ([]AST, error) {f, ok := parsers[engine]if !ok {return nil, errors.Errorf("engine %s is not supported", engine)diff --git a/backend/plugin/parser/bigquery/bigquery.go b/backend/plugin/parser/bigquery/bigquery.goindex cabca49fd6..3f9973c9a6 100644--- a/backend/plugin/parser/bigquery/bigquery.go+++ b/backend/plugin/parser/bigquery/bigquery.go@@ -7,6 +7,7 @@ import (parser "github.com/bytebase/parser/googlesql"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/parser/base""github.com/bytebase/bytebase/backend/utils")@@ -42,17 +43,18 @@ func parseSingleBigQuerySQL(statement string, baseLine int) (*base.ParseResult,p := parser.NewGoogleSQLParser(stream)// Remove default error listener and add our own error listener.+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexer.RemoveErrorListeners()lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}lexer.AddErrorListener(lexerErrorListener)p.RemoveErrorListeners()parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/cassandra/cassandra.go b/backend/plugin/parser/cassandra/cassandra.goindex 65d7b85216..612c0358a3 100644--- a/backend/plugin/parser/cassandra/cassandra.go+++ b/backend/plugin/parser/cassandra/cassandra.go@@ -16,13 +16,26 @@ func init() {}// parseCassandraForRegistry is the ParseFunc for Cassandra.-// Returns []*base.ParseResult on success.-func parseCassandraForRegistry(statement string) (any, error) {- result, err := ParseCassandraSQL(statement)+// Returns []base.AST with *ANTLRAST instances.+func parseCassandraForRegistry(statement string) ([]base.AST, error) {+ parseResults, err := ParseCassandraSQL(statement)if err != nil {return nil, err}- return result, nil+ return toAST(parseResults), nil+}++// toAST converts []*ParseResult to []base.AST.+func toAST(results []*base.ParseResult) []base.AST {+ var asts []base.AST+ for _, r := range results {+ asts = append(asts, &base.ANTLRAST{+ StartPosition: &storepb.Position{Line: int32(r.BaseLine) + 1},+ Tree: r.Tree,+ Tokens: r.Tokens,+ })+ }+ return asts}// ParseCassandraSQL parses the given CQL statement by using antlr4. Returns a list of AST and token stream if no error.@@ -56,17 +69,18 @@ func parseSingleCassandraSQL(statement string, baseLine int) (*base.ParseResult,p := cql.NewCqlParser(stream)// Remove default error listener and add our own error listener.+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexer.RemoveErrorListeners()lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}lexer.AddErrorListener(lexerErrorListener)p.RemoveErrorListeners()parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/cockroachdb/ast.go b/backend/plugin/parser/cockroachdb/ast.gonew file mode 100644index 0000000000..d64e17e4d1--- /dev/null+++ b/backend/plugin/parser/cockroachdb/ast.go@@ -0,0 +1,32 @@+package cockroachdb++import (+ "github.com/cockroachdb/cockroachdb-parser/pkg/sql/parser/statements"+ "github.com/cockroachdb/cockroachdb-parser/pkg/sql/sem/tree"++ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/plugin/parser/base"+)++// AST is the AST implementation for CockroachDB parser.+// It implements the base.AST interface.+type AST struct {+ // StartPosition is the 1-based position where this statement starts.+ StartPosition *storepb.Position+ Stmt statements.Statement[tree.Statement]+}++// ASTStartPosition implements base.AST interface.+func (a *AST) ASTStartPosition() *storepb.Position {+ return a.StartPosition+}++// GetCockroachDBAST extracts the CockroachDB AST from a base.AST.+// Returns the AST and true if it is a CockroachDB AST, nil and false otherwise.+func GetCockroachDBAST(a base.AST) (*AST, bool) {+ if a == nil {+ return nil, false+ }+ crAST, ok := a.(*AST)+ return crAST, ok+}diff --git a/backend/plugin/parser/cockroachdb/cockroachdb.go b/backend/plugin/parser/cockroachdb/cockroachdb.goindex 257efbd486..1c8984fbda 100644--- a/backend/plugin/parser/cockroachdb/cockroachdb.go+++ b/backend/plugin/parser/cockroachdb/cockroachdb.go@@ -16,8 +16,8 @@ func init() {}// parseCockroachDBForRegistry is the ParseFunc for CockroachDB.-// Returns statements.Statements (github.com/cockroachdb/cockroachdb-parser/pkg/sql/parser/statements) on success.-func parseCockroachDBForRegistry(statement string) (any, error) {+// Returns []base.AST with *CockroachDBAST instances.+func parseCockroachDBForRegistry(statement string) ([]base.AST, error) {result, err := ParseCockroachDBSQL(statement)if err != nil {return nil, err@@ -25,7 +25,14 @@ func parseCockroachDBForRegistry(statement string) (any, error) {if result == nil {return nil, nil}- return result.Stmts, nil+ var asts []base.AST+ for _, stmt := range result.Stmts {+ asts = append(asts, &AST{+ StartPosition: &storepb.Position{Line: 1},+ Stmt: stmt,+ })+ }+ return asts, nil}type ParseResult struct {diff --git a/backend/plugin/parser/cosmosdb/cosmosdb.go b/backend/plugin/parser/cosmosdb/cosmosdb.goindex 38d472a1f9..9c1001cdca 100644--- a/backend/plugin/parser/cosmosdb/cosmosdb.go+++ b/backend/plugin/parser/cosmosdb/cosmosdb.go@@ -6,6 +6,7 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/cosmosdb"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/parser/base""github.com/bytebase/bytebase/backend/utils")@@ -42,17 +43,18 @@ func parseSingleCosmosDBQuery(statement string, baseLine int) (*base.ParseResultp := parser.NewCosmosDBParser(stream)// Remove default error listener and add our own error listener.+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexer.RemoveErrorListeners()lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}lexer.AddErrorListener(lexerErrorListener)p.RemoveErrorListeners()parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/doris/doris.go b/backend/plugin/parser/doris/doris.goindex 63e332b707..8d0051326c 100644--- a/backend/plugin/parser/doris/doris.go+++ b/backend/plugin/parser/doris/doris.go@@ -13,13 +13,26 @@ func init() {}// parseDorisForRegistry is the ParseFunc for Doris.-// Returns []*base.ParseResult on success.-func parseDorisForRegistry(statement string) (any, error) {- result, err := ParseDorisSQL(statement)+// Returns []base.AST with *ANTLRAST instances.+func parseDorisForRegistry(statement string) ([]base.AST, error) {+ parseResults, err := ParseDorisSQL(statement)if err != nil {return nil, err}- return result, nil+ return toAST(parseResults), nil+}++// toAST converts []*ParseResult to []base.AST.+func toAST(results []*base.ParseResult) []base.AST {+ var asts []base.AST+ for _, r := range results {+ asts = append(asts, &base.ANTLRAST{+ StartPosition: &storepb.Position{Line: int32(r.BaseLine) + 1},+ Tree: r.Tree,+ Tokens: r.Tokens,+ })+ }+ return asts}// ParseDorisSQL parses the given SQL statement by using antlr4. Returns a list of AST and token stream if no error.@@ -49,16 +62,17 @@ func parseSingleDorisSQL(statement string, baseLine int) (*base.ParseResult, errlexer := parser.NewDorisSQLLexer(antlr.NewInputStream(statement))stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)p := parser.NewDorisSQLParser(stream)+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}lexer.RemoveErrorListeners()lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/mysql/diagnose.go b/backend/plugin/parser/mysql/diagnose.goindex 7d6ad81bc4..66e682e809 100644--- a/backend/plugin/parser/mysql/diagnose.go+++ b/backend/plugin/parser/mysql/diagnose.go@@ -8,15 +8,15 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/mysql"- "github.com/bytebase/bytebase/backend/generated-go/store"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/parser/base")func init() {- base.RegisterDiagnoseFunc(store.Engine_MYSQL, Diagnose)- base.RegisterDiagnoseFunc(store.Engine_MARIADB, Diagnose)- base.RegisterDiagnoseFunc(store.Engine_OCEANBASE, Diagnose)- base.RegisterDiagnoseFunc(store.Engine_CLICKHOUSE, Diagnose)+ base.RegisterDiagnoseFunc(storepb.Engine_MYSQL, Diagnose)+ base.RegisterDiagnoseFunc(storepb.Engine_MARIADB, Diagnose)+ base.RegisterDiagnoseFunc(storepb.Engine_OCEANBASE, Diagnose)+ base.RegisterDiagnoseFunc(storepb.Engine_CLICKHOUSE, Diagnose)}func Diagnose(_ context.Context, _ base.DiagnoseContext, statement string) ([]base.Diagnostic, error) {@@ -41,16 +41,17 @@ func parseMySQLStatement(statement string) *base.SyntaxError {stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)p := parser.NewMySQLParser(stream)+ startPosition := &storepb.Position{Line: 1}lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: 0,+ Statement: statement,+ StartPosition: startPosition,}lexer.RemoveErrorListeners()lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: 0,+ Statement: statement,+ StartPosition: startPosition,}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/mysql/mysql.go b/backend/plugin/parser/mysql/mysql.goindex 7e9be3ae3b..b76df1fb55 100644--- a/backend/plugin/parser/mysql/mysql.go+++ b/backend/plugin/parser/mysql/mysql.go@@ -23,9 +23,26 @@ func init() {}// parseMySQLForRegistry is the ParseFunc for MySQL, MariaDB, and OceanBase.-// Returns []*ParseResult on success.-func parseMySQLForRegistry(statement string) (any, error) {- return ParseMySQL(statement)+// Returns []base.AST with *ANTLRAST instances.+func parseMySQLForRegistry(statement string) ([]base.AST, error) {+ parseResults, err := ParseMySQL(statement)+ if err != nil {+ return nil, err+ }+ return toAST(parseResults), nil+}++// toAST converts []*ParseResult to []base.AST.+func toAST(results []*base.ParseResult) []base.AST {+ var asts []base.AST+ for _, r := range results {+ asts = append(asts, &base.ANTLRAST{+ StartPosition: &storepb.Position{Line: int32(r.BaseLine) + 1},+ Tree: r.Tree,+ Tokens: r.Tokens,+ })+ }+ return asts}// ParseMySQL parses the given SQL statement and returns the AST.@@ -157,14 +174,15 @@ func parseSingleStatement(baseLine int, statement string) (antlr.Tree, *antlr.Cop := parser.NewMySQLParser(stream)+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexerErrorListener := &base.ParseErrorListener{- BaseLine: baseLine,+ StartPosition: startPosition,}lexer.RemoveErrorListeners()lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- BaseLine: baseLine,+ StartPosition: startPosition,}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/mysql/resource_change.go b/backend/plugin/parser/mysql/resource_change.goindex 60b5aec476..10934ccf7d 100644--- a/backend/plugin/parser/mysql/resource_change.go+++ b/backend/plugin/parser/mysql/resource_change.go@@ -19,20 +19,20 @@ func init() {base.RegisterExtractChangedResourcesFunc(storepb.Engine_DORIS, extractChangedResources)}-func extractChangedResources(currentDatabase string, _ string, dbMetadata *model.DatabaseMetadata, asts any, statement string) (*base.ChangeSummary, error) {- nodes, ok := asts.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("invalid ast type %T, expected []*base.ParseResult", asts)- }+func extractChangedResources(currentDatabase string, _ string, dbMetadata *model.DatabaseMetadata, asts []base.AST, statement string) (*base.ChangeSummary, error) {changedResources := model.NewChangedResources(dbMetadata)l := &resourceChangedListener{currentDatabase: currentDatabase,statement: statement,changedResources: changedResources,}- for _, node := range nodes {+ for _, ast := range asts {+ antlrAST, ok := base.GetANTLRAST(ast)+ if !ok {+ return nil, errors.New("expected ANTLR AST for MySQL")+ }l.reset()- antlr.ParseTreeWalkerDefault.Walk(l, node.Tree)+ antlr.ParseTreeWalkerDefault.Walk(l, antlrAST.Tree)}return &base.ChangeSummary{diff --git a/backend/plugin/parser/mysql/resource_change_test.go b/backend/plugin/parser/mysql/resource_change_test.goindex 13f04e2d51..d0da060296 100644--- a/backend/plugin/parser/mysql/resource_change_test.go+++ b/backend/plugin/parser/mysql/resource_change_test.go@@ -60,7 +60,8 @@ func TestExtractChangedResources(t *testing.T) {InsertCount: 2,}- asts, _ := ParseMySQL(statement)+ asts, err := base.Parse(storepb.Engine_MYSQL, statement)+ require.NoError(t, err)got, err := extractChangedResources("db", "", nil /* dbMetadata */, asts, statement)require.NoError(t, err)require.Equal(t, want, got)diff --git a/backend/plugin/parser/mysql/statement_type.go b/backend/plugin/parser/mysql/statement_type.goindex 9c45acf761..62057443dc 100644--- a/backend/plugin/parser/mysql/statement_type.go+++ b/backend/plugin/parser/mysql/statement_type.go@@ -7,14 +7,14 @@ import ("github.com/bytebase/bytebase/backend/plugin/parser/base")-func GetStatementTypes(asts any) ([]string, error) {- nodes, ok := asts.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("invalid ast type %T, expected []*base.ParseResult", asts)- }+func GetStatementTypes(asts []base.AST) ([]string, error) {sqlTypeSet := make(map[string]bool)- for _, node := range nodes {- t := getStatementType(node)+ for _, ast := range asts {+ antlrAST, ok := base.GetANTLRAST(ast)+ if !ok {+ return nil, errors.New("expected ANTLR AST for MySQL")+ }+ t := getStatementType(antlrAST)sqlTypeSet[t] = true}var sqlTypes []string@@ -25,7 +25,7 @@ func GetStatementTypes(asts any) ([]string, error) {}// GetStatementType return the type of statement.-func getStatementType(stmt *base.ParseResult) string {+func getStatementType(stmt *base.ANTLRAST) string {for _, child := range stmt.Tree.GetChildren() {switch ctx := child.(type) {case *mysql.QueryContext:diff --git a/backend/plugin/parser/mysql/statement_type_test.go b/backend/plugin/parser/mysql/statement_type_test.goindex 13bf907dc9..188ecf38d0 100644--- a/backend/plugin/parser/mysql/statement_type_test.go+++ b/backend/plugin/parser/mysql/statement_type_test.go@@ -7,6 +7,9 @@ import ("github.com/stretchr/testify/require""gopkg.in/yaml.v3"++ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/plugin/parser/base")type statementTypeTest struct {@@ -35,7 +38,7 @@ func TestGetStatementType(t *testing.T) {a.NoError(yaml.Unmarshal(byteValue, &tests))for i, test := range tests {- asts, err := ParseMySQL(test.Statement)+ asts, err := base.Parse(storepb.Engine_MYSQL, test.Statement)a.NoError(err)sqlType, err := GetStatementTypes(asts)diff --git a/backend/plugin/parser/partiql/partiql.go b/backend/plugin/parser/partiql/partiql.goindex d2ee5f3cce..bbdbafc833 100644--- a/backend/plugin/parser/partiql/partiql.go+++ b/backend/plugin/parser/partiql/partiql.go@@ -17,13 +17,26 @@ func init() {}// parsePartiQLForRegistry is the ParseFunc for PartiQL.-// Returns []*base.ParseResult on success.-func parsePartiQLForRegistry(statement string) (any, error) {- result, err := ParsePartiQL(statement)+// Returns []base.AST with *ANTLRAST instances.+func parsePartiQLForRegistry(statement string) ([]base.AST, error) {+ parseResults, err := ParsePartiQL(statement)if err != nil {return nil, err}- return result, nil+ return toAST(parseResults), nil+}++// toAST converts []*ParseResult to []base.AST.+func toAST(results []*base.ParseResult) []base.AST {+ var asts []base.AST+ for _, r := range results {+ asts = append(asts, &base.ANTLRAST{+ StartPosition: &storepb.Position{Line: int32(r.BaseLine) + 1},+ Tree: r.Tree,+ Tokens: r.Tokens,+ })+ }+ return asts}// ParsePartiQL parses the given PartiQL statement by using antlr4. Returns a list of AST and token stream if no error.@@ -57,17 +70,18 @@ func parseSinglePartiQL(statement string, baseLine int) (*base.ParseResult, errop := parser.NewPartiQLParserParser(stream)// Remove default error listener and add our own error listener.+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexer.RemoveErrorListeners()lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}lexer.AddErrorListener(lexerErrorListener)p.RemoveErrorListeners()parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/pg/diagnose.go b/backend/plugin/parser/pg/diagnose.goindex 23007f3977..34a9acea92 100644--- a/backend/plugin/parser/pg/diagnose.go+++ b/backend/plugin/parser/pg/diagnose.go@@ -8,13 +8,13 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/postgresql"- "github.com/bytebase/bytebase/backend/generated-go/store"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/parser/base")func init() {- base.RegisterDiagnoseFunc(store.Engine_POSTGRES, Diagnose)- base.RegisterDiagnoseFunc(store.Engine_COCKROACHDB, Diagnose)+ base.RegisterDiagnoseFunc(storepb.Engine_POSTGRES, Diagnose)+ base.RegisterDiagnoseFunc(storepb.Engine_COCKROACHDB, Diagnose)}func Diagnose(_ context.Context, _ base.DiagnoseContext, statement string) ([]base.Diagnostic, error) {@@ -39,15 +39,17 @@ func parsePostgreSQLStatement(statement string) *base.SyntaxError {lexer := parser.NewPostgreSQLLexer(antlr.NewInputStream(statement))stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)p := parser.NewPostgreSQLParser(stream)+ startPosition := &storepb.Position{Line: 1}lexerErrorListener := &base.ParseErrorListener{- Statement: statement,+ Statement: statement,+ StartPosition: startPosition,}lexer.RemoveErrorListeners()lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: 0,+ Statement: statement,+ StartPosition: startPosition,}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/pg/pg.go b/backend/plugin/parser/pg/pg.goindex e9f9288472..21cd5904e7 100644--- a/backend/plugin/parser/pg/pg.go+++ b/backend/plugin/parser/pg/pg.go@@ -15,9 +15,26 @@ func init() {}// parsePostgreSQLForRegistry is the ParseFunc for PostgreSQL.-// Returns *ParseResult containing the ANTLR tree.-func parsePostgreSQLForRegistry(statement string) (any, error) {- return ParsePostgreSQL(statement)+// Returns []base.AST with *ANTLRAST instances.+func parsePostgreSQLForRegistry(statement string) ([]base.AST, error) {+ parseResults, err := ParsePostgreSQL(statement)+ if err != nil {+ return nil, err+ }+ return toAST(parseResults), nil+}++// toAST converts []*ParseResult to []base.AST.+func toAST(results []*base.ParseResult) []base.AST {+ var asts []base.AST+ for _, r := range results {+ asts = append(asts, &base.ANTLRAST{+ StartPosition: &storepb.Position{Line: int32(r.BaseLine) + 1},+ Tree: r.Tree,+ Tokens: r.Tokens,+ })+ }+ return asts}// ParsePostgreSQL parses the given SQL and returns a list of ParseResult (one per statement).@@ -49,16 +66,17 @@ func parseSinglePostgreSQL(sql string, baseLine int) (*base.ParseResult, error)lexer := parser.NewPostgreSQLLexer(antlr.NewInputStream(sql))stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)p := parser.NewPostgreSQLParser(stream)+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexerErrorListener := &base.ParseErrorListener{- Statement: sql,- BaseLine: baseLine,+ Statement: sql,+ StartPosition: startPosition,}lexer.RemoveErrorListeners()lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- Statement: sql,- BaseLine: baseLine,+ Statement: sql,+ StartPosition: startPosition,}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)@@ -90,13 +108,15 @@ func ParsePostgreSQLPLBlock(plBlock string) (*base.ParseResult, error) {stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)p := parser.NewPostgreSQLParser(stream)lexerErrorListener := &base.ParseErrorListener{- Statement: plBlock,+ Statement: plBlock,+ StartPosition: &storepb.Position{Line: 1},}lexer.RemoveErrorListeners()lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- Statement: plBlock,+ Statement: plBlock,+ StartPosition: &storepb.Position{Line: 1},}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/pg/resource_change.go b/backend/plugin/parser/pg/resource_change.goindex 7dff78c83d..d21e309d1f 100644--- a/backend/plugin/parser/pg/resource_change.go+++ b/backend/plugin/parser/pg/resource_change.go@@ -19,12 +19,7 @@ func init() {base.RegisterExtractChangedResourcesFunc(storepb.Engine_COCKROACHDB, extractChangedResources)}-func extractChangedResources(database string, _ string, dbMetadata *model.DatabaseMetadata, asts any, statement string) (*base.ChangeSummary, error) {- parseResults, ok := asts.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("invalid ast type %T, expected []*base.ParseResult", asts)- }-+func extractChangedResources(database string, _ string, dbMetadata *model.DatabaseMetadata, asts []base.AST, statement string) (*base.ChangeSummary, error) {changedResources := model.NewChangedResources(dbMetadata)searchPath := dbMetadata.GetSearchPath()if len(searchPath) == 0 {@@ -32,7 +27,7 @@ func extractChangedResources(database string, _ string, dbMetadata *model.Databa}// If no parse results, return empty summary- if len(parseResults) == 0 {+ if len(asts) == 0 {return &base.ChangeSummary{ChangedResources: changedResources,DMLCount: 0,@@ -53,13 +48,17 @@ func extractChangedResources(database string, _ string, dbMetadata *model.Databa}// Walk all parse results to extract changed resources- for _, parseResult := range parseResults {- if parseResult == nil || parseResult.Tree == nil {- return nil, errors.New("parse result or tree is nil")+ for _, ast := range asts {+ antlrAST, ok := base.GetANTLRAST(ast)+ if !ok {+ return nil, errors.New("expected ANTLR AST for PostgreSQL")+ }+ if antlrAST.Tree == nil {+ return nil, errors.New("ANTLR tree is nil")}- listener.tokenStream = parseResult.Tokens- antlr.ParseTreeWalkerDefault.Walk(listener, parseResult.Tree)+ listener.tokenStream = antlrAST.Tokens+ antlr.ParseTreeWalkerDefault.Walk(listener, antlrAST.Tree)}return &base.ChangeSummary{diff --git a/backend/plugin/parser/pg/resource_change_test.go b/backend/plugin/parser/pg/resource_change_test.goindex 70703bccef..55db92aa3b 100644--- a/backend/plugin/parser/pg/resource_change_test.go+++ b/backend/plugin/parser/pg/resource_change_test.go@@ -65,9 +65,9 @@ func TestExtractChangedResources(t *testing.T) {InsertCount: 2,}- parseResult, err := ParsePostgreSQL(statement)+ asts, err := base.Parse(storepb.Engine_POSTGRES, statement)require.NoError(t, err)- got, err := extractChangedResources("db", "public", dbMetadata, parseResult, statement)+ got, err := extractChangedResources("db", "public", dbMetadata, asts, statement)require.NoError(t, err)require.Equal(t, want, got)}diff --git a/backend/plugin/parser/pg/statement_type.go b/backend/plugin/parser/pg/statement_type.goindex 2d260c1061..c4c2641ab1 100644--- a/backend/plugin/parser/pg/statement_type.go+++ b/backend/plugin/parser/pg/statement_type.go@@ -17,28 +17,27 @@ type StatementTypeWithPosition struct {// GetStatementTypes returns statement types with position information.// The line numbers are one-based.-func GetStatementTypes(asts any) ([]StatementTypeWithPosition, error) {- parseResults, ok := asts.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("invalid ast type %T, expected []*base.ParseResult", asts)- }-- if len(parseResults) == 0 {+func GetStatementTypes(asts []base.AST) ([]StatementTypeWithPosition, error) {+ if len(asts) == 0 {return []StatementTypeWithPosition{}, nil}var allResults []StatementTypeWithPosition- for _, parseResult := range parseResults {- if parseResult == nil || parseResult.Tree == nil {- return nil, errors.New("invalid parse result")+ for _, unifiedAST := range asts {+ antlrAST, ok := base.GetANTLRAST(unifiedAST)+ if !ok {+ return nil, errors.New("expected ANTLR AST for PostgreSQL")+ }+ if antlrAST.Tree == nil {+ return nil, errors.New("ANTLR tree is nil")}collector := &statementTypeCollectorWithPosition{- tokens: parseResult.Tokens,- baseLine: parseResult.BaseLine,+ tokens: antlrAST.Tokens,+ baseLine: base.GetLineOffset(antlrAST.StartPosition),}- antlr.ParseTreeWalkerDefault.Walk(collector, parseResult.Tree)+ antlr.ParseTreeWalkerDefault.Walk(collector, antlrAST.Tree)allResults = append(allResults, collector.results...)}diff --git a/backend/plugin/parser/pg/statement_type_antlr_test.go b/backend/plugin/parser/pg/statement_type_antlr_test.goindex 51a854efd5..09a3bf921b 100644--- a/backend/plugin/parser/pg/statement_type_antlr_test.go+++ b/backend/plugin/parser/pg/statement_type_antlr_test.go@@ -4,6 +4,9 @@ import ("testing""github.com/stretchr/testify/require"++ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/plugin/parser/base")func TestGetStatementTypesANTLR(t *testing.T) {@@ -218,10 +221,10 @@ func TestGetStatementTypesANTLR(t *testing.T) {for _, tt := range tests {t.Run(tt.name, func(t *testing.T) {- parseResult, err := ParsePostgreSQL(tt.sql)+ asts, err := base.Parse(storepb.Engine_POSTGRES, tt.sql)require.NoError(t, err)- stmtsWithPos, err := GetStatementTypes(parseResult)+ stmtsWithPos, err := GetStatementTypes(asts)require.NoError(t, err)// Extract types from statements with positions@@ -275,10 +278,10 @@ INSERT INTO t1 VALUES (1);`,for _, tt := range tests {t.Run(tt.name, func(t *testing.T) {- parseResult, err := ParsePostgreSQL(tt.sql)+ asts, err := base.Parse(storepb.Engine_POSTGRES, tt.sql)require.NoError(t, err)- results, err := GetStatementTypes(parseResult)+ results, err := GetStatementTypes(asts)require.NoError(t, err)require.Len(t, results, len(tt.expected))diff --git a/backend/plugin/parser/plsql/plsql.go b/backend/plugin/parser/plsql/plsql.goindex ecf5d21483..630a664568 100644--- a/backend/plugin/parser/plsql/plsql.go+++ b/backend/plugin/parser/plsql/plsql.go@@ -19,9 +19,26 @@ func init() {}// parsePLSQLForRegistry is the ParseFunc for PL/SQL.-// Returns []*base.ParseResult on success.-func parsePLSQLForRegistry(statement string) (any, error) {- return ParsePLSQL(statement + ";")+// Returns []base.AST with *ANTLRAST instances.+func parsePLSQLForRegistry(statement string) ([]base.AST, error) {+ parseResults, err := ParsePLSQL(statement + ";")+ if err != nil {+ return nil, err+ }+ return toAST(parseResults), nil+}++// toAST converts []*ParseResult to []base.AST.+func toAST(results []*base.ParseResult) []base.AST {+ var asts []base.AST+ for _, r := range results {+ asts = append(asts, &base.ANTLRAST{+ StartPosition: &storepb.Position{Line: int32(r.BaseLine) + 1},+ Tree: r.Tree,+ Tokens: r.Tokens,+ })+ }+ return asts}type Version struct {@@ -121,16 +138,17 @@ func parsePLSQLInternal(sql string, baseLine int) (antlr.Tree, *antlr.CommonTokep := parser.NewPlSqlParser(stream)p.SetVersion12(true)+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexerErrorListener := &base.ParseErrorListener{- Statement: sql,- BaseLine: baseLine,+ Statement: sql,+ StartPosition: startPosition,}lexer.RemoveErrorListeners()lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- Statement: sql,- BaseLine: baseLine,+ Statement: sql,+ StartPosition: startPosition,}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/plsql/resource_change.go b/backend/plugin/parser/plsql/resource_change.goindex 2d1e92932a..99cd68a312 100644--- a/backend/plugin/parser/plsql/resource_change.go+++ b/backend/plugin/parser/plsql/resource_change.go@@ -15,13 +15,8 @@ func init() {base.RegisterExtractChangedResourcesFunc(storepb.Engine_ORACLE, extractChangedResources)}-func extractChangedResources(currentDatabase string, _ string, dbMetadata *model.DatabaseMetadata, asts any, statement string) (*base.ChangeSummary, error) {+func extractChangedResources(currentDatabase string, _ string, dbMetadata *model.DatabaseMetadata, asts []base.AST, statement string) (*base.ChangeSummary, error) {// currentDatabase is the same as currentSchema for Oracle.- results, ok := asts.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert ast to []*ParseResult, got %T", asts)- }-changedResources := model.NewChangedResources(dbMetadata)l := &plsqlChangedResourceExtractListener{currentSchema: currentDatabase,@@ -30,8 +25,12 @@ func extractChangedResources(currentDatabase string, _ string, dbMetadata *modelstatement: statement,}- for _, result := range results {- antlr.ParseTreeWalkerDefault.Walk(l, result.Tree)+ for _, ast := range asts {+ antlrAST, ok := base.GetANTLRAST(ast)+ if !ok {+ return nil, errors.New("expected ANTLR AST for Oracle")+ }+ antlr.ParseTreeWalkerDefault.Walk(l, antlrAST.Tree)}return &base.ChangeSummary{diff --git a/backend/plugin/parser/plsql/resource_change_test.go b/backend/plugin/parser/plsql/resource_change_test.goindex 56391898a4..1ae618110c 100644--- a/backend/plugin/parser/plsql/resource_change_test.go+++ b/backend/plugin/parser/plsql/resource_change_test.go@@ -43,12 +43,12 @@ func TestExtractChangedResources(t *testing.T) {InsertCount: 1,}- results, err := ParsePLSQL(statement)+ asts, err := base.Parse(storepb.Engine_ORACLE, statement)require.NoError(t, err)- require.NotEmpty(t, results)+ require.NotEmpty(t, asts)- // Pass the full results array to extractChangedResources- got, err := extractChangedResources("DB", "", nil /* dbMetadata */, results, statement)+ // Pass the full asts array to extractChangedResources+ got, err := extractChangedResources("DB", "", nil /* dbMetadata */, asts, statement)require.NoError(t, err)require.Equal(t, want, got)}diff --git a/backend/plugin/parser/plsql/statement_type.go b/backend/plugin/parser/plsql/statement_type.goindex a7a5cfae1c..bb3bd71ddb 100644--- a/backend/plugin/parser/plsql/statement_type.go+++ b/backend/plugin/parser/plsql/statement_type.go@@ -8,14 +8,14 @@ import ("github.com/bytebase/bytebase/backend/plugin/parser/base")-func GetStatementTypes(asts any) ([]string, error) {- nodes, ok := asts.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("invalid ast type %T", asts)- }+func GetStatementTypes(asts []base.AST) ([]string, error) {sqlTypeSet := make(map[string]bool)- for _, node := range nodes {- t := getStatementType(node.Tree)+ for _, ast := range asts {+ antlrAST, ok := base.GetANTLRAST(ast)+ if !ok {+ return nil, errors.New("expected ANTLR AST for Oracle")+ }+ t := getStatementType(antlrAST.Tree)sqlTypeSet[t] = true}var sqlTypes []stringdiff --git a/backend/plugin/parser/plsql/statement_type_test.go b/backend/plugin/parser/plsql/statement_type_test.goindex fb0c28dc9a..fe03642ac0 100644--- a/backend/plugin/parser/plsql/statement_type_test.go+++ b/backend/plugin/parser/plsql/statement_type_test.go@@ -7,6 +7,9 @@ import ("github.com/stretchr/testify/require""gopkg.in/yaml.v3"++ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/plugin/parser/base")type statementTypeTest struct {@@ -30,10 +33,10 @@ func TestGetStatementType(t *testing.T) {a.NoError(yaml.Unmarshal(byteValue, &tests))for _, test := range tests {- results, err := ParsePLSQL(test.Statement)+ asts, err := base.Parse(storepb.Engine_ORACLE, test.Statement)a.NoError(err)- a.NotEmpty(results)- sqlType, err := GetStatementTypes(results)+ a.NotEmpty(asts)+ sqlType, err := GetStatementTypes(asts)a.NoError(err)a.Equal(test.Want, sqlType)}diff --git a/backend/plugin/parser/redshift/redshift.go b/backend/plugin/parser/redshift/redshift.goindex 8bb915d967..51a676771e 100644--- a/backend/plugin/parser/redshift/redshift.go+++ b/backend/plugin/parser/redshift/redshift.go@@ -17,9 +17,26 @@ func init() {}// parseRedshiftForRegistry is the ParseFunc for Redshift.-// Returns []*base.ParseResult (list of AST nodes, one per statement) on success.-func parseRedshiftForRegistry(statement string) (any, error) {- return ParseRedshift(statement)+// Returns []base.AST with *ANTLRAST instances.+func parseRedshiftForRegistry(statement string) ([]base.AST, error) {+ parseResults, err := ParseRedshift(statement)+ if err != nil {+ return nil, err+ }+ return toAST(parseResults), nil+}++// toAST converts []*ParseResult to []base.AST.+func toAST(results []*base.ParseResult) []base.AST {+ var asts []base.AST+ for _, r := range results {+ asts = append(asts, &base.ANTLRAST{+ StartPosition: &storepb.Position{Line: int32(r.BaseLine) + 1},+ Tree: r.Tree,+ Tokens: r.Tokens,+ })+ }+ return asts}// ParseRedshift parses the given SQL statement and returns a list of ParseResults.@@ -55,14 +72,17 @@ func parseSingleRedshift(statement string, baseLine int) (*base.ParseResult, errp := parser.NewRedshiftParser(stream)// Remove default error listener and add our own error listener.+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexer.RemoveErrorListeners()lexerErrorListener := &base.ParseErrorListener{- Statement: statement,+ Statement: statement,+ StartPosition: startPosition,}lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- Statement: statement,+ Statement: statement,+ StartPosition: startPosition,}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/redshift/resource_change.go b/backend/plugin/parser/redshift/resource_change.goindex f7399c3530..ed44b9bc24 100644--- a/backend/plugin/parser/redshift/resource_change.go+++ b/backend/plugin/parser/redshift/resource_change.go@@ -17,12 +17,7 @@ func init() {base.RegisterExtractChangedResourcesFunc(storepb.Engine_REDSHIFT, extractChangedResources)}-func extractChangedResources(database string, _ string, dbMetadata *model.DatabaseMetadata, asts any, _ string) (*base.ChangeSummary, error) {- tree, ok := asts.(antlr.Tree)- if !ok {- return nil, errors.Errorf("invalid ast type %T, expected antlr.Tree", asts)- }-+func extractChangedResources(database string, _ string, dbMetadata *model.DatabaseMetadata, asts []base.AST, _ string) (*base.ChangeSummary, error) {changedResources := model.NewChangedResources(dbMetadata)listener := &resourceChangeListener{currentDatabase: database,@@ -31,7 +26,13 @@ func extractChangedResources(database string, _ string, dbMetadata *model.DatabasearchPath: []string{"public"}, // Default search path for Redshift}- antlr.ParseTreeWalkerDefault.Walk(listener, tree)+ for _, ast := range asts {+ antlrAST, ok := base.GetANTLRAST(ast)+ if !ok {+ return nil, errors.New("expected ANTLR AST for Redshift")+ }+ antlr.ParseTreeWalkerDefault.Walk(listener, antlrAST.Tree)+ }return &base.ChangeSummary{ChangedResources: changedResources,diff --git a/backend/plugin/parser/redshift/statement_type.go b/backend/plugin/parser/redshift/statement_type.goindex b23645baf6..463bfa747f 100644--- a/backend/plugin/parser/redshift/statement_type.go+++ b/backend/plugin/parser/redshift/statement_type.go@@ -6,20 +6,23 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/redshift""github.com/pkg/errors"++ "github.com/bytebase/bytebase/backend/plugin/parser/base")// GetStatementTypes returns the statement types from the given AST.-func GetStatementTypes(asts any) ([]string, error) {- tree, ok := asts.(antlr.Tree)- if !ok {- return nil, errors.Errorf("invalid ast type %T, expected antlr.Tree", asts)- }-+func GetStatementTypes(asts []base.AST) ([]string, error) {listener := &statementTypeListener{types: make(map[string]bool),}- antlr.ParseTreeWalkerDefault.Walk(listener, tree)+ for _, ast := range asts {+ antlrAST, ok := base.GetANTLRAST(ast)+ if !ok {+ return nil, errors.New("expected ANTLR AST for Redshift")+ }+ antlr.ParseTreeWalkerDefault.Walk(listener, antlrAST.Tree)+ }var sqlTypes []stringfor sqlType := range listener.types {diff --git a/backend/plugin/parser/snowflake/diagnose.go b/backend/plugin/parser/snowflake/diagnose.goindex 11ee002c17..cfbc1a38ff 100644--- a/backend/plugin/parser/snowflake/diagnose.go+++ b/backend/plugin/parser/snowflake/diagnose.go@@ -8,12 +8,12 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/snowflake"- "github.com/bytebase/bytebase/backend/generated-go/store"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/parser/base")func init() {- base.RegisterDiagnoseFunc(store.Engine_SNOWFLAKE, Diagnose)+ base.RegisterDiagnoseFunc(storepb.Engine_SNOWFLAKE, Diagnose)}func Diagnose(_ context.Context, _ base.DiagnoseContext, statement string) ([]base.Diagnostic, error) {@@ -38,16 +38,17 @@ func parseSnowflakeStatement(statement string) *base.SyntaxError {stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)p := parser.NewSnowflakeParser(stream)+ startPosition := &storepb.Position{Line: 1}lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: 0,+ Statement: statement,+ StartPosition: startPosition,}lexer.RemoveErrorListeners()lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: 0,+ Statement: statement,+ StartPosition: startPosition,}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/snowflake/snowflake.go b/backend/plugin/parser/snowflake/snowflake.goindex 767d607283..01e2911103 100644--- a/backend/plugin/parser/snowflake/snowflake.go+++ b/backend/plugin/parser/snowflake/snowflake.go@@ -17,9 +17,26 @@ func init() {}// parseSnowflakeForRegistry is the ParseFunc for Snowflake.-// Returns []*base.ParseResult on success.-func parseSnowflakeForRegistry(statement string) (any, error) {- return ParseSnowSQL(statement)+// Returns []base.AST with *ANTLRAST instances.+func parseSnowflakeForRegistry(statement string) ([]base.AST, error) {+ parseResults, err := ParseSnowSQL(statement)+ if err != nil {+ return nil, err+ }+ return toAST(parseResults), nil+}++// toAST converts []*ParseResult to []base.AST.+func toAST(results []*base.ParseResult) []base.AST {+ var asts []base.AST+ for _, r := range results {+ asts = append(asts, &base.ANTLRAST{+ StartPosition: &storepb.Position{Line: int32(r.BaseLine) + 1},+ Tree: r.Tree,+ Tokens: r.Tokens,+ })+ }+ return asts}// ParseSnowSQL parses the given SQL and returns a list of ParseResult (one per statement).@@ -55,17 +72,18 @@ func parseSingleSnowSQL(statement string, baseLine int) (*base.ParseResult, errop := parser.NewSnowflakeParser(stream)// Remove default error listener and add our own error listener.+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexer.RemoveErrorListeners()lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}lexer.AddErrorListener(lexerErrorListener)p.RemoveErrorListeners()parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/spanner/dignose.go b/backend/plugin/parser/spanner/dignose.goindex 1571026e3c..b2a3269d00 100644--- a/backend/plugin/parser/spanner/dignose.go+++ b/backend/plugin/parser/spanner/dignose.go@@ -8,12 +8,12 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/googlesql"- "github.com/bytebase/bytebase/backend/generated-go/store"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/parser/base")func init() {- base.RegisterDiagnoseFunc(store.Engine_BIGQUERY, Diagnose)+ base.RegisterDiagnoseFunc(storepb.Engine_BIGQUERY, Diagnose)}func Diagnose(_ context.Context, _ base.DiagnoseContext, statement string) ([]base.Diagnostic, error) {@@ -38,16 +38,17 @@ func parseGoogleSQLStatement(statement string) *base.SyntaxError {stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)p := parser.NewGoogleSQLParser(stream)+ startPosition := &storepb.Position{Line: 1}lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: 0,+ Statement: statement,+ StartPosition: startPosition,}lexer.RemoveErrorListeners()lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: 0,+ Statement: statement,+ StartPosition: startPosition,}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/spanner/spanner.go b/backend/plugin/parser/spanner/spanner.goindex bc318eb5cb..4a6770ac3f 100644--- a/backend/plugin/parser/spanner/spanner.go+++ b/backend/plugin/parser/spanner/spanner.go@@ -7,6 +7,7 @@ import (parser "github.com/bytebase/parser/googlesql"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/parser/base""github.com/bytebase/bytebase/backend/utils")@@ -44,17 +45,18 @@ func parseSingleSpannerGoogleSQL(statement string, baseLine int) (*base.ParseResp := parser.NewGoogleSQLParser(stream)// Remove default error listener and add our own error listener.+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexer.RemoveErrorListeners()lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}lexer.AddErrorListener(lexerErrorListener)p.RemoveErrorListeners()parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/tidb/ast.go b/backend/plugin/parser/tidb/ast.gonew file mode 100644index 0000000000..12811f66de--- /dev/null+++ b/backend/plugin/parser/tidb/ast.go@@ -0,0 +1,31 @@+package tidb++import (+ tidbast "github.com/pingcap/tidb/pkg/parser/ast"++ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/plugin/parser/base"+)++// AST is the AST implementation for TiDB parser.+// It implements the base.AST interface.+type AST struct {+ // StartPosition is the 1-based position where this statement starts.+ StartPosition *storepb.Position+ Node tidbast.StmtNode+}++// ASTStartPosition implements base.AST interface.+func (a *AST) ASTStartPosition() *storepb.Position {+ return a.StartPosition+}++// GetTiDBAST extracts the TiDB AST from a base.AST.+// Returns the AST and true if it is a TiDB AST, nil and false otherwise.+func GetTiDBAST(a base.AST) (*AST, bool) {+ if a == nil {+ return nil, false+ }+ tidbAST, ok := a.(*AST)+ return tidbAST, ok+}diff --git a/backend/plugin/parser/tidb/resource_change.go b/backend/plugin/parser/tidb/resource_change.goindex 2ad9a8ca2e..5ac094524f 100644--- a/backend/plugin/parser/tidb/resource_change.go+++ b/backend/plugin/parser/tidb/resource_change.go@@ -18,32 +18,32 @@ func init() {base.RegisterExtractChangedResourcesFunc(storepb.Engine_TIDB, extractChangedResources)}-func extractChangedResources(database string, _ string, dbMetadata *model.DatabaseMetadata, asts any, statement string) (*base.ChangeSummary, error) {- nodes, ok := asts.([]tidbast.StmtNode)- if !ok {- return nil, errors.Errorf("invalid ast type %T", asts)- }-+func extractChangedResources(database string, _ string, dbMetadata *model.DatabaseMetadata, asts []base.AST, statement string) (*base.ChangeSummary, error) {changedResources := model.NewChangedResources(dbMetadata)dmlCount := 0insertCount := 0var sampleDMLs []string- for _, node := range nodes {+ for _, ast := range asts {+ tidbAST, ok := GetTiDBAST(ast)+ if !ok {+ return nil, errors.New("expected TiDB AST")+ }+ node := tidbAST.Nodeerr := getResourceChanges(database, node, statement, changedResources)if err != nil {return nil, err}- switch node := node.(type) {+ switch n := node.(type) {case *tidbast.InsertStmt:- if len(node.Lists) > 0 {- insertCount += len(node.Lists)+ if len(n.Lists) > 0 {+ insertCount += len(n.Lists)continue}dmlCount++if len(sampleDMLs) < common.MaximumLintExplainSize {- sampleDMLs = append(sampleDMLs, trimStatement(node.Text()))+ sampleDMLs = append(sampleDMLs, trimStatement(n.Text()))}case *tidbast.UpdateStmt, *tidbast.DeleteStmt:dmlCount++diff --git a/backend/plugin/parser/tidb/resource_change_test.go b/backend/plugin/parser/tidb/resource_change_test.goindex a5060fdeba..16c300d771 100644--- a/backend/plugin/parser/tidb/resource_change_test.go+++ b/backend/plugin/parser/tidb/resource_change_test.go@@ -53,7 +53,8 @@ func TestExtractChangedResources(t *testing.T) {InsertCount: 2,}- asts, _ := ParseTiDB(statement, "", "")+ asts, err := base.Parse(storepb.Engine_TIDB, statement)+ require.NoError(t, err)got, err := extractChangedResources("db", "", nil /* dbMetadata */, asts, statement)require.NoError(t, err)require.Equal(t, want, got)diff --git a/backend/plugin/parser/tidb/statement_type.go b/backend/plugin/parser/tidb/statement_type.goindex 2fb2b7d4c0..9b4065c2a8 100644--- a/backend/plugin/parser/tidb/statement_type.go+++ b/backend/plugin/parser/tidb/statement_type.go@@ -3,15 +3,18 @@ package tidbimport (tidbast "github.com/pingcap/tidb/pkg/parser/ast""github.com/pkg/errors"++ "github.com/bytebase/bytebase/backend/plugin/parser/base")-func GetStatementTypes(asts any) ([]string, error) {- nodes, ok := asts.([]tidbast.StmtNode)- if !ok {- return nil, errors.Errorf("invalid ast type %T", asts)- }+func GetStatementTypes(asts []base.AST) ([]string, error) {sqlTypeSet := make(map[string]bool)- for _, node := range nodes {+ for _, ast := range asts {+ tidbAST, ok := GetTiDBAST(ast)+ if !ok {+ return nil, errors.New("expected TiDB AST")+ }+ node := tidbAST.Nodet := getStatementType(node)sqlTypeSet[t] = true}diff --git a/backend/plugin/parser/tidb/statement_type_test.go b/backend/plugin/parser/tidb/statement_type_test.goindex b3e5c6cac3..636310e8bc 100644--- a/backend/plugin/parser/tidb/statement_type_test.go+++ b/backend/plugin/parser/tidb/statement_type_test.go@@ -7,6 +7,9 @@ import ("github.com/stretchr/testify/require""gopkg.in/yaml.v3"++ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/plugin/parser/base")type statementTypeTest struct {@@ -35,7 +38,7 @@ func TestGetStatementType(t *testing.T) {a.NoError(yaml.Unmarshal(byteValue, &tests))for i, test := range tests {- asts, err := ParseTiDB(test.Statement, "", "")+ asts, err := base.Parse(storepb.Engine_TIDB, test.Statement)a.NoError(err)sqlType, err := GetStatementTypes(asts)diff --git a/backend/plugin/parser/tidb/tidb.go b/backend/plugin/parser/tidb/tidb.goindex 9cfddeb3b5..6177b5b781 100644--- a/backend/plugin/parser/tidb/tidb.go+++ b/backend/plugin/parser/tidb/tidb.go@@ -29,14 +29,15 @@ func init() {}// ParseTiDBForSyntaxCheck parses TiDB SQL for syntax checking purposes.-func ParseTiDBForSyntaxCheck(statement string) (any, error) {+// Returns []base.AST with *TiDBAST instances.+func ParseTiDBForSyntaxCheck(statement string) ([]base.AST, error) {singleSQLs, err := base.SplitMultiSQL(storepb.Engine_TIDB, statement)if err != nil {return nil, err}p := newTiDBParser()- var returnNodes []ast.StmtNode+ var results []base.ASTfor _, singleSQL := range singleSQLs {nodes, _, err := p.Parse(singleSQL.Text, "", "")if err != nil {@@ -66,10 +67,13 @@ func ParseTiDBForSyntaxCheck(statement string) (any, error) {return nil, errors.Wrapf(err, "failed to set line for create table statement at line %d", singleSQL.End.GetLine())}}- returnNodes = append(returnNodes, node)+ results = append(results, &AST{+ StartPosition: &storepb.Position{Line: int32(singleSQL.BaseLine) + 1},+ Node: node,+ })}- return returnNodes, nil+ return results, nil}func newTiDBParser() *tidbparser.Parser {@@ -124,16 +128,17 @@ func parseSingleStatement(baseLine int, statement string) (antlr.Tree, *antlr.Cop := parser.NewTiDBParser(stream)+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}lexer.RemoveErrorListeners()lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/trino/diagnose.go b/backend/plugin/parser/trino/diagnose.goindex 75b84f7350..99a21b58fa 100644--- a/backend/plugin/parser/trino/diagnose.go+++ b/backend/plugin/parser/trino/diagnose.go@@ -41,16 +41,17 @@ func parseTrinoStatement(statement string) *base.SyntaxError {p := parser.NewTrinoParser(stream)// Set up error listeners+ startPosition := &storepb.Position{Line: 1}lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: 0,+ Statement: statement,+ StartPosition: startPosition,}lexer.RemoveErrorListeners()lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: 0,+ Statement: statement,+ StartPosition: startPosition,}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/trino/trino.go b/backend/plugin/parser/trino/trino.goindex 48ccf05045..9117947caa 100644--- a/backend/plugin/parser/trino/trino.go+++ b/backend/plugin/parser/trino/trino.go@@ -9,6 +9,7 @@ import (parser "github.com/bytebase/parser/trino""github.com/pkg/errors"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/parser/base")@@ -52,14 +53,17 @@ func parseSingleTrino(sql string, baseLine int) (*base.ParseResult, error) {p := parser.NewTrinoParser(stream)// Set up error listeners+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexerErrorListener := &base.ParseErrorListener{- Statement: sql,+ Statement: sql,+ StartPosition: startPosition,}lexer.RemoveErrorListeners()lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- Statement: sql,+ Statement: sql,+ StartPosition: startPosition,}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/tsql/diagnose.go b/backend/plugin/parser/tsql/diagnose.goindex 030b400c53..4e1dfb0e02 100644--- a/backend/plugin/parser/tsql/diagnose.go+++ b/backend/plugin/parser/tsql/diagnose.go@@ -8,12 +8,12 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql"- "github.com/bytebase/bytebase/backend/generated-go/store"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/parser/base")func init() {- base.RegisterDiagnoseFunc(store.Engine_MSSQL, Diagnose)+ base.RegisterDiagnoseFunc(storepb.Engine_MSSQL, Diagnose)}func Diagnose(_ context.Context, _ base.DiagnoseContext, statement string) ([]base.Diagnostic, error) {@@ -38,16 +38,17 @@ func parseTSQLStatement(statement string) *base.SyntaxError {stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)p := parser.NewTSqlParser(stream)+ startPosition := &storepb.Position{Line: 1}lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: 0,+ Statement: statement,+ StartPosition: startPosition,}lexer.RemoveErrorListeners()lexer.AddErrorListener(lexerErrorListener)parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: 0,+ Statement: statement,+ StartPosition: startPosition,}p.RemoveErrorListeners()p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/parser/tsql/resource_change.go b/backend/plugin/parser/tsql/resource_change.goindex 43defbd810..0e7dfcbe8a 100644--- a/backend/plugin/parser/tsql/resource_change.go+++ b/backend/plugin/parser/tsql/resource_change.go@@ -19,12 +19,7 @@ func init() {base.RegisterExtractChangedResourcesFunc(storepb.Engine_MSSQL, extractChangedResources)}-func extractChangedResources(currentDatabase string, currentSchema string, dbMetadata *model.DatabaseMetadata, asts any, statement string) (*base.ChangeSummary, error) {- parseResults, ok := asts.([]*base.ParseResult)- if !ok {- return nil, errors.Errorf("failed to convert ast to ParseResult list")- }-+func extractChangedResources(currentDatabase string, currentSchema string, dbMetadata *model.DatabaseMetadata, asts []base.AST, statement string) (*base.ChangeSummary, error) {changedResources := model.NewChangedResources(dbMetadata)l := &tsqlChangedResourceExtractListener{currentDatabase: currentDatabase,@@ -34,8 +29,12 @@ func extractChangedResources(currentDatabase string, currentSchema string, dbMetstatement: statement,}- for _, parseResult := range parseResults {- antlr.ParseTreeWalkerDefault.Walk(l, parseResult.Tree)+ for _, ast := range asts {+ antlrAST, ok := base.GetANTLRAST(ast)+ if !ok {+ return nil, errors.New("expected ANTLR AST for MSSQL")+ }+ antlr.ParseTreeWalkerDefault.Walk(l, antlrAST.Tree)}return &base.ChangeSummary{diff --git a/backend/plugin/parser/tsql/resource_change_test.go b/backend/plugin/parser/tsql/resource_change_test.goindex 7386422257..fb5806cc4a 100644--- a/backend/plugin/parser/tsql/resource_change_test.go+++ b/backend/plugin/parser/tsql/resource_change_test.go@@ -42,7 +42,7 @@ func TestExtractChangedResources(t *testing.T) {InsertCount: 2,}- asts, err := ParseTSQL(statement)+ asts, err := base.Parse(storepb.Engine_MSSQL, statement)require.NoError(t, err)require.Len(t, asts, 5)got, err := extractChangedResources("DB", "dbo", nil /* dbMetadata */, asts, statement)diff --git a/backend/plugin/parser/tsql/statement_type.go b/backend/plugin/parser/tsql/statement_type.goindex bf29cb09fb..5a897eba6c 100644--- a/backend/plugin/parser/tsql/statement_type.go+++ b/backend/plugin/parser/tsql/statement_type.go@@ -4,22 +4,26 @@ import ("github.com/antlr4-go/antlr/v4"parser "github.com/bytebase/parser/tsql""github.com/pkg/errors"++ "github.com/bytebase/bytebase/backend/plugin/parser/base")-func GetStatementTypes(asts any) ([]string, error) {- node, ok := asts.(antlr.Tree)- if !ok {- return nil, errors.Errorf("invalid ast type %T", asts)- }+func GetStatementTypes(asts []base.AST) ([]string, error) {sqlTypeSet := make(map[string]bool)- for _, child := range node.GetChildren() {- _, ok := child.(*antlr.TerminalNodeImpl)- if ok {- continue+ for _, ast := range asts {+ antlrAST, ok := base.GetANTLRAST(ast)+ if !ok {+ return nil, errors.New("expected ANTLR AST for MSSQL")}+ for _, child := range antlrAST.Tree.GetChildren() {+ _, ok := child.(*antlr.TerminalNodeImpl)+ if ok {+ continue+ }- t := getStatementType(child)- sqlTypeSet[t] = true+ t := getStatementType(child)+ sqlTypeSet[t] = true+ }}var sqlTypes []stringfor sqlType := range sqlTypeSet {diff --git a/backend/plugin/parser/tsql/statement_type_test.go b/backend/plugin/parser/tsql/statement_type_test.goindex e65da67565..64309d19bd 100644--- a/backend/plugin/parser/tsql/statement_type_test.go+++ b/backend/plugin/parser/tsql/statement_type_test.go@@ -7,6 +7,9 @@ import ("github.com/stretchr/testify/require""gopkg.in/yaml.v3"++ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/plugin/parser/base")type statementTypeTest struct {@@ -30,10 +33,10 @@ func TestGetStatementType(t *testing.T) {a.NoError(yaml.Unmarshal(byteValue, &tests))for _, test := range tests {- results, err := ParseTSQL(test.Statement)+ asts, err := base.Parse(storepb.Engine_MSSQL, test.Statement)a.NoError(err)- a.Len(results, 1)- sqlType, err := GetStatementTypes(results[0].Tree)+ a.NotEmpty(asts)+ sqlType, err := GetStatementTypes(asts)a.NoError(err)a.Equal(test.Want, sqlType)}diff --git a/backend/plugin/parser/tsql/tsql.go b/backend/plugin/parser/tsql/tsql.goindex 61bf8c0e36..494713c2e5 100644--- a/backend/plugin/parser/tsql/tsql.go+++ b/backend/plugin/parser/tsql/tsql.go@@ -18,9 +18,26 @@ func init() {}// parseTSQLForRegistry is the ParseFunc for T-SQL.-// Returns []*base.ParseResult on success.-func parseTSQLForRegistry(statement string) (any, error) {- return ParseTSQL(statement)+// Returns []base.AST with *ANTLRAST instances.+func parseTSQLForRegistry(statement string) ([]base.AST, error) {+ parseResults, err := ParseTSQL(statement)+ if err != nil {+ return nil, err+ }+ return toAST(parseResults), nil+}++// toAST converts []*ParseResult to []base.AST.+func toAST(results []*base.ParseResult) []base.AST {+ var asts []base.AST+ for _, r := range results {+ asts = append(asts, &base.ANTLRAST{+ StartPosition: &storepb.Position{Line: int32(r.BaseLine) + 1},+ Tree: r.Tree,+ Tokens: r.Tokens,+ })+ }+ return asts}// ParseTSQL parses the given SQL and returns a list of ParseResult (one per statement).@@ -55,17 +72,18 @@ func parseSingleTSQL(statement string, baseLine int) (*base.ParseResult, error)p := parser.NewTSqlParser(stream)// Remove default error listener and add our own error listener.+ startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexer.RemoveErrorListeners()lexerErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}lexer.AddErrorListener(lexerErrorListener)p.RemoveErrorListeners()parserErrorListener := &base.ParseErrorListener{- Statement: statement,- BaseLine: baseLine,+ Statement: statement,+ StartPosition: startPosition,}p.AddErrorListener(parserErrorListener)diff --git a/backend/plugin/schema/mysql/walk_through.go b/backend/plugin/schema/mysql/walk_through.goindex f1b6f37092..6634b20a5c 100644--- a/backend/plugin/schema/mysql/walk_through.go+++ b/backend/plugin/schema/mysql/walk_through.go@@ -36,7 +36,7 @@ func init() {}// WalkThrough walks through MySQL AST and updates the database metadata.-func WalkThrough(d *model.DatabaseMetadata, ast any) *storepb.Advice {+func WalkThrough(d *model.DatabaseMetadata, ast []base.AST) *storepb.Advice {// We define the Catalog as Database -> Schema -> Table. The Schema is only for PostgreSQL.// So we use a Schema whose name is empty for other engines, such as MySQL.// If there is no empty-string-name schema, create it to avoid corner cases.@@ -44,18 +44,28 @@ func WalkThrough(d *model.DatabaseMetadata, ast any) *storepb.Advice {d.CreateSchema("")}- nodeList, ok := ast.([]*base.ParseResult)- if !ok {- return &storepb.Advice{- Status: storepb.Advice_ERROR,- Code: code.Internal.Int32(),- Title: fmt.Sprintf("invalid ast type %T", ast),- Content: fmt.Sprintf("invalid ast type %T", ast),- StartPosition: &storepb.Position{- Line: 0,- },+ // Extract ParseResult from AST+ var nodeList []*base.ParseResult+ for _, unifiedAST := range ast {+ antlrAST, ok := base.GetANTLRAST(unifiedAST)+ if !ok {+ return &storepb.Advice{+ Status: storepb.Advice_ERROR,+ Code: code.Internal.Int32(),+ Title: "MySQL walk-through expects ANTLR-based parser result",+ Content: "MySQL walk-through expects ANTLR-based parser result",+ StartPosition: &storepb.Position{+ Line: 0,+ },+ }}+ nodeList = append(nodeList, &base.ParseResult{+ Tree: antlrAST.Tree,+ Tokens: antlrAST.Tokens,+ BaseLine: base.GetLineOffset(antlrAST.StartPosition),+ })}+for _, node := range nodeList {if advice := mysqlChangeState(d, node); advice != nil {return advicediff --git a/backend/plugin/schema/pg/walk_through.go b/backend/plugin/schema/pg/walk_through.goindex 1178de3445..2e2f70e36d 100644--- a/backend/plugin/schema/pg/walk_through.go+++ b/backend/plugin/schema/pg/walk_through.go@@ -25,19 +25,27 @@ func init() {}// WalkThrough walks through the PostgreSQL ANTLR parse tree and builds catalog metadata.-func WalkThrough(d *model.DatabaseMetadata, ast any) *storepb.Advice {- // ANTLR-based walkthrough- parseResults, ok := ast.([]*base.ParseResult)- if !ok {- return &storepb.Advice{- Status: storepb.Advice_ERROR,- Code: code.Internal.Int32(),- Title: fmt.Sprintf("PostgreSQL walk-through expects []*base.ParseResult, got %T", ast),- Content: fmt.Sprintf("PostgreSQL walk-through expects []*base.ParseResult, got %T", ast),- StartPosition: &storepb.Position{- Line: 0,- },+func WalkThrough(d *model.DatabaseMetadata, ast []base.AST) *storepb.Advice {+ // Extract ParseResult from AST+ var parseResults []*base.ParseResult+ for _, unifiedAST := range ast {+ antlrAST, ok := base.GetANTLRAST(unifiedAST)+ if !ok {+ return &storepb.Advice{+ Status: storepb.Advice_ERROR,+ Code: code.Internal.Int32(),+ Title: "PostgreSQL walk-through expects ANTLR-based parser result",+ Content: "PostgreSQL walk-through expects ANTLR-based parser result",+ StartPosition: &storepb.Position{+ Line: 0,+ },+ }}+ parseResults = append(parseResults, &base.ParseResult{+ Tree: antlrAST.Tree,+ Tokens: antlrAST.Tokens,+ BaseLine: base.GetLineOffset(antlrAST.StartPosition),+ })}// Build listener with database statediff --git a/backend/plugin/schema/pg/walk_through_test.go b/backend/plugin/schema/pg/walk_through_test.goindex f3c7087127..6def90d00b 100644--- a/backend/plugin/schema/pg/walk_through_test.go+++ b/backend/plugin/schema/pg/walk_through_test.go@@ -15,7 +15,7 @@ import ("github.com/bytebase/bytebase/backend/common""github.com/bytebase/bytebase/backend/component/sheet"storepb "github.com/bytebase/bytebase/backend/generated-go/store"- pgparser "github.com/bytebase/bytebase/backend/plugin/parser/pg"+ "github.com/bytebase/bytebase/backend/plugin/parser/base""github.com/bytebase/bytebase/backend/store/model")@@ -187,14 +187,14 @@ func TestWalkThroughANTLR(t *testing.T) {// Create DatabaseMetadata for walk-throughstate := model.NewDatabaseMetadata(protoData, nil, nil, storepb.Engine_POSTGRES, !test.IgnoreCaseSensitive)- // Parse using ANTLR parser instead of legacy parser- parseResult, parseErr := pgparser.ParsePostgreSQL(test.Statement)+ // Parse using base.Parse to get AST+ unifiedASTs, parseErr := base.Parse(storepb.Engine_POSTGRES, test.Statement)if parseErr != nil {- t.Fatalf("Failed to parse SQL with ANTLR: %v\nSQL: %s", parseErr, test.Statement)+ t.Fatalf("Failed to parse SQL: %v\nSQL: %s", parseErr, test.Statement)}- // Call WalkThrough with ANTLR tree- advice := WalkThrough(state, parseResult)+ // Call WalkThrough with AST+ advice := WalkThrough(state, unifiedASTs)if advice != nil {// Compare the advice fieldsrequire.Equal(t, test.Advice.Code, advice.Code)diff --git a/backend/plugin/schema/schema.go b/backend/plugin/schema/schema.goindex 48f0b72a2c..a78f4b7db5 100644--- a/backend/plugin/schema/schema.go+++ b/backend/plugin/schema/schema.go@@ -7,6 +7,7 @@ import ("github.com/pkg/errors"storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/plugin/parser/base""github.com/bytebase/bytebase/backend/store/model")@@ -39,7 +40,7 @@ type getSequenceDefinition func(string, *storepb.SequenceMetadata) (string, errotype getDatabaseMetadata func(string) (*storepb.DatabaseSchemaMetadata, error)type generateMigration func(*MetadataDiff) (string, error)type getSDLDiff func(currentSDLText, previousUserSDLText string, currentSchema, previousSchema *model.DatabaseMetadata) (*MetadataDiff, error)-type walkThrough func(*model.DatabaseMetadata, any) *storepb.Advice+type walkThrough func(*model.DatabaseMetadata, []base.AST) *storepb.Advicetype GetDefinitionContext struct {SkipBackupSchema bool@@ -277,7 +278,7 @@ func RegisterWalkThrough(engine storepb.Engine, f walkThrough) {walkThroughs[engine] = f}-func WalkThrough(engine storepb.Engine, d *model.DatabaseMetadata, ast any) *storepb.Advice {+func WalkThrough(engine storepb.Engine, d *model.DatabaseMetadata, ast []base.AST) *storepb.Advice {f, ok := walkThroughs[engine]if !ok {return nildiff --git a/backend/plugin/schema/tidb/walk_through.go b/backend/plugin/schema/tidb/walk_through.goindex 1329bbaf78..21db90525b 100644--- a/backend/plugin/schema/tidb/walk_through.go+++ b/backend/plugin/schema/tidb/walk_through.go@@ -14,6 +14,8 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store""github.com/bytebase/bytebase/backend/plugin/advisor/code"+ "github.com/bytebase/bytebase/backend/plugin/parser/base"+ "github.com/bytebase/bytebase/backend/plugin/parser/tidb""github.com/bytebase/bytebase/backend/plugin/schema""github.com/bytebase/bytebase/backend/store/model")@@ -39,7 +41,7 @@ func init() {}// WalkThrough walks through TiDB AST and updates the database state.-func WalkThrough(d *model.DatabaseMetadata, ast any) *storepb.Advice {+func WalkThrough(d *model.DatabaseMetadata, ast []base.AST) *storepb.Advice {// We define the Catalog as Database -> Schema -> Table. The Schema is only for PostgreSQL.// So we use a Schema whose name is empty for other engines, such as MySQL.// If there is no empty-string-name schema, create it to avoid corner cases.@@ -47,11 +49,24 @@ func WalkThrough(d *model.DatabaseMetadata, ast any) *storepb.Advice {d.CreateSchema("")}- nodeList, ok := ast.([]tidbast.StmtNode)- if !ok {- // Internal error - invalid AST type, return nil to skip walkthrough- return nil+ // Extract TiDB nodes from AST+ var nodeList []tidbast.StmtNode+ for _, unifiedAST := range ast {+ tidbAST, ok := tidb.GetTiDBAST(unifiedAST)+ if !ok {+ return &storepb.Advice{+ Status: storepb.Advice_ERROR,+ Code: code.Internal.Int32(),+ Title: "TiDB walk-through expects TiDB parser result",+ Content: "TiDB walk-through expects TiDB parser result",+ StartPosition: &storepb.Position{+ Line: 0,+ },+ }+ }+ nodeList = append(nodeList, tidbAST.Node)}+for _, node := range nodeList {// change stateif err := changeStateTiDB(d, node); err != nil {