Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor(advisor): fix statement text extraction architecture (#18513)

h3n4lc7466d36bd56
diff --git a/backend/api/v1/release_service_check.go b/backend/api/v1/release_service_check.go
index d1aa7fffde..66417d1909 100644
--- a/backend/api/v1/release_service_check.go
+++ b/backend/api/v1/release_service_check.go
@@ -669,8 +669,6 @@ func (s *ReleaseService) runSQLReviewCheckForFile(
connection := driver.GetDB()
context := advisor.Context{
- Charset: dbMetadataProto.CharacterSet,
- Collation: dbMetadataProto.Collation,
EnableSDL: enableSDL,
DBSchema: dbMetadataProto,
DBType: instance.Metadata.GetEngine(),
diff --git a/backend/plugin/advisor/advisor.go b/backend/plugin/advisor/advisor.go
index 375c94e4da..64ca51aa2b 100644
--- a/backend/plugin/advisor/advisor.go
+++ b/backend/plugin/advisor/advisor.go
@@ -45,24 +45,23 @@ type Context struct {
IsObjectCaseSensitive bool
// SQL review rule special fields.
- AST []base.AST
Rule *storepb.SQLReviewRule
OriginalMetadata *model.DatabaseMetadata
FinalMetadata *model.DatabaseMetadata
Driver *sql.DB
+ // ParsedStatements contains complete per-statement info including text.
+ ParsedStatements []base.ParsedStatement
// CurrentDatabase is the current database.
CurrentDatabase string
- // Statement is the original statement of AST, it is used for some PostgreSQL
- // advisors which need to check the token stream.
- Statements string
+ // StatementsTotalSize is the total size of all statements in bytes.
+ // Used for size limit checks without needing the full statement text.
+ StatementsTotalSize int
// UsePostgresDatabaseOwner is true if the advisor should use the database owner as default role.
UsePostgresDatabaseOwner bool
// SQL review level fields.
- Charset string
- Collation string
- DBType storepb.Engine
+ DBType storepb.Engine
// Snowflake specific fields (duplicates CurrentDatabase, kept for compatibility).
// CurrentDatabase string
@@ -103,6 +102,31 @@ func Register(dbType storepb.Engine, ruleType storepb.SQLReviewRule_Type, f Advi
}
}
+// GetANTLRParseResults extracts ANTLR parse results from the advisor context.
+// This is a unified helper for all ANTLR-based engines (MySQL, MSSQL, Oracle, Snowflake, PostgreSQL).
+func GetANTLRParseResults(checkCtx Context) ([]*base.ParseResult, error) {
+ if checkCtx.ParsedStatements == nil {
+ return nil, errors.New("ParsedStatements is not provided in context")
+ }
+
+ var parseResults []*base.ParseResult
+ for _, stmt := range checkCtx.ParsedStatements {
+ if stmt.AST == nil {
+ continue
+ }
+ antlrAST, ok := base.GetANTLRAST(stmt.AST)
+ 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: stmt.BaseLine,
+ })
+ }
+ return parseResults, nil
+}
+
// Check runs the advisor and returns the advices.
func Check(ctx context.Context, dbType storepb.Engine, ruleType storepb.SQLReviewRule_Type, checkCtx Context) (adviceList []*storepb.Advice, err error) {
defer func() {
diff --git a/backend/plugin/advisor/mssql/rule_builtin_prior_backup_check.go b/backend/plugin/advisor/mssql/rule_builtin_prior_backup_check.go
index b78c40f4ed..e2db3c8dbd 100644
--- a/backend/plugin/advisor/mssql/rule_builtin_prior_backup_check.go
+++ b/backend/plugin/advisor/mssql/rule_builtin_prior_backup_check.go
@@ -7,12 +7,12 @@ 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"
)
@@ -39,7 +39,7 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx adv
}
var adviceList []*storepb.Advice
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
@@ -51,7 +51,7 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx adv
}
title := checkCtx.Rule.Type.String()
- if len(checkCtx.Statements) > common.MaxSheetCheckSize {
+ if checkCtx.StatementsTotalSize > common.MaxSheetCheckSize {
adviceList = append(adviceList, &storepb.Advice{
Status: level,
Title: title,
@@ -91,10 +91,7 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx adv
})
}
- statementInfoList, err := prepareTransformation(checkCtx.DBSchema.Name, checkCtx.Statements)
- if err != nil {
- return nil, errors.Wrapf(err, "failed to prepare transformation")
- }
+ statementInfoList := prepareTransformation(checkCtx.DBSchema.Name, stmtList)
groupByTable := make(map[string][]statementInfo)
for _, item := range statementInfoList {
@@ -209,12 +206,7 @@ type statementInfo struct {
table *TableReference
}
-func prepareTransformation(databaseName, statement string) ([]statementInfo, error) {
- parseResults, err := tsqlparser.ParseTSQL(statement)
- if err != nil {
- return nil, errors.Wrap(err, "failed to parse statement")
- }
-
+func prepareTransformation(databaseName string, parseResults []*base.ParseResult) []statementInfo {
extractor := &dmlExtractor{
databaseName: databaseName,
}
@@ -223,7 +215,7 @@ func prepareTransformation(databaseName, statement string) ([]statementInfo, err
antlr.ParseTreeWalkerDefault.Walk(extractor, parseResult.Tree)
}
- return extractor.dmls, nil
+ return extractor.dmls
}
type dmlExtractor struct {
diff --git a/backend/plugin/advisor/mssql/rule_column_maximum_varchar_length.go b/backend/plugin/advisor/mssql/rule_column_maximum_varchar_length.go
index 50e2e8a5be..ee1b0ffe9f 100644
--- a/backend/plugin/advisor/mssql/rule_column_maximum_varchar_length.go
+++ b/backend/plugin/advisor/mssql/rule_column_maximum_varchar_length.go
@@ -35,7 +35,7 @@ type ColumnMaximumVarcharLengthAdvisor struct {
// Check checks for maximum varchar length.
func (*ColumnMaximumVarcharLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_column_no_null.go b/backend/plugin/advisor/mssql/rule_column_no_null.go
index 51aee2d4f8..fe1c217710 100644
--- a/backend/plugin/advisor/mssql/rule_column_no_null.go
+++ b/backend/plugin/advisor/mssql/rule_column_no_null.go
@@ -28,7 +28,7 @@ type ColumnNoNullAdvisor struct {
// Check checks for column no NULL value..
func (*ColumnNoNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_column_require.go b/backend/plugin/advisor/mssql/rule_column_require.go
index c9ed82cec2..9008c99f6e 100644
--- a/backend/plugin/advisor/mssql/rule_column_require.go
+++ b/backend/plugin/advisor/mssql/rule_column_require.go
@@ -32,7 +32,7 @@ type ColumnRequireAdvisor struct {
// Check checks for column requirement..
func (*ColumnRequireAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_column_type_disallow_list.go b/backend/plugin/advisor/mssql/rule_column_type_disallow_list.go
index abc2642f8f..998a6184f0 100644
--- a/backend/plugin/advisor/mssql/rule_column_type_disallow_list.go
+++ b/backend/plugin/advisor/mssql/rule_column_type_disallow_list.go
@@ -30,7 +30,7 @@ type ColumnTypeDisallowListAdvisor struct {
}
func (*ColumnTypeDisallowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 2b635d7d03..50d03d0a59 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
@@ -20,7 +20,7 @@ type FunctionDisallowCreateOrAlterAdvisor struct{}
// Check implements advisor.Advisor.
func (*FunctionDisallowCreateOrAlterAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_index_not_redundant.go b/backend/plugin/advisor/mssql/rule_index_not_redundant.go
index c617495026..5cc9a9bb39 100644
--- a/backend/plugin/advisor/mssql/rule_index_not_redundant.go
+++ b/backend/plugin/advisor/mssql/rule_index_not_redundant.go
@@ -30,7 +30,7 @@ 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, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_migration_compatibility.go b/backend/plugin/advisor/mssql/rule_migration_compatibility.go
index 7ffd1e2267..b2c2a7cef3 100644
--- a/backend/plugin/advisor/mssql/rule_migration_compatibility.go
+++ b/backend/plugin/advisor/mssql/rule_migration_compatibility.go
@@ -29,7 +29,7 @@ type MigrationCompatibilityAdvisor struct {
// Check checks for migration compatibility.
func (*MigrationCompatibilityAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_naming_identifier_no_keyword.go b/backend/plugin/advisor/mssql/rule_naming_identifier_no_keyword.go
index e2b65bc957..aa27053f55 100644
--- a/backend/plugin/advisor/mssql/rule_naming_identifier_no_keyword.go
+++ b/backend/plugin/advisor/mssql/rule_naming_identifier_no_keyword.go
@@ -29,7 +29,7 @@ type NamingIdentifierNoKeywordAdvisor struct {
// Check checks for identifier naming convention without keyword.
func (*NamingIdentifierNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_naming_table.go b/backend/plugin/advisor/mssql/rule_naming_table.go
index e8aa570290..880ee96c58 100644
--- a/backend/plugin/advisor/mssql/rule_naming_table.go
+++ b/backend/plugin/advisor/mssql/rule_naming_table.go
@@ -31,7 +31,7 @@ type NamingTableAdvisor struct {
// Check checks for table naming convention..
func (*NamingTableAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_naming_table_no_keyword.go b/backend/plugin/advisor/mssql/rule_naming_table_no_keyword.go
index 10cf6e28a8..32bf4bad5f 100644
--- a/backend/plugin/advisor/mssql/rule_naming_table_no_keyword.go
+++ b/backend/plugin/advisor/mssql/rule_naming_table_no_keyword.go
@@ -29,7 +29,7 @@ type NamingTableNoKeywordAdvisor struct {
// Check checks for table naming convention without keyword.
func (*NamingTableNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 3990c0294f..298c8eeab7 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
@@ -19,7 +19,7 @@ func init() {
type ProcedureDisallowCreateOrAlterAdvisor struct{}
func (*ProcedureDisallowCreateOrAlterAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_select_no_select_all.go b/backend/plugin/advisor/mssql/rule_select_no_select_all.go
index 2721accc55..4b1e4a5476 100644
--- a/backend/plugin/advisor/mssql/rule_select_no_select_all.go
+++ b/backend/plugin/advisor/mssql/rule_select_no_select_all.go
@@ -26,7 +26,7 @@ type SelectNoSelectAllAdvisor struct {
// Check checks for no select all.
func (*SelectNoSelectAllAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index e74e520aa5..8e55bf8cd8 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
@@ -22,7 +22,7 @@ func init() {
type DisallowCrossDBQueriesAdvisor struct{}
func (*DisallowCrossDBQueriesAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index e784da60a8..7ece075088 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
@@ -22,7 +22,7 @@ type DisallowFuncAndCalculationsAdvisor struct{}
var _ advisor.Advisor = (*DisallowFuncAndCalculationsAdvisor)(nil)
func (*DisallowFuncAndCalculationsAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index b7c3d2e390..0e76ea3cab 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
@@ -26,7 +26,7 @@ type WhereRequirementForSelectAdvisor struct {
// Check checks for WHERE clause requirement.
func (*WhereRequirementForSelectAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 17fa99cff6..5b2f8461a2 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
@@ -26,7 +26,7 @@ type WhereRequirementForUpdateDeleteAdvisor struct {
// Check checks for WHERE clause requirement.
func (*WhereRequirementForUpdateDeleteAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_table_disallow_ddl.go b/backend/plugin/advisor/mssql/rule_table_disallow_ddl.go
index 98130b3abb..b2f50e997d 100644
--- a/backend/plugin/advisor/mssql/rule_table_disallow_ddl.go
+++ b/backend/plugin/advisor/mssql/rule_table_disallow_ddl.go
@@ -30,7 +30,7 @@ type TableDisallowDDLAdvisor struct {
}
func (*TableDisallowDDLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_table_disallow_dml.go b/backend/plugin/advisor/mssql/rule_table_disallow_dml.go
index 87a8c4963a..e8c1b80abf 100644
--- a/backend/plugin/advisor/mssql/rule_table_disallow_dml.go
+++ b/backend/plugin/advisor/mssql/rule_table_disallow_dml.go
@@ -30,7 +30,7 @@ type TableDisallowDMLAdvisor struct {
}
func (*TableDisallowDMLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_table_drop_naming_convention.go b/backend/plugin/advisor/mssql/rule_table_drop_naming_convention.go
index 2a02e2c14a..dc86f014f2 100644
--- a/backend/plugin/advisor/mssql/rule_table_drop_naming_convention.go
+++ b/backend/plugin/advisor/mssql/rule_table_drop_naming_convention.go
@@ -30,7 +30,7 @@ type TableDropNamingConventionAdvisor struct {
// Check checks for table drop with naming convention.
func (*TableDropNamingConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_table_no_foreign_key.go b/backend/plugin/advisor/mssql/rule_table_no_foreign_key.go
index 9e975d3eea..b9d9a58cf7 100644
--- a/backend/plugin/advisor/mssql/rule_table_no_foreign_key.go
+++ b/backend/plugin/advisor/mssql/rule_table_no_foreign_key.go
@@ -30,7 +30,7 @@ type TableNoForeignKeyAdvisor struct {
// Check checks for table disallow foreign key..
func (*TableNoForeignKeyAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/rule_table_require_pk.go b/backend/plugin/advisor/mssql/rule_table_require_pk.go
index c019aaaf03..74b5c6588e 100644
--- a/backend/plugin/advisor/mssql/rule_table_require_pk.go
+++ b/backend/plugin/advisor/mssql/rule_table_require_pk.go
@@ -28,7 +28,7 @@ type TableRequirePkAdvisor struct {
// Check checks for table require primary key..
func (*TableRequirePkAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mssql/utils.go b/backend/plugin/advisor/mssql/utils.go
deleted file mode 100644
index d0565ca239..0000000000
--- a/backend/plugin/advisor/mssql/utils.go
+++ /dev/null
@@ -1,28 +0,0 @@
-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.go
index dd514662bb..19cbe5f6e7 100644
--- a/backend/plugin/advisor/mysql/rule_builtin_prior_backup_check.go
+++ b/backend/plugin/advisor/mysql/rule_builtin_prior_backup_check.go
@@ -32,7 +32,7 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx adv
}
var adviceList []*storepb.Advice
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
@@ -44,7 +44,7 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx adv
}
title := checkCtx.Rule.Type.String()
- if len(checkCtx.Statements) > common.MaxSheetCheckSize {
+ if checkCtx.StatementsTotalSize > common.MaxSheetCheckSize {
adviceList = append(adviceList, &storepb.Advice{
Status: level,
Title: title,
diff --git a/backend/plugin/advisor/mysql/rule_charset_allowlist.go b/backend/plugin/advisor/mysql/rule_charset_allowlist.go
index 3e2db329b0..635e31ecbf 100644
--- a/backend/plugin/advisor/mysql/rule_charset_allowlist.go
+++ b/backend/plugin/advisor/mysql/rule_charset_allowlist.go
@@ -31,7 +31,7 @@ type CharsetAllowlistAdvisor struct {
// Check checks for charset allowlist.
func (*CharsetAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_collation_allowlist.go b/backend/plugin/advisor/mysql/rule_collation_allowlist.go
index b716cd870f..6d7558b113 100644
--- a/backend/plugin/advisor/mysql/rule_collation_allowlist.go
+++ b/backend/plugin/advisor/mysql/rule_collation_allowlist.go
@@ -31,7 +31,7 @@ type CollationAllowlistAdvisor struct {
// Check checks for collation allowlist.
func (*CollationAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index a362150a72..84e85eb28f 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
@@ -36,7 +36,7 @@ type ColumnAutoIncrementInitialValueAdvisor struct {
// Check checks for auto-increment column initial value.
func (*ColumnAutoIncrementInitialValueAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index e318924fde..012d08cda2 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
@@ -33,7 +33,7 @@ type ColumnAutoIncrementMustIntegerAdvisor struct {
// Check checks for auto-increment column type.
func (*ColumnAutoIncrementMustIntegerAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 42768c23b2..58e9f3118a 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
@@ -33,7 +33,7 @@ type ColumnAutoIncrementMustUnsignedAdvisor struct {
// Check checks for unsigned auto-increment column.
func (*ColumnAutoIncrementMustUnsignedAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_comment_convention.go b/backend/plugin/advisor/mysql/rule_column_comment_convention.go
index 0693a0166a..c64f94ae1b 100644
--- a/backend/plugin/advisor/mysql/rule_column_comment_convention.go
+++ b/backend/plugin/advisor/mysql/rule_column_comment_convention.go
@@ -30,7 +30,7 @@ type ColumnCommentConventionAdvisor struct {
// Check checks for column comment convention.
func (*ColumnCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 61c3f7b459..ef157de461 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
@@ -38,7 +38,7 @@ type ColumnCurrentTimeCountLimitAdvisor struct {
// Check checks for current time column count limit.
func (*ColumnCurrentTimeCountLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_disallow_changing.go b/backend/plugin/advisor/mysql/rule_column_disallow_changing.go
index d44a99dcf4..b841aa8500 100644
--- a/backend/plugin/advisor/mysql/rule_column_disallow_changing.go
+++ b/backend/plugin/advisor/mysql/rule_column_disallow_changing.go
@@ -32,7 +32,7 @@ type ColumnDisallowChangingAdvisor struct {
// Check checks for disallow CHANGE COLUMN statement.
func (*ColumnDisallowChangingAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_disallow_changing_order.go b/backend/plugin/advisor/mysql/rule_column_disallow_changing_order.go
index dca5078bd4..0c858d5b7f 100644
--- a/backend/plugin/advisor/mysql/rule_column_disallow_changing_order.go
+++ b/backend/plugin/advisor/mysql/rule_column_disallow_changing_order.go
@@ -32,7 +32,7 @@ type ColumnDisallowChangingOrderAdvisor struct {
// Check checks for disallow changing column order.
func (*ColumnDisallowChangingOrderAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_disallow_changing_type.go b/backend/plugin/advisor/mysql/rule_column_disallow_changing_type.go
index d6766559e4..27bec2814a 100644
--- a/backend/plugin/advisor/mysql/rule_column_disallow_changing_type.go
+++ b/backend/plugin/advisor/mysql/rule_column_disallow_changing_type.go
@@ -34,7 +34,7 @@ type ColumnDisallowChangingTypeAdvisor struct {
// Check checks for disallow changing column type.
func (*ColumnDisallowChangingTypeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_disallow_drop.go b/backend/plugin/advisor/mysql/rule_column_disallow_drop.go
index 2669d9407a..2cceaa17f4 100644
--- a/backend/plugin/advisor/mysql/rule_column_disallow_drop.go
+++ b/backend/plugin/advisor/mysql/rule_column_disallow_drop.go
@@ -30,7 +30,7 @@ type ColumnDisallowDropAdvisor struct {
// Check checks for disallow DROP COLUMN statement.
func (*ColumnDisallowDropAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 008b194684..c0f4445c88 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
@@ -32,7 +32,7 @@ type ColumnDisallowDropInIndexAdvisor struct {
// Check checks for disallow Drop COLUMN in index statement.
func (*ColumnDisallowDropInIndexAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_disallow_set_charset.go b/backend/plugin/advisor/mysql/rule_column_disallow_set_charset.go
index fe9d34fcac..ba5fa1087e 100644
--- a/backend/plugin/advisor/mysql/rule_column_disallow_set_charset.go
+++ b/backend/plugin/advisor/mysql/rule_column_disallow_set_charset.go
@@ -31,7 +31,7 @@ type ColumnDisallowSetCharsetAdvisor struct {
// Check checks for disallow set column charset.
func (*ColumnDisallowSetCharsetAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_maximum_character_length.go b/backend/plugin/advisor/mysql/rule_column_maximum_character_length.go
index 3ecde628e4..9012a50770 100644
--- a/backend/plugin/advisor/mysql/rule_column_maximum_character_length.go
+++ b/backend/plugin/advisor/mysql/rule_column_maximum_character_length.go
@@ -35,7 +35,7 @@ type ColumnMaximumCharacterLengthAdvisor struct {
// Check checks for maximum character length.
func (*ColumnMaximumCharacterLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_maximum_varchar_length.go b/backend/plugin/advisor/mysql/rule_column_maximum_varchar_length.go
index 0991a0a281..3dcfbb72bc 100644
--- a/backend/plugin/advisor/mysql/rule_column_maximum_varchar_length.go
+++ b/backend/plugin/advisor/mysql/rule_column_maximum_varchar_length.go
@@ -34,7 +34,7 @@ type ColumnMaximumVarcharLengthAdvisor struct {
// Check checks for maximum varchar length.
func (*ColumnMaximumVarcharLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_no_null.go b/backend/plugin/advisor/mysql/rule_column_no_null.go
index f3e62c52fa..42daab8c23 100644
--- a/backend/plugin/advisor/mysql/rule_column_no_null.go
+++ b/backend/plugin/advisor/mysql/rule_column_no_null.go
@@ -32,7 +32,7 @@ type ColumnNoNullAdvisor struct {
// Check checks for column no NULL value.
func (*ColumnNoNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, err := getANTLRTree(checkCtx)
+ root, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_require_charset.go b/backend/plugin/advisor/mysql/rule_column_require_charset.go
index 7adb2d9019..b1b8edab80 100644
--- a/backend/plugin/advisor/mysql/rule_column_require_charset.go
+++ b/backend/plugin/advisor/mysql/rule_column_require_charset.go
@@ -29,7 +29,7 @@ type ColumnRequireCharsetAdvisor struct {
}
func (*ColumnRequireCharsetAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_require_collation.go b/backend/plugin/advisor/mysql/rule_column_require_collation.go
index 1764622cd3..8c9184c376 100644
--- a/backend/plugin/advisor/mysql/rule_column_require_collation.go
+++ b/backend/plugin/advisor/mysql/rule_column_require_collation.go
@@ -28,7 +28,7 @@ type ColumnRequireCollationAdvisor struct {
}
func (*ColumnRequireCollationAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_require_default.go b/backend/plugin/advisor/mysql/rule_column_require_default.go
index 72cabdb441..6339b2d61e 100644
--- a/backend/plugin/advisor/mysql/rule_column_require_default.go
+++ b/backend/plugin/advisor/mysql/rule_column_require_default.go
@@ -31,7 +31,7 @@ type ColumnRequireDefaultAdvisor struct {
// Check checks for column default requirement.
func (*ColumnRequireDefaultAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_required.go b/backend/plugin/advisor/mysql/rule_column_required.go
index 38a9dd99d2..0d227354d0 100644
--- a/backend/plugin/advisor/mysql/rule_column_required.go
+++ b/backend/plugin/advisor/mysql/rule_column_required.go
@@ -35,7 +35,7 @@ type ColumnRequirementAdvisor struct {
// Check checks for the column requirement.
func (*ColumnRequirementAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, err := getANTLRTree(checkCtx)
+ list, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 73009ee121..d017bf3f71 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
@@ -32,7 +32,7 @@ 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, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_column_type_disallow_list.go b/backend/plugin/advisor/mysql/rule_column_type_disallow_list.go
index 6196258479..5552a6feec 100644
--- a/backend/plugin/advisor/mysql/rule_column_type_disallow_list.go
+++ b/backend/plugin/advisor/mysql/rule_column_type_disallow_list.go
@@ -33,7 +33,7 @@ type ColumnTypeDisallowListAdvisor struct {
// Check checks for column type restriction.
func (*ColumnTypeDisallowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_database_drop_empty_db.go b/backend/plugin/advisor/mysql/rule_database_drop_empty_db.go
index 511fb6a2e8..d24569063f 100644
--- a/backend/plugin/advisor/mysql/rule_database_drop_empty_db.go
+++ b/backend/plugin/advisor/mysql/rule_database_drop_empty_db.go
@@ -32,7 +32,7 @@ type DatabaseAllowDropIfEmptyAdvisor struct {
// Check checks for drop table naming convention.
func (*DatabaseAllowDropIfEmptyAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, err := getANTLRTree(checkCtx)
+ list, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/mysql/rule_disallow_procedure.go b/backend/plugin/advisor/mysql/rule_disallow_procedure.go
index e326b7cbbb..ff134e53a6 100644
--- a/backend/plugin/advisor/mysql/rule_disallow_procedure.go
+++ b/backend/plugin/advisor/mysql/rule_disallow_procedure.go
@@ -29,7 +29,7 @@ type ProcedureDisallowCreateAdvisor struct {
// Check checks for disallow create procedure.
func (*ProcedureDisallowCreateAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_event_disallow_create.go b/backend/plugin/advisor/mysql/rule_event_disallow_create.go
index ba2ec28fea..773e9dcb97 100644
--- a/backend/plugin/advisor/mysql/rule_event_disallow_create.go
+++ b/backend/plugin/advisor/mysql/rule_event_disallow_create.go
@@ -29,7 +29,7 @@ type EventDisallowCreateAdvisor struct {
// Check checks for disallow creating event.
func (*EventDisallowCreateAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_function_disallow_create.go b/backend/plugin/advisor/mysql/rule_function_disallow_create.go
index e39ea67f5b..25817513da 100644
--- a/backend/plugin/advisor/mysql/rule_function_disallow_create.go
+++ b/backend/plugin/advisor/mysql/rule_function_disallow_create.go
@@ -29,7 +29,7 @@ type FunctionDisallowCreateAdvisor struct {
// Check checks for disallow creating function.
func (*FunctionDisallowCreateAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_function_disallowed_list.go b/backend/plugin/advisor/mysql/rule_function_disallowed_list.go
index c18b576f3e..c97e8da0f2 100644
--- a/backend/plugin/advisor/mysql/rule_function_disallowed_list.go
+++ b/backend/plugin/advisor/mysql/rule_function_disallowed_list.go
@@ -30,7 +30,7 @@ type FunctionDisallowedListAdvisor struct {
}
func (*FunctionDisallowedListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_index_key_number_limit.go b/backend/plugin/advisor/mysql/rule_index_key_number_limit.go
index dbf2bbba4f..98120f5c17 100644
--- a/backend/plugin/advisor/mysql/rule_index_key_number_limit.go
+++ b/backend/plugin/advisor/mysql/rule_index_key_number_limit.go
@@ -33,7 +33,7 @@ type IndexKeyNumberLimitAdvisor struct {
// Check checks for index key number limit.
func (*IndexKeyNumberLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_index_no_duplicate_column.go b/backend/plugin/advisor/mysql/rule_index_no_duplicate_column.go
index d88830fe11..2d64faa78c 100644
--- a/backend/plugin/advisor/mysql/rule_index_no_duplicate_column.go
+++ b/backend/plugin/advisor/mysql/rule_index_no_duplicate_column.go
@@ -32,7 +32,7 @@ type IndexNoDuplicateColumnAdvisor struct {
// Check checks for no duplicate columns in index.
func (*IndexNoDuplicateColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_index_pk_type.go b/backend/plugin/advisor/mysql/rule_index_pk_type.go
index 03ac963376..aa7d4c6e26 100644
--- a/backend/plugin/advisor/mysql/rule_index_pk_type.go
+++ b/backend/plugin/advisor/mysql/rule_index_pk_type.go
@@ -34,7 +34,7 @@ type IndexPkTypeAdvisor struct {
// Check checks for correct type of PK.
func (*IndexPkTypeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 2e2a5e4fae..0666522af4 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
@@ -33,7 +33,7 @@ type IndexPrimaryKeyTypeAllowlistAdvisor struct {
// Check checks for primary key type allowlist.
func (*IndexPrimaryKeyTypeAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_index_total_number_limit.go b/backend/plugin/advisor/mysql/rule_index_total_number_limit.go
index 3aca1f8555..43967d9980 100644
--- a/backend/plugin/advisor/mysql/rule_index_total_number_limit.go
+++ b/backend/plugin/advisor/mysql/rule_index_total_number_limit.go
@@ -35,7 +35,7 @@ type IndexTotalNumberLimitAdvisor struct {
// Check checks for index total number limit.
func (*IndexTotalNumberLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_index_type_allow_list.go b/backend/plugin/advisor/mysql/rule_index_type_allow_list.go
index 9ac553254a..f65daf0619 100644
--- a/backend/plugin/advisor/mysql/rule_index_type_allow_list.go
+++ b/backend/plugin/advisor/mysql/rule_index_type_allow_list.go
@@ -29,7 +29,7 @@ type IndexTypeAllowListAdvisor struct {
}
func (*IndexTypeAllowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_index_type_no_blob.go b/backend/plugin/advisor/mysql/rule_index_type_no_blob.go
index 58e21a3a76..772f812125 100644
--- a/backend/plugin/advisor/mysql/rule_index_type_no_blob.go
+++ b/backend/plugin/advisor/mysql/rule_index_type_no_blob.go
@@ -34,7 +34,7 @@ type IndexTypeNoBlobAdvisor struct {
// Check checks for index type no blob.
func (*IndexTypeNoBlobAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 8a58010cae..7a95567402 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
@@ -33,7 +33,7 @@ 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, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_insert_must_specify_column.go b/backend/plugin/advisor/mysql/rule_insert_must_specify_column.go
index 10d141ac4f..a66e9d0cd9 100644
--- a/backend/plugin/advisor/mysql/rule_insert_must_specify_column.go
+++ b/backend/plugin/advisor/mysql/rule_insert_must_specify_column.go
@@ -30,7 +30,7 @@ type InsertMustSpecifyColumnAdvisor struct {
// Check checks for to enforce column specified.
func (*InsertMustSpecifyColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_insert_row_limit.go b/backend/plugin/advisor/mysql/rule_insert_row_limit.go
index 6913f24132..8066b6a3f5 100644
--- a/backend/plugin/advisor/mysql/rule_insert_row_limit.go
+++ b/backend/plugin/advisor/mysql/rule_insert_row_limit.go
@@ -32,7 +32,7 @@ type InsertRowLimitAdvisor struct {
// Check checks for insert row limit.
func (*InsertRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, err := getANTLRTree(checkCtx)
+ list, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_migration_compatibility.go b/backend/plugin/advisor/mysql/rule_migration_compatibility.go
index abf7175e80..e32ed1db05 100644
--- a/backend/plugin/advisor/mysql/rule_migration_compatibility.go
+++ b/backend/plugin/advisor/mysql/rule_migration_compatibility.go
@@ -31,7 +31,7 @@ type CompatibilityAdvisor struct {
// Check checks schema backward compatibility.
func (*CompatibilityAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_naming_auto_increment_column.go b/backend/plugin/advisor/mysql/rule_naming_auto_increment_column.go
index 02bd73611f..2ecbf24bfc 100644
--- a/backend/plugin/advisor/mysql/rule_naming_auto_increment_column.go
+++ b/backend/plugin/advisor/mysql/rule_naming_auto_increment_column.go
@@ -32,7 +32,7 @@ type NamingAutoIncrementColumnAdvisor struct {
// Check checks for auto-increment naming convention.
func (*NamingAutoIncrementColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_naming_column.go b/backend/plugin/advisor/mysql/rule_naming_column.go
index 46ecfc48f0..440d7e28a6 100644
--- a/backend/plugin/advisor/mysql/rule_naming_column.go
+++ b/backend/plugin/advisor/mysql/rule_naming_column.go
@@ -30,7 +30,7 @@ type NamingColumnConventionAdvisor struct {
// Check checks for column naming convention.
func (*NamingColumnConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, err := getANTLRTree(checkCtx)
+ list, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/mysql/rule_naming_foreign_key_convention.go b/backend/plugin/advisor/mysql/rule_naming_foreign_key_convention.go
index 0a0f413f54..6100e59d82 100644
--- a/backend/plugin/advisor/mysql/rule_naming_foreign_key_convention.go
+++ b/backend/plugin/advisor/mysql/rule_naming_foreign_key_convention.go
@@ -33,7 +33,7 @@ type NamingFKConventionAdvisor struct {
// Check checks for foreign key naming convention.
func (*NamingFKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, err := getANTLRTree(checkCtx)
+ root, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_naming_identifier_no_keyword.go b/backend/plugin/advisor/mysql/rule_naming_identifier_no_keyword.go
index 4c5f5032d6..4bcf1b200d 100644
--- a/backend/plugin/advisor/mysql/rule_naming_identifier_no_keyword.go
+++ b/backend/plugin/advisor/mysql/rule_naming_identifier_no_keyword.go
@@ -28,7 +28,7 @@ type NamingIdentifierNoKeywordAdvisor struct {
// Check checks for identifier naming convention without keyword.
func (*NamingIdentifierNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_naming_index_convention.go b/backend/plugin/advisor/mysql/rule_naming_index_convention.go
index 7af3ad6c3a..3fa31ef77e 100644
--- a/backend/plugin/advisor/mysql/rule_naming_index_convention.go
+++ b/backend/plugin/advisor/mysql/rule_naming_index_convention.go
@@ -41,7 +41,7 @@ type NamingIndexConventionAdvisor struct {
// Check checks for index naming convention.
func (*NamingIndexConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, err := getANTLRTree(checkCtx)
+ root, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_naming_table.go b/backend/plugin/advisor/mysql/rule_naming_table.go
index 3c24d7e266..b6f9e870bb 100644
--- a/backend/plugin/advisor/mysql/rule_naming_table.go
+++ b/backend/plugin/advisor/mysql/rule_naming_table.go
@@ -32,7 +32,7 @@ type NamingTableConventionAdvisor struct {
// Check checks for table naming convention.
func (*NamingTableConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, err := getANTLRTree(checkCtx)
+ list, err := advisor.GetANTLRParseResults(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.go
index 5bb19a9181..bfb526075e 100644
--- a/backend/plugin/advisor/mysql/rule_naming_unique_key_convention.go
+++ b/backend/plugin/advisor/mysql/rule_naming_unique_key_convention.go
@@ -33,7 +33,7 @@ type NamingUKConventionAdvisor struct {
// Check checks for index naming convention.
func (*NamingUKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, err := getANTLRTree(checkCtx)
+ root, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_online_migration.go b/backend/plugin/advisor/mysql/rule_online_migration.go
index 30cce58c68..6edda9cc5a 100644
--- a/backend/plugin/advisor/mysql/rule_online_migration.go
+++ b/backend/plugin/advisor/mysql/rule_online_migration.go
@@ -35,7 +35,7 @@ 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, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, errors.Errorf("failed to convert to StmtNode")
}
@@ -180,23 +180,11 @@ func (r *OnlineMigrationRule) OnExit(ctx antlr.ParserRuleContext, nodeType strin
}
func (r *OnlineMigrationRule) checkAlterStatement(ctx *mysql.AlterStatementContext) {
- r.start = common.ConvertANTLRPositionToPosition(
- &common.ANTLRPosition{
- Line: int32(ctx.GetStart().GetLine()),
- Column: int32(ctx.GetStart().GetColumn()),
- },
- r.checkCtx.Statements,
- )
+ r.start = common.ConvertANTLRLineToPosition(r.baseLine + ctx.GetStart().GetLine())
}
func (r *OnlineMigrationRule) exitAlterStatement(ctx *mysql.AlterStatementContext) {
- r.end = common.ConvertANTLRPositionToPosition(
- &common.ANTLRPosition{
- Line: int32(r.baseLine) + int32(ctx.GetStop().GetLine()),
- Column: int32(ctx.GetStop().GetColumn() + len([]rune(ctx.GetStop().GetText()))),
- },
- r.checkCtx.Statements,
- )
+ r.end = common.ConvertANTLRLineToPosition(r.baseLine + ctx.GetStop().GetLine())
if !r.ghostCompatible {
return
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.go
index ce367acc3c..066b510533 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
@@ -28,7 +28,7 @@ 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, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_statement_affected_row_limit.go b/backend/plugin/advisor/mysql/rule_statement_affected_row_limit.go
index dbaba52469..268c5367af 100644
--- a/backend/plugin/advisor/mysql/rule_statement_affected_row_limit.go
+++ b/backend/plugin/advisor/mysql/rule_statement_affected_row_limit.go
@@ -32,7 +32,7 @@ type StatementAffectedRowLimitAdvisor struct {
// Check checks for UPDATE/DELETE affected row limit.
func (*StatementAffectedRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_statement_disallow_using_filesort.go b/backend/plugin/advisor/mysql/rule_statement_disallow_using_filesort.go
index 25162030fd..787d03c0d7 100644
--- a/backend/plugin/advisor/mysql/rule_statement_disallow_using_filesort.go
+++ b/backend/plugin/advisor/mysql/rule_statement_disallow_using_filesort.go
@@ -30,7 +30,7 @@ type StatementDisallowUsingFilesortAdvisor struct {
}
func (*StatementDisallowUsingFilesortAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_statement_disallow_using_temporary.go b/backend/plugin/advisor/mysql/rule_statement_disallow_using_temporary.go
index d5f46579be..f3e0d8b69a 100644
--- a/backend/plugin/advisor/mysql/rule_statement_disallow_using_temporary.go
+++ b/backend/plugin/advisor/mysql/rule_statement_disallow_using_temporary.go
@@ -30,7 +30,7 @@ type StatementDisallowUsingTemporaryAdvisor struct {
}
func (*StatementDisallowUsingTemporaryAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.go b/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.go
index 21cf4ae638..e1793a6b2c 100644
--- a/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.go
+++ b/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.go
@@ -31,7 +31,7 @@ type StatementDmlDryRunAdvisor struct {
// Check checks for DML dry run.
func (*StatementDmlDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 7fc61959e6..52ee5d94e6 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
@@ -28,7 +28,7 @@ type StatementJoinStrictColumnAttrsAdvisor struct {
}
func (*StatementJoinStrictColumnAttrsAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 76b83b8c1e..51e66ddd33 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
@@ -27,7 +27,7 @@ type StatementMaximumJoinTableCountAdvisor struct {
}
func (*StatementMaximumJoinTableCountAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_statement_maximum_limit_value.go b/backend/plugin/advisor/mysql/rule_statement_maximum_limit_value.go
index 5e4f6cf7a0..0952e81453 100644
--- a/backend/plugin/advisor/mysql/rule_statement_maximum_limit_value.go
+++ b/backend/plugin/advisor/mysql/rule_statement_maximum_limit_value.go
@@ -31,7 +31,7 @@ type StatementMaximumLimitValueAdvisor struct {
}
func (*StatementMaximumLimitValueAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 505111660f..a7b93da033 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
@@ -24,7 +24,7 @@ type StatementMaximumStatementsInTransactionAdvisor struct {
}
func (*StatementMaximumStatementsInTransactionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_statement_merge_alter_table.go b/backend/plugin/advisor/mysql/rule_statement_merge_alter_table.go
index 5fab55e816..1d6b2dfa36 100644
--- a/backend/plugin/advisor/mysql/rule_statement_merge_alter_table.go
+++ b/backend/plugin/advisor/mysql/rule_statement_merge_alter_table.go
@@ -31,7 +31,7 @@ type StatementMergeAlterTableAdvisor struct {
// Check checks for merging ALTER TABLE statements.
func (*StatementMergeAlterTableAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index a12be82cc4..91c0041ea7 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
@@ -30,7 +30,7 @@ type StatementQueryMinumumPlanLevelAdvisor struct {
}
func (*StatementQueryMinumumPlanLevelAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 2a21c1b0a8..9b5e9e5f49 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
@@ -32,7 +32,7 @@ type StatementSelectFullTableScanAdvisor struct {
}
func (*StatementSelectFullTableScanAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 7e54782754..5772ac2765 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
@@ -26,7 +26,7 @@ type StatementWhereDisallowUsingFunctionAdvisor struct {
}
func (*StatementWhereDisallowUsingFunctionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 5228857b1b..2d4c72bdd5 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
@@ -27,7 +27,7 @@ type StatementWhereMaximumLogicalOperatorCountAdvisor struct {
}
func (*StatementWhereMaximumLogicalOperatorCountAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index e6ae92c95d..e40dc7167d 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
@@ -25,7 +25,7 @@ type StatementWhereNoEqualNullAdvisor struct {
}
func (*StatementWhereNoEqualNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_stmt_disallow_commit.go b/backend/plugin/advisor/mysql/rule_stmt_disallow_commit.go
index 7ff20f3357..367510f044 100644
--- a/backend/plugin/advisor/mysql/rule_stmt_disallow_commit.go
+++ b/backend/plugin/advisor/mysql/rule_stmt_disallow_commit.go
@@ -30,7 +30,7 @@ type StatementDisallowCommitAdvisor struct {
// Check checks for disallowing commit.
func (*StatementDisallowCommitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_stmt_disallow_limit.go b/backend/plugin/advisor/mysql/rule_stmt_disallow_limit.go
index 2ad638ed93..5a7258962b 100644
--- a/backend/plugin/advisor/mysql/rule_stmt_disallow_limit.go
+++ b/backend/plugin/advisor/mysql/rule_stmt_disallow_limit.go
@@ -29,7 +29,7 @@ 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, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_stmt_disallow_order_by.go b/backend/plugin/advisor/mysql/rule_stmt_disallow_order_by.go
index 41808b4fb1..6fbfecb868 100644
--- a/backend/plugin/advisor/mysql/rule_stmt_disallow_order_by.go
+++ b/backend/plugin/advisor/mysql/rule_stmt_disallow_order_by.go
@@ -29,7 +29,7 @@ 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, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_stmt_max_execution_time.go b/backend/plugin/advisor/mysql/rule_stmt_max_execution_time.go
index 197cb9b682..a40aa93668 100644
--- a/backend/plugin/advisor/mysql/rule_stmt_max_execution_time.go
+++ b/backend/plugin/advisor/mysql/rule_stmt_max_execution_time.go
@@ -29,7 +29,7 @@ type MaxExecutionTimeAdvisor struct {
}
func (*MaxExecutionTimeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(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.go
index fcc07457cb..09c02081ae 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
@@ -30,7 +30,7 @@ type NoLeadingWildcardLikeAdvisor struct {
// Check checks for no leading wildcard LIKE.
func (*NoLeadingWildcardLikeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, err := getANTLRTree(checkCtx)
+ root, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_stmt_no_select_all.go b/backend/plugin/advisor/mysql/rule_stmt_no_select_all.go
index b977340664..f51a825554 100644
--- a/backend/plugin/advisor/mysql/rule_stmt_no_select_all.go
+++ b/backend/plugin/advisor/mysql/rule_stmt_no_select_all.go
@@ -29,7 +29,7 @@ type NoSelectAllAdvisor struct {
// Check checks for no "select *".
func (*NoSelectAllAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, err := getANTLRTree(checkCtx)
+ root, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index d3cd5eeb72..ff78058f83 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
@@ -31,7 +31,7 @@ type RequireAlgorithmOrLockOptionAdvisor struct {
}
func (*RequireAlgorithmOrLockOptionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(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.go
index 58a4613176..05e694323a 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
@@ -30,7 +30,7 @@ type WhereRequirementForSelectAdvisor struct {
// Check checks for the WHERE clause requirement.
func (*WhereRequirementForSelectAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, err := getANTLRTree(checkCtx)
+ root, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, errors.Errorf("failed to convert to StmtNode")
}
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.go
index 6145973f17..d4a60e1ede 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
@@ -31,7 +31,7 @@ type WhereRequirementForUpdateDeleteAdvisor struct {
// Check checks for the WHERE clause requirement.
func (*WhereRequirementForUpdateDeleteAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(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.go
index 9d236653aa..1e090f55f9 100644
--- a/backend/plugin/advisor/mysql/rule_table_comment_convention.go
+++ b/backend/plugin/advisor/mysql/rule_table_comment_convention.go
@@ -30,7 +30,7 @@ type TableCommentConventionAdvisor struct {
// Check checks for table comment convention.
func (*TableCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, err := getANTLRTree(checkCtx)
+ list, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_ddl.go b/backend/plugin/advisor/mysql/rule_table_disallow_ddl.go
index 7ab3e4703e..aa633b4e40 100644
--- a/backend/plugin/advisor/mysql/rule_table_disallow_ddl.go
+++ b/backend/plugin/advisor/mysql/rule_table_disallow_ddl.go
@@ -28,7 +28,7 @@ type TableDisallowDDLAdvisor struct {
}
func (*TableDisallowDDLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, err := getANTLRTree(checkCtx)
+ list, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_dml.go b/backend/plugin/advisor/mysql/rule_table_disallow_dml.go
index e0cc9c7018..fbc10e68eb 100644
--- a/backend/plugin/advisor/mysql/rule_table_disallow_dml.go
+++ b/backend/plugin/advisor/mysql/rule_table_disallow_dml.go
@@ -28,7 +28,7 @@ type TableDisallowDMLAdvisor struct {
}
func (*TableDisallowDMLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, err := getANTLRTree(checkCtx)
+ list, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_partition.go b/backend/plugin/advisor/mysql/rule_table_disallow_partition.go
index 5ccd59fd8a..72687a3c8b 100644
--- a/backend/plugin/advisor/mysql/rule_table_disallow_partition.go
+++ b/backend/plugin/advisor/mysql/rule_table_disallow_partition.go
@@ -31,7 +31,7 @@ type TableDisallowPartitionAdvisor struct {
// Check checks for disallow table partition.
func (*TableDisallowPartitionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_set_charset.go b/backend/plugin/advisor/mysql/rule_table_disallow_set_charset.go
index 71ee7acf80..2e82c54c7a 100644
--- a/backend/plugin/advisor/mysql/rule_table_disallow_set_charset.go
+++ b/backend/plugin/advisor/mysql/rule_table_disallow_set_charset.go
@@ -27,7 +27,7 @@ type TableDisallowSetCharsetAdvisor struct {
}
func (*TableDisallowSetCharsetAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_trigger.go b/backend/plugin/advisor/mysql/rule_table_disallow_trigger.go
index f34391bcdb..f0501555c0 100644
--- a/backend/plugin/advisor/mysql/rule_table_disallow_trigger.go
+++ b/backend/plugin/advisor/mysql/rule_table_disallow_trigger.go
@@ -29,7 +29,7 @@ type TableDisallowTriggerAdvisor struct {
// Check checks for disallow table trigger.
func (*TableDisallowTriggerAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_table_drop_naming_convention.go b/backend/plugin/advisor/mysql/rule_table_drop_naming_convention.go
index 2fe3a1f059..7d72b9ea54 100644
--- a/backend/plugin/advisor/mysql/rule_table_drop_naming_convention.go
+++ b/backend/plugin/advisor/mysql/rule_table_drop_naming_convention.go
@@ -33,7 +33,7 @@ type TableDropNamingConventionAdvisor struct {
// Check checks for drop table naming convention.
func (*TableDropNamingConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, err := getANTLRTree(checkCtx)
+ list, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_table_limit_size.go b/backend/plugin/advisor/mysql/rule_table_limit_size.go
index ab1497e522..d6d7510d7c 100644
--- a/backend/plugin/advisor/mysql/rule_table_limit_size.go
+++ b/backend/plugin/advisor/mysql/rule_table_limit_size.go
@@ -37,7 +37,7 @@ func (*MaximumTableSizeAdvisor) Check(_ context.Context, checkCtx advisor.Contex
return nil, errors.New("number_payload is required for this rule")
}
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_table_no_duplicate_index.go b/backend/plugin/advisor/mysql/rule_table_no_duplicate_index.go
index 814e70b2be..5b3c0c45db 100644
--- a/backend/plugin/advisor/mysql/rule_table_no_duplicate_index.go
+++ b/backend/plugin/advisor/mysql/rule_table_no_duplicate_index.go
@@ -33,7 +33,7 @@ type TableNoDuplicateIndexAdvisor struct {
// Check checks for no duplicate index in table.
func (*TableNoDuplicateIndexAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_table_no_fk.go b/backend/plugin/advisor/mysql/rule_table_no_fk.go
index dc90b9d185..f3f27ca949 100644
--- a/backend/plugin/advisor/mysql/rule_table_no_fk.go
+++ b/backend/plugin/advisor/mysql/rule_table_no_fk.go
@@ -33,7 +33,7 @@ type TableNoFKAdvisor struct {
// Check checks table disallow foreign key.
func (*TableNoFKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, err := getANTLRTree(checkCtx)
+ root, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_table_require_charset.go b/backend/plugin/advisor/mysql/rule_table_require_charset.go
index 73c3ac4a38..dce2cd4c3c 100644
--- a/backend/plugin/advisor/mysql/rule_table_require_charset.go
+++ b/backend/plugin/advisor/mysql/rule_table_require_charset.go
@@ -28,7 +28,7 @@ type TableRequireCharsetAdvisor struct {
}
func (*TableRequireCharsetAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_table_require_collation.go b/backend/plugin/advisor/mysql/rule_table_require_collation.go
index db650e36ab..f34c2df84a 100644
--- a/backend/plugin/advisor/mysql/rule_table_require_collation.go
+++ b/backend/plugin/advisor/mysql/rule_table_require_collation.go
@@ -28,7 +28,7 @@ type TableRequireCollationAdvisor struct {
}
func (*TableRequireCollationAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_table_require_pk.go b/backend/plugin/advisor/mysql/rule_table_require_pk.go
index 0c7fb58427..3c95861f0e 100644
--- a/backend/plugin/advisor/mysql/rule_table_require_pk.go
+++ b/backend/plugin/advisor/mysql/rule_table_require_pk.go
@@ -37,7 +37,7 @@ type TableRequirePKAdvisor struct {
// Check checks table requires PK.
func (*TableRequirePKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, err := getANTLRTree(checkCtx)
+ root, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 730819175d..d444758225 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
@@ -34,7 +34,7 @@ type TableMaximumVarcharLengthAdvisor struct {
}
func (*TableMaximumVarcharLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/rule_use_innodb.go b/backend/plugin/advisor/mysql/rule_use_innodb.go
index f63e656614..5f58a851a5 100644
--- a/backend/plugin/advisor/mysql/rule_use_innodb.go
+++ b/backend/plugin/advisor/mysql/rule_use_innodb.go
@@ -35,7 +35,7 @@ type UseInnoDBAdvisor struct {
// Check checks for using InnoDB engine.
func (*UseInnoDBAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, err := getANTLRTree(checkCtx)
+ list, err := advisor.GetANTLRParseResults(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.go
index 42f361be41..7170da122f 100644
--- a/backend/plugin/advisor/mysql/rule_view_disallow_create.go
+++ b/backend/plugin/advisor/mysql/rule_view_disallow_create.go
@@ -29,7 +29,7 @@ type ViewDisallowCreateAdvisor struct {
// Check checks for disallow creating view.
func (*ViewDisallowCreateAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/mysql/utils.go b/backend/plugin/advisor/mysql/utils.go
index 68fac0ac3a..c6d1afab40 100644
--- a/backend/plugin/advisor/mysql/utils.go
+++ b/backend/plugin/advisor/mysql/utils.go
@@ -7,10 +7,6 @@ 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
@@ -92,29 +88,3 @@ 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.go
index 4b5aae384b..efa118d77f 100644
--- a/backend/plugin/advisor/oceanbase/advisor_disallow_offline_ddl.go
+++ b/backend/plugin/advisor/oceanbase/advisor_disallow_offline_ddl.go
@@ -33,7 +33,7 @@ type DisallowOfflineDdlAdvisor struct {
// Check checks for disallow Offline DDL.
func (*DisallowOfflineDdlAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oceanbase/advisor_insert_row_limit.go b/backend/plugin/advisor/oceanbase/advisor_insert_row_limit.go
index ae4e1f7123..0bcaa55fca 100644
--- a/backend/plugin/advisor/oceanbase/advisor_insert_row_limit.go
+++ b/backend/plugin/advisor/oceanbase/advisor_insert_row_limit.go
@@ -31,7 +31,7 @@ type InsertRowLimitAdvisor struct {
// Check checks for insert row limit.
func (*InsertRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, err := getANTLRTree(checkCtx)
+ list, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oceanbase/advisor_statement_affected_row_limit.go b/backend/plugin/advisor/oceanbase/advisor_statement_affected_row_limit.go
index 99665b3318..9b075092c6 100644
--- a/backend/plugin/advisor/oceanbase/advisor_statement_affected_row_limit.go
+++ b/backend/plugin/advisor/oceanbase/advisor_statement_affected_row_limit.go
@@ -32,7 +32,7 @@ type StatementAffectedRowLimitAdvisor struct {
// Check checks for UPDATE/DELETE affected row limit.
func (*StatementAffectedRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oceanbase/utils.go b/backend/plugin/advisor/oceanbase/utils.go
deleted file mode 100644
index 60d40fe58d..0000000000
--- a/backend/plugin/advisor/oceanbase/utils.go
+++ /dev/null
@@ -1,29 +0,0 @@
-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.go
index e224163d32..d58bb453b1 100644
--- a/backend/plugin/advisor/oracle/rule_builtin_prior_backup_check.go
+++ b/backend/plugin/advisor/oracle/rule_builtin_prior_backup_check.go
@@ -5,7 +5,6 @@ import (
"fmt"
"github.com/antlr4-go/antlr/v4"
- "github.com/pkg/errors"
"github.com/bytebase/parser/plsql"
@@ -13,6 +12,7 @@ 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"
)
@@ -32,7 +32,7 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx adv
return nil, nil
}
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
@@ -80,25 +80,17 @@ type statementInfo struct {
table *TableReference
}
-func prepareTransformation(databaseName, statement string) ([]statementInfo, error) {
- results, err := plsqlparser.ParsePLSQL(statement)
- if err != nil {
- return nil, errors.Wrap(err, "failed to parse PLSQL")
- }
- if len(results) == 0 {
- return nil, errors.New("no parse results")
- }
-
+func prepareTransformation(databaseName string, parseResults []*base.ParseResult) []statementInfo {
extractor := &dmlExtractor{
databaseName: databaseName,
}
// Walk each parse result tree to extract DML statements
- for _, result := range results {
+ for _, result := range parseResults {
antlr.ParseTreeWalkerDefault.Walk(extractor, result.Tree)
}
- return extractor.dmls, nil
+ return extractor.dmls
}
func IsTopLevelStatement(ctx antlr.Tree) bool {
@@ -249,7 +241,7 @@ func (r *StatementPriorBackupCheckRule) handleUnitStatement(ctx *plsql.Unit_stat
func (r *StatementPriorBackupCheckRule) handleSQLScriptExit() {
var adviceList []*storepb.Advice
- if len(r.checkCtx.Statements) > common.MaxSheetCheckSize {
+ if r.checkCtx.StatementsTotalSize > common.MaxSheetCheckSize {
adviceList = append(adviceList, &storepb.Advice{
Status: r.level,
Title: r.title,
@@ -282,10 +274,11 @@ func (r *StatementPriorBackupCheckRule) handleSQLScriptExit() {
})
}
- statementInfoList, err := prepareTransformation(r.checkCtx.DBSchema.Name, r.checkCtx.Statements)
+ parseResults, err := advisor.GetANTLRParseResults(r.checkCtx)
if err != nil {
return
}
+ statementInfoList := prepareTransformation(r.checkCtx.DBSchema.Name, parseResults)
groupByTable := make(map[string][]statementInfo)
for _, item := range statementInfoList {
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.go
index 37249020d6..c8a3a08241 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
@@ -29,7 +29,7 @@ type ColumnAddNotNullColumnRequireDefaultAdvisor struct {
// Check checks for adding not null column requires default.
func (*ColumnAddNotNullColumnRequireDefaultAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_column_comment_convention.go b/backend/plugin/advisor/oracle/rule_column_comment_convention.go
index 182b660169..ed7ebfdc13 100644
--- a/backend/plugin/advisor/oracle/rule_column_comment_convention.go
+++ b/backend/plugin/advisor/oracle/rule_column_comment_convention.go
@@ -28,7 +28,7 @@ type ColumnCommentConventionAdvisor struct {
}
func (*ColumnCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_column_maximum_character_length.go b/backend/plugin/advisor/oracle/rule_column_maximum_character_length.go
index e9d6e085c0..71d78c12c7 100644
--- a/backend/plugin/advisor/oracle/rule_column_maximum_character_length.go
+++ b/backend/plugin/advisor/oracle/rule_column_maximum_character_length.go
@@ -32,7 +32,7 @@ type ColumnMaximumCharacterLengthAdvisor struct {
// Check checks for maximum character length.
func (*ColumnMaximumCharacterLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_column_maximum_varchar_length.go b/backend/plugin/advisor/oracle/rule_column_maximum_varchar_length.go
index b84d3c49d6..8add5f019d 100644
--- a/backend/plugin/advisor/oracle/rule_column_maximum_varchar_length.go
+++ b/backend/plugin/advisor/oracle/rule_column_maximum_varchar_length.go
@@ -32,7 +32,7 @@ type ColumnMaximumVarcharLengthAdvisor struct {
// Check checks for maximum varchar length.
func (*ColumnMaximumVarcharLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_column_no_null.go b/backend/plugin/advisor/oracle/rule_column_no_null.go
index 4e94edf3af..e0e3ecba6b 100644
--- a/backend/plugin/advisor/oracle/rule_column_no_null.go
+++ b/backend/plugin/advisor/oracle/rule_column_no_null.go
@@ -31,7 +31,7 @@ type ColumnNoNullAdvisor struct {
// Check checks for column no NULL value.
func (*ColumnNoNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_column_require.go b/backend/plugin/advisor/oracle/rule_column_require.go
index 7c24d1e035..e229a1f22d 100644
--- a/backend/plugin/advisor/oracle/rule_column_require.go
+++ b/backend/plugin/advisor/oracle/rule_column_require.go
@@ -33,7 +33,7 @@ type ColumnRequireAdvisor struct {
// Check checks for column requirement.
func (*ColumnRequireAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_column_require_default.go b/backend/plugin/advisor/oracle/rule_column_require_default.go
index fe2bf6fd75..aa87996b0b 100644
--- a/backend/plugin/advisor/oracle/rule_column_require_default.go
+++ b/backend/plugin/advisor/oracle/rule_column_require_default.go
@@ -30,7 +30,7 @@ type ColumnRequireDefaultAdvisor struct {
// Check checks for column default requirement.
func (*ColumnRequireDefaultAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_column_type_disallow_list.go b/backend/plugin/advisor/oracle/rule_column_type_disallow_list.go
index c7835c49d6..33f6323ed1 100644
--- a/backend/plugin/advisor/oracle/rule_column_type_disallow_list.go
+++ b/backend/plugin/advisor/oracle/rule_column_type_disallow_list.go
@@ -30,7 +30,7 @@ type ColumnTypeDisallowListAdvisor struct {
// Check checks for column type disallow list.
func (*ColumnTypeDisallowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_index_key_number_limit.go b/backend/plugin/advisor/oracle/rule_index_key_number_limit.go
index 9d938d1908..e35dcd7994 100644
--- a/backend/plugin/advisor/oracle/rule_index_key_number_limit.go
+++ b/backend/plugin/advisor/oracle/rule_index_key_number_limit.go
@@ -31,7 +31,7 @@ type IndexKeyNumberLimitAdvisor struct {
// Check checks for index key number limit.
func (*IndexKeyNumberLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_insert_must_specify_column.go b/backend/plugin/advisor/oracle/rule_insert_must_specify_column.go
index 2eb6239032..b6cc7f6605 100644
--- a/backend/plugin/advisor/oracle/rule_insert_must_specify_column.go
+++ b/backend/plugin/advisor/oracle/rule_insert_must_specify_column.go
@@ -27,7 +27,7 @@ type InsertMustSpecifyColumnAdvisor struct {
// Check checks for to enforce column specified.
func (*InsertMustSpecifyColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_naming_identifier_case.go b/backend/plugin/advisor/oracle/rule_naming_identifier_case.go
index c9a0ee3a91..b649d9e04d 100644
--- a/backend/plugin/advisor/oracle/rule_naming_identifier_case.go
+++ b/backend/plugin/advisor/oracle/rule_naming_identifier_case.go
@@ -29,7 +29,7 @@ type NamingIdentifierCaseAdvisor struct {
// Check checks for identifier case.
func (*NamingIdentifierCaseAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_naming_identifier_no_keyword.go b/backend/plugin/advisor/oracle/rule_naming_identifier_no_keyword.go
index 8fc2b04f80..03a8041f64 100644
--- a/backend/plugin/advisor/oracle/rule_naming_identifier_no_keyword.go
+++ b/backend/plugin/advisor/oracle/rule_naming_identifier_no_keyword.go
@@ -30,7 +30,7 @@ type NamingIdentifierNoKeywordAdvisor struct {
// Check checks for identifier naming convention without keyword.
func (*NamingIdentifierNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_naming_table.go b/backend/plugin/advisor/oracle/rule_naming_table.go
index 067e3be90a..c99de6541a 100644
--- a/backend/plugin/advisor/oracle/rule_naming_table.go
+++ b/backend/plugin/advisor/oracle/rule_naming_table.go
@@ -30,7 +30,7 @@ type NamingTableAdvisor struct {
// Check checks for table naming convention.
func (*NamingTableAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_naming_table_no_keyword.go b/backend/plugin/advisor/oracle/rule_naming_table_no_keyword.go
index df5535a997..ca62d5c6ce 100644
--- a/backend/plugin/advisor/oracle/rule_naming_table_no_keyword.go
+++ b/backend/plugin/advisor/oracle/rule_naming_table_no_keyword.go
@@ -30,7 +30,7 @@ type NamingTableNoKeywordAdvisor struct {
// Check checks for table naming convention without keyword.
func (*NamingTableNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_select_no_select_all.go b/backend/plugin/advisor/oracle/rule_select_no_select_all.go
index 18b21ae177..ca26c9b12d 100644
--- a/backend/plugin/advisor/oracle/rule_select_no_select_all.go
+++ b/backend/plugin/advisor/oracle/rule_select_no_select_all.go
@@ -27,7 +27,7 @@ type SelectNoSelectAllAdvisor struct {
// Check checks for no select all.
func (*SelectNoSelectAllAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.go b/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.go
index 08b8d83990..25ef8aaa04 100644
--- a/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.go
+++ b/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.go
@@ -28,7 +28,7 @@ type StatementDmlDryRunAdvisor struct {
}
func (*StatementDmlDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_table_comment_convention.go b/backend/plugin/advisor/oracle/rule_table_comment_convention.go
index f474faece4..22f06f22f2 100644
--- a/backend/plugin/advisor/oracle/rule_table_comment_convention.go
+++ b/backend/plugin/advisor/oracle/rule_table_comment_convention.go
@@ -28,7 +28,7 @@ type TableCommentConventionAdvisor struct {
}
func (*TableCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_table_no_foreign_key.go b/backend/plugin/advisor/oracle/rule_table_no_foreign_key.go
index da6618aa1a..784ea6ea8f 100644
--- a/backend/plugin/advisor/oracle/rule_table_no_foreign_key.go
+++ b/backend/plugin/advisor/oracle/rule_table_no_foreign_key.go
@@ -29,7 +29,7 @@ type TableNoForeignKeyAdvisor struct {
// Check checks for table disallow foreign key.
func (*TableNoForeignKeyAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_table_require_pk.go b/backend/plugin/advisor/oracle/rule_table_require_pk.go
index eff9bab360..fe13f7c066 100644
--- a/backend/plugin/advisor/oracle/rule_table_require_pk.go
+++ b/backend/plugin/advisor/oracle/rule_table_require_pk.go
@@ -28,7 +28,7 @@ type TableRequirePKAdvisor struct {
// Check checks table requires PK.
func (*TableRequirePKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index c2c10b9d23..6d3333180f 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
@@ -28,7 +28,7 @@ type WhereNoLeadingWildcardLikeAdvisor struct {
// Check checks for no leading wildcard LIKE.
func (*WhereNoLeadingWildcardLikeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/rule_where_require_for_select.go b/backend/plugin/advisor/oracle/rule_where_require_for_select.go
index 041bbd54ad..e8de2147ac 100644
--- a/backend/plugin/advisor/oracle/rule_where_require_for_select.go
+++ b/backend/plugin/advisor/oracle/rule_where_require_for_select.go
@@ -28,7 +28,7 @@ type WhereRequireForSelectAdvisor struct {
// Check checks for WHERE clause requirement.
func (*WhereRequireForSelectAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
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.go
index 9e9bfca30d..a59ab78702 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
@@ -27,7 +27,7 @@ type WhereRequireForUpdateDeleteAdvisor struct {
// Check checks for WHERE clause requirement.
func (*WhereRequireForUpdateDeleteAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, err := getANTLRTree(checkCtx)
+ stmtList, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
diff --git a/backend/plugin/advisor/oracle/utils.go b/backend/plugin/advisor/oracle/utils.go
deleted file mode 100644
index 2fd0173df4..0000000000
--- a/backend/plugin/advisor/oracle/utils.go
+++ /dev/null
@@ -1,28 +0,0 @@
-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/advisor_builtin_prior_backup_check.go b/backend/plugin/advisor/pg/advisor_builtin_prior_backup_check.go
index 6ac2fe0150..cb7e905ee6 100644
--- a/backend/plugin/advisor/pg/advisor_builtin_prior_backup_check.go
+++ b/backend/plugin/advisor/pg/advisor_builtin_prior_backup_check.go
@@ -15,6 +15,7 @@ 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/pg"
)
@@ -40,6 +41,11 @@ func (*BuiltinPriorBackupCheckAdvisor) Check(_ context.Context, checkCtx advisor
return nil, nil
}
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
+ if err != nil {
+ return nil, err
+ }
+
level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)
if err != nil {
return nil, err
@@ -49,28 +55,21 @@ func (*BuiltinPriorBackupCheckAdvisor) Check(_ context.Context, checkCtx advisor
var adviceList []*storepb.Advice
// Check for DDL statements in DML context
- parseResults, err := getANTLRTree(checkCtx)
- if err != nil {
- return nil, err
- }
-
- ddlRule := &ddlRule{
- BaseRule: BaseRule{
- level: level,
- title: title,
- },
- }
- checker := NewGenericChecker([]Rule{ddlRule})
+ for _, stmtInfo := range stmtInfos {
+ rule := &ddlRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: title,
+ },
+ tokens: stmtInfo.Tokens,
+ }
+ rule.SetBaseLine(stmtInfo.BaseLine)
- for _, parseResult := range parseResults {
- ddlRule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- ddlRule.tokens = parseResult.Tokens
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ checker := NewGenericChecker([]Rule{rule})
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- adviceList = append(adviceList, checker.GetAdviceList()...)
-
// Check if backup schema exists
schemaName := common.BackupDatabaseNameOfEngine(storepb.Engine_POSTGRES)
if checkCtx.OriginalMetadata.GetSchemaMetadata(schemaName) == nil {
@@ -84,10 +83,11 @@ func (*BuiltinPriorBackupCheckAdvisor) Check(_ context.Context, checkCtx advisor
}
// Check statement type consistency for each table
- statementInfoList, err := prepareTransformation(checkCtx.Statements)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
- return nil, errors.Wrapf(err, "failed to prepare transformation")
+ return nil, errors.Wrapf(err, "failed to get parse results")
}
+ statementInfoList := prepareTransformation(parseResults)
groupByTable := make(map[string][]statementInfo)
for _, item := range statementInfoList {
@@ -223,7 +223,6 @@ func isDDLStatement(ctx antlr.Tree) bool {
// ddlRule checks for DDL statements in DML context
type ddlRule struct {
BaseRule
-
tokens *antlr.CommonTokenStream
}
@@ -239,10 +238,6 @@ func (*ddlRule) OnExit(_ antlr.ParserRuleContext, _ string) error {
return nil
}
-func (r *ddlRule) getStatementText(ctx antlr.ParserRuleContext) string {
- return r.tokens.GetTextFromRuleContext(ctx)
-}
-
func (r *ddlRule) handleEveryRule(ctx antlr.ParserRuleContext) error {
// Check if this is a top-level DDL statement
if !isTopLevel(ctx.GetParent()) {
@@ -253,7 +248,7 @@ func (r *ddlRule) handleEveryRule(ctx antlr.ParserRuleContext) error {
r.AddAdvice(&storepb.Advice{
Status: r.level,
Title: r.title,
- Content: fmt.Sprintf("Data change can only run DML, \"%s\" is not DML", r.getStatementText(ctx)),
+ Content: fmt.Sprintf("Data change can only run DML, \"%s\" is not DML", getTextFromTokens(r.tokens, ctx)),
Code: code.BuiltinPriorBackupCheck.Int32(),
StartPosition: &storepb.Position{
Line: int32(ctx.GetStart().GetLine()),
@@ -289,17 +284,12 @@ type statementInfo struct {
table *TableReference
}
-func prepareTransformation(statement string) ([]statementInfo, error) {
- parseResults, err := pg.ParsePostgreSQL(statement)
- if err != nil {
- return nil, errors.Wrap(err, "failed to parse statement")
- }
-
+func prepareTransformation(parseResults []*base.ParseResult) []statementInfo {
extractor := &dmlExtractor{}
for _, parseResult := range parseResults {
antlr.ParseTreeWalkerDefault.Walk(extractor, parseResult.Tree)
}
- return extractor.dmls, nil
+ return extractor.dmls
}
type dmlExtractor struct {
diff --git a/backend/plugin/advisor/pg/advisor_collation_allowlist.go b/backend/plugin/advisor/pg/advisor_collation_allowlist.go
index 5c4e67bd5a..9c458d600c 100644
--- a/backend/plugin/advisor/pg/advisor_collation_allowlist.go
+++ b/backend/plugin/advisor/pg/advisor_collation_allowlist.go
@@ -27,7 +27,7 @@ type CollationAllowlistAdvisor struct {
// Check checks for collation allowlist.
func (*CollationAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_column_comment_convention.go b/backend/plugin/advisor/pg/advisor_column_comment_convention.go
index 3e06784681..378be881fa 100644
--- a/backend/plugin/advisor/pg/advisor_column_comment_convention.go
+++ b/backend/plugin/advisor/pg/advisor_column_comment_convention.go
@@ -27,7 +27,7 @@ type ColumnCommentConventionAdvisor struct {
}
func (*ColumnCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_column_default_disallow_volatile.go b/backend/plugin/advisor/pg/advisor_column_default_disallow_volatile.go
index 1a87012844..6695074ec3 100644
--- a/backend/plugin/advisor/pg/advisor_column_default_disallow_volatile.go
+++ b/backend/plugin/advisor/pg/advisor_column_default_disallow_volatile.go
@@ -30,7 +30,7 @@ type ColumnDefaultDisallowVolatileAdvisor struct {
// Check checks for column default volatile functions.
func (*ColumnDefaultDisallowVolatileAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_column_disallow_changing_type.go b/backend/plugin/advisor/pg/advisor_column_disallow_changing_type.go
index c6ad425751..bc7bc3e9db 100644
--- a/backend/plugin/advisor/pg/advisor_column_disallow_changing_type.go
+++ b/backend/plugin/advisor/pg/advisor_column_disallow_changing_type.go
@@ -28,7 +28,7 @@ type ColumnDisallowChangingTypeAdvisor struct {
// Check checks for disallow changing column type.
func (*ColumnDisallowChangingTypeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_column_maximum_character_length.go b/backend/plugin/advisor/pg/advisor_column_maximum_character_length.go
index 0dbdd2b235..40d5fa130d 100644
--- a/backend/plugin/advisor/pg/advisor_column_maximum_character_length.go
+++ b/backend/plugin/advisor/pg/advisor_column_maximum_character_length.go
@@ -31,7 +31,7 @@ type ColumnMaximumCharacterLengthAdvisor struct {
// Check checks for maximum character length.
func (*ColumnMaximumCharacterLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_column_no_null.go b/backend/plugin/advisor/pg/advisor_column_no_null.go
index 24bb87218d..ee2a498773 100644
--- a/backend/plugin/advisor/pg/advisor_column_no_null.go
+++ b/backend/plugin/advisor/pg/advisor_column_no_null.go
@@ -30,7 +30,7 @@ type ColumnNoNullAdvisor struct {
// Check checks for column no NULL value.
func (*ColumnNoNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_column_require_default.go b/backend/plugin/advisor/pg/advisor_column_require_default.go
index 53a646ba30..93af1b79e4 100644
--- a/backend/plugin/advisor/pg/advisor_column_require_default.go
+++ b/backend/plugin/advisor/pg/advisor_column_require_default.go
@@ -30,7 +30,7 @@ type ColumnRequireDefaultAdvisor struct {
// Check checks for column default requirement.
func (*ColumnRequireDefaultAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_column_required.go b/backend/plugin/advisor/pg/advisor_column_required.go
index a83d721169..38289c7c8e 100644
--- a/backend/plugin/advisor/pg/advisor_column_required.go
+++ b/backend/plugin/advisor/pg/advisor_column_required.go
@@ -35,7 +35,7 @@ type ColumnRequirementAdvisor struct {
// Check checks for the column requirement.
func (*ColumnRequirementAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_column_type_disallow_list.go b/backend/plugin/advisor/pg/advisor_column_type_disallow_list.go
index a78ab596d8..c7ea636e0b 100644
--- a/backend/plugin/advisor/pg/advisor_column_type_disallow_list.go
+++ b/backend/plugin/advisor/pg/advisor_column_type_disallow_list.go
@@ -30,7 +30,7 @@ type ColumnTypeDisallowListAdvisor struct {
// Check checks for column type restriction.
func (*ColumnTypeDisallowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_comment_convention.go b/backend/plugin/advisor/pg/advisor_comment_convention.go
index 9f80c1654a..b6df82d7e5 100644
--- a/backend/plugin/advisor/pg/advisor_comment_convention.go
+++ b/backend/plugin/advisor/pg/advisor_comment_convention.go
@@ -29,7 +29,7 @@ type CommentConventionAdvisor struct {
// Check checks for comment length.
func (*CommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_encoding_allowlist.go b/backend/plugin/advisor/pg/advisor_encoding_allowlist.go
index da3bec7585..a988bfb36d 100644
--- a/backend/plugin/advisor/pg/advisor_encoding_allowlist.go
+++ b/backend/plugin/advisor/pg/advisor_encoding_allowlist.go
@@ -28,7 +28,7 @@ type EncodingAllowlistAdvisor struct {
// Check checks for encoding allowlist.
func (*EncodingAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_index_create_concurrently.go b/backend/plugin/advisor/pg/advisor_index_create_concurrently.go
index e318264176..2a412756fd 100644
--- a/backend/plugin/advisor/pg/advisor_index_create_concurrently.go
+++ b/backend/plugin/advisor/pg/advisor_index_create_concurrently.go
@@ -27,7 +27,7 @@ type IndexConcurrentlyAdvisor struct {
// Check checks for to create index concurrently.
func (*IndexConcurrentlyAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_index_key_number_limit.go b/backend/plugin/advisor/pg/advisor_index_key_number_limit.go
index 6981db91b6..41e5c394f8 100644
--- a/backend/plugin/advisor/pg/advisor_index_key_number_limit.go
+++ b/backend/plugin/advisor/pg/advisor_index_key_number_limit.go
@@ -31,7 +31,7 @@ type IndexKeyNumberLimitAdvisor struct {
// Check checks for index key number limit.
func (*IndexKeyNumberLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_index_no_duplicate_column.go b/backend/plugin/advisor/pg/advisor_index_no_duplicate_column.go
index 13f2c4c85b..0f363328b0 100644
--- a/backend/plugin/advisor/pg/advisor_index_no_duplicate_column.go
+++ b/backend/plugin/advisor/pg/advisor_index_no_duplicate_column.go
@@ -29,7 +29,7 @@ type IndexNoDuplicateColumnAdvisor struct {
// Check checks for no duplicate columns in index.
func (*IndexNoDuplicateColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_index_primary_key_type_allowlist.go b/backend/plugin/advisor/pg/advisor_index_primary_key_type_allowlist.go
index eb740bf4c6..94011d134c 100644
--- a/backend/plugin/advisor/pg/advisor_index_primary_key_type_allowlist.go
+++ b/backend/plugin/advisor/pg/advisor_index_primary_key_type_allowlist.go
@@ -29,7 +29,7 @@ type IndexPrimaryKeyTypeAllowlistAdvisor struct {
// Check checks for primary key type allowlist.
func (*IndexPrimaryKeyTypeAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_index_total_number_limit.go b/backend/plugin/advisor/pg/advisor_index_total_number_limit.go
index e27023201c..809a31b954 100644
--- a/backend/plugin/advisor/pg/advisor_index_total_number_limit.go
+++ b/backend/plugin/advisor/pg/advisor_index_total_number_limit.go
@@ -32,7 +32,7 @@ type IndexTotalNumberLimitAdvisor struct {
// Check checks for index total number limit.
func (*IndexTotalNumberLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_insert_disallow_order_by_rand.go b/backend/plugin/advisor/pg/advisor_insert_disallow_order_by_rand.go
index 94a6cb2905..47e6a4d15b 100644
--- a/backend/plugin/advisor/pg/advisor_insert_disallow_order_by_rand.go
+++ b/backend/plugin/advisor/pg/advisor_insert_disallow_order_by_rand.go
@@ -28,7 +28,7 @@ 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) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -38,29 +38,29 @@ func (*InsertDisallowOrderByRandAdvisor) Check(_ context.Context, checkCtx advis
return nil, err
}
- rule := &insertDisallowOrderByRandRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- statementsText: checkCtx.Statements,
- }
-
- checker := NewGenericChecker([]Rule{rule})
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &insertDisallowOrderByRandRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ tokens: stmtInfo.Tokens,
+ }
+ rule.SetBaseLine(stmtInfo.BaseLine)
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ checker := NewGenericChecker([]Rule{rule})
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type insertDisallowOrderByRandRule struct {
BaseRule
- statementsText string
+ tokens *antlr.CommonTokenStream
}
func (*insertDisallowOrderByRandRule) Name() string {
@@ -98,14 +98,11 @@ func (r *insertDisallowOrderByRandRule) handleInsertstmt(ctx antlr.ParserRuleCon
// Check for ORDER BY random() in the SELECT statement
if r.hasOrderByRandom(insertstmtCtx.Insert_rest().Selectstmt()) {
- // Extract the statement text from the original statements
- stmtText := extractStatementText(r.statementsText, insertstmtCtx.GetStart().GetLine(), insertstmtCtx.GetStop().GetLine())
-
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.InsertUseOrderByRand.Int32(),
Title: r.title,
- Content: fmt.Sprintf("The INSERT statement uses ORDER BY random() or random_between(), related statement \"%s\"", stmtText),
+ Content: fmt.Sprintf("The INSERT statement uses ORDER BY random() or random_between(), related statement \"%s\"", getTextFromTokens(r.tokens, insertstmtCtx)),
StartPosition: &storepb.Position{
Line: int32(insertstmtCtx.GetStart().GetLine()),
Column: 0,
diff --git a/backend/plugin/advisor/pg/advisor_insert_must_specify_column.go b/backend/plugin/advisor/pg/advisor_insert_must_specify_column.go
index 8a7cd41d88..3398fa2ccc 100644
--- a/backend/plugin/advisor/pg/advisor_insert_must_specify_column.go
+++ b/backend/plugin/advisor/pg/advisor_insert_must_specify_column.go
@@ -27,7 +27,7 @@ type InsertMustSpecifyColumnAdvisor struct {
// Check checks for to enforce column specified.
func (*InsertMustSpecifyColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -37,29 +37,28 @@ func (*InsertMustSpecifyColumnAdvisor) Check(_ context.Context, checkCtx advisor
return nil, err
}
- rule := &insertMustSpecifyColumnRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- statementsText: checkCtx.Statements,
- }
-
- checker := NewGenericChecker([]Rule{rule})
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &insertMustSpecifyColumnRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ tokens: stmtInfo.Tokens,
+ }
+ rule.SetBaseLine(stmtInfo.BaseLine)
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ checker := NewGenericChecker([]Rule{rule})
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type insertMustSpecifyColumnRule struct {
BaseRule
-
- statementsText string
+ tokens *antlr.CommonTokenStream
}
func (*insertMustSpecifyColumnRule) Name() string {
@@ -102,14 +101,11 @@ func (r *insertMustSpecifyColumnRule) handleInsertstmt(ctx antlr.ParserRuleConte
hasColumnList := insertstmtCtx.Insert_rest().Insert_column_list() != nil
if !hasColumnList {
- // Extract the statement text from the original statements
- stmtText := extractStatementText(r.statementsText, insertstmtCtx.GetStart().GetLine(), insertstmtCtx.GetStop().GetLine())
-
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.InsertNotSpecifyColumn.Int32(),
Title: r.title,
- Content: fmt.Sprintf("The INSERT statement must specify columns but \"%s\" does not", stmtText),
+ Content: fmt.Sprintf("The INSERT statement must specify columns but \"%s\" does not", getTextFromTokens(r.tokens, insertstmtCtx)),
StartPosition: &storepb.Position{
Line: int32(insertstmtCtx.GetStart().GetLine()),
Column: 0,
diff --git a/backend/plugin/advisor/pg/advisor_insert_row_limit.go b/backend/plugin/advisor/pg/advisor_insert_row_limit.go
index 20ea107038..ae5ae6347d 100644
--- a/backend/plugin/advisor/pg/advisor_insert_row_limit.go
+++ b/backend/plugin/advisor/pg/advisor_insert_row_limit.go
@@ -32,7 +32,7 @@ type InsertRowLimitAdvisor struct {
// Check checks for the INSERT row limit.
func (*InsertRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -46,30 +46,31 @@ func (*InsertRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Contex
return nil, errors.New("number_payload is required for this rule")
}
- rule := &insertRowLimitRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- maxRow: int(numberPayload.Number),
- driver: checkCtx.Driver,
- ctx: ctx,
- statementsText: checkCtx.Statements,
- UsePostgresDatabaseOwner: checkCtx.UsePostgresDatabaseOwner,
+ if int(numberPayload.Number) <= 0 {
+ return nil, nil
}
- if int(numberPayload.Number) > 0 {
- checker := NewGenericChecker([]Rule{rule})
-
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &insertRowLimitRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ maxRow: int(numberPayload.Number),
+ driver: checkCtx.Driver,
+ ctx: ctx,
+ tokens: stmtInfo.Tokens,
+ UsePostgresDatabaseOwner: checkCtx.UsePostgresDatabaseOwner,
}
- return checker.GetAdviceList(), nil
+ rule.SetBaseLine(stmtInfo.BaseLine)
+
+ checker := NewGenericChecker([]Rule{rule})
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return nil, nil
+ return adviceList, nil
}
type insertRowLimitRule struct {
@@ -78,7 +79,7 @@ type insertRowLimitRule struct {
maxRow int
driver *sql.DB
ctx context.Context
- statementsText string
+ tokens *antlr.CommonTokenStream
explainCount int
setRoles []string
UsePostgresDatabaseOwner bool
@@ -130,6 +131,7 @@ func (r *insertRowLimitRule) handleInsertstmt(ctx *parser.InsertstmtContext) {
code := advisorcode.Ok
rows := int64(0)
+ statementText := getTextFromTokens(r.tokens, ctx)
// Check if this is INSERT ... VALUES or INSERT ... SELECT
if ctx.Insert_rest() != nil && ctx.Insert_rest().Selectstmt() != nil {
@@ -148,18 +150,17 @@ func (r *insertRowLimitRule) handleInsertstmt(ctx *parser.InsertstmtContext) {
}
r.explainCount++
- stmtText := extractStatementText(r.statementsText, ctx.GetStart().GetLine(), ctx.GetStop().GetLine())
res, err := advisor.Query(r.ctx, advisor.QueryContext{
UsePostgresDatabaseOwner: r.UsePostgresDatabaseOwner,
PreExecutions: r.setRoles,
- }, r.driver, storepb.Engine_POSTGRES, fmt.Sprintf("EXPLAIN %s", stmtText))
+ }, r.driver, storepb.Engine_POSTGRES, fmt.Sprintf("EXPLAIN %s", statementText))
if err != nil {
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: advisorcode.InsertTooManyRows.Int32(),
Title: r.title,
- Content: fmt.Sprintf("\"%s\" dry runs failed: %s", stmtText, err.Error()),
+ Content: fmt.Sprintf("\"%s\" dry runs failed: %s", statementText, err.Error()),
StartPosition: &storepb.Position{
Line: int32(ctx.GetStart().GetLine()),
Column: 0,
@@ -174,7 +175,7 @@ func (r *insertRowLimitRule) handleInsertstmt(ctx *parser.InsertstmtContext) {
Status: r.level,
Code: advisorcode.Internal.Int32(),
Title: r.title,
- Content: fmt.Sprintf("failed to get row count for \"%s\": %s", stmtText, err.Error()),
+ Content: fmt.Sprintf("failed to get row count for \"%s\": %s", statementText, err.Error()),
StartPosition: &storepb.Position{
Line: int32(ctx.GetStart().GetLine()),
Column: 0,
@@ -191,12 +192,11 @@ func (r *insertRowLimitRule) handleInsertstmt(ctx *parser.InsertstmtContext) {
}
if code != advisorcode.Ok {
- stmtText := extractStatementText(r.statementsText, ctx.GetStart().GetLine(), ctx.GetStop().GetLine())
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.Int32(),
Title: r.title,
- Content: fmt.Sprintf("The statement \"%s\" inserts %d rows. The count exceeds %d.", stmtText, rows, r.maxRow),
+ Content: fmt.Sprintf("The statement \"%s\" inserts %d rows. The count exceeds %d.", statementText, rows, r.maxRow),
StartPosition: &storepb.Position{
Line: int32(ctx.GetStart().GetLine()),
Column: 0,
diff --git a/backend/plugin/advisor/pg/advisor_migration_compatibility.go b/backend/plugin/advisor/pg/advisor_migration_compatibility.go
index 96a45a3a30..5f18a0551d 100644
--- a/backend/plugin/advisor/pg/advisor_migration_compatibility.go
+++ b/backend/plugin/advisor/pg/advisor_migration_compatibility.go
@@ -27,7 +27,7 @@ type CompatibilityAdvisor struct {
// Check checks schema backward compatibility.
func (*CompatibilityAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -37,29 +37,35 @@ func (*CompatibilityAdvisor) Check(_ context.Context, checkCtx advisor.Context)
return nil, err
}
- rule := &compatibilityRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- statementsText: checkCtx.Statements,
- }
+ var adviceList []*storepb.Advice
+ lastCreateTable := ""
+
+ for _, stmtInfo := range stmtInfos {
+ rule := &compatibilityRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ tokens: stmtInfo.Tokens,
+ lastCreateTable: lastCreateTable,
+ }
- checker := NewGenericChecker([]Rule{rule})
+ checker := NewGenericChecker([]Rule{rule})
+ rule.SetBaseLine(stmtInfo.BaseLine)
+ checker.SetBaseLine(stmtInfo.BaseLine)
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
+ lastCreateTable = rule.lastCreateTable
}
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type compatibilityRule struct {
BaseRule
- statementsText string
+ tokens *antlr.CommonTokenStream
lastCreateTable string
}
@@ -119,12 +125,11 @@ func (r *compatibilityRule) handleDropdbstmt(ctx antlr.ParserRuleContext) {
return
}
- stmtText := extractStatementText(r.statementsText, dropdbstmtCtx.GetStart().GetLine(), dropdbstmtCtx.GetStop().GetLine())
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: advisorcode.CompatibilityDropDatabase.Int32(),
Title: r.title,
- Content: fmt.Sprintf(`"%s" may cause incompatibility with the existing data and code`, stmtText),
+ Content: fmt.Sprintf(`"%s" may cause incompatibility with the existing data and code`, getTextFromTokens(r.tokens, dropdbstmtCtx)),
StartPosition: &storepb.Position{
Line: int32(dropdbstmtCtx.GetStart().GetLine()),
Column: 0,
@@ -147,12 +152,11 @@ func (r *compatibilityRule) handleDropstmt(ctx antlr.ParserRuleContext) {
if dropstmtCtx.Object_type_any_name() != nil {
objType := dropstmtCtx.Object_type_any_name()
if objType.TABLE() != nil || objType.VIEW() != nil {
- stmtText := extractStatementText(r.statementsText, dropstmtCtx.GetStart().GetLine(), dropstmtCtx.GetStop().GetLine())
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: advisorcode.CompatibilityDropTable.Int32(),
Title: r.title,
- Content: fmt.Sprintf(`"%s" may cause incompatibility with the existing data and code`, stmtText),
+ Content: fmt.Sprintf(`"%s" may cause incompatibility with the existing data and code`, getTextFromTokens(r.tokens, dropstmtCtx)),
StartPosition: &storepb.Position{
Line: int32(dropstmtCtx.GetStart().GetLine()),
Column: 0,
@@ -190,12 +194,11 @@ func (r *compatibilityRule) handleRenamestmt(ctx antlr.ParserRuleContext) {
}
if code != advisorcode.Ok {
- stmtText := extractStatementText(r.statementsText, renamestmtCtx.GetStart().GetLine(), renamestmtCtx.GetStop().GetLine())
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.Int32(),
Title: r.title,
- Content: fmt.Sprintf(`"%s" may cause incompatibility with the existing data and code`, stmtText),
+ Content: fmt.Sprintf(`"%s" may cause incompatibility with the existing data and code`, getTextFromTokens(r.tokens, renamestmtCtx)),
StartPosition: &storepb.Position{
Line: int32(renamestmtCtx.GetStart().GetLine()),
Column: 0,
@@ -285,12 +288,11 @@ func (r *compatibilityRule) handleAltertablestmt(ctx antlr.ParserRuleContext) {
}
if code != advisorcode.Ok {
- stmtText := extractStatementText(r.statementsText, altertablestmtCtx.GetStart().GetLine(), altertablestmtCtx.GetStop().GetLine())
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.Int32(),
Title: r.title,
- Content: fmt.Sprintf(`"%s" may cause incompatibility with the existing data and code`, stmtText),
+ Content: fmt.Sprintf(`"%s" may cause incompatibility with the existing data and code`, getTextFromTokens(r.tokens, altertablestmtCtx)),
StartPosition: &storepb.Position{
Line: int32(altertablestmtCtx.GetStart().GetLine()),
Column: 0,
@@ -328,12 +330,11 @@ func (r *compatibilityRule) handleIndexstmt(ctx antlr.ParserRuleContext) {
return
}
- stmtText := extractStatementText(r.statementsText, indexstmtCtx.GetStart().GetLine(), indexstmtCtx.GetStop().GetLine())
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: advisorcode.CompatibilityAddUniqueKey.Int32(),
Title: r.title,
- Content: fmt.Sprintf(`"%s" may cause incompatibility with the existing data and code`, stmtText),
+ Content: fmt.Sprintf(`"%s" may cause incompatibility with the existing data and code`, getTextFromTokens(r.tokens, indexstmtCtx)),
StartPosition: &storepb.Position{
Line: int32(indexstmtCtx.GetStart().GetLine()),
Column: 0,
diff --git a/backend/plugin/advisor/pg/advisor_naming_column.go b/backend/plugin/advisor/pg/advisor_naming_column.go
index 694885c2dd..68ed5398a7 100644
--- a/backend/plugin/advisor/pg/advisor_naming_column.go
+++ b/backend/plugin/advisor/pg/advisor_naming_column.go
@@ -31,7 +31,7 @@ type NamingColumnConventionAdvisor struct {
// Check checks for column naming convention.
func (*NamingColumnConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_naming_foreign_key_convention.go b/backend/plugin/advisor/pg/advisor_naming_foreign_key_convention.go
index b5bcfd9cff..e1331e8b87 100644
--- a/backend/plugin/advisor/pg/advisor_naming_foreign_key_convention.go
+++ b/backend/plugin/advisor/pg/advisor_naming_foreign_key_convention.go
@@ -32,7 +32,7 @@ type NamingFKConventionAdvisor struct {
// Check checks for foreign key naming convention.
func (*NamingFKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_naming_fully_qualified.go b/backend/plugin/advisor/pg/advisor_naming_fully_qualified.go
index 080a1afcb6..34e8a1c79f 100644
--- a/backend/plugin/advisor/pg/advisor_naming_fully_qualified.go
+++ b/backend/plugin/advisor/pg/advisor_naming_fully_qualified.go
@@ -30,7 +30,7 @@ type FullyQualifiedObjectNameAdvisor struct {
// Check checks for fully qualified object names.
func (*FullyQualifiedObjectNameAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -40,31 +40,31 @@ func (*FullyQualifiedObjectNameAdvisor) Check(_ context.Context, checkCtx adviso
return nil, err
}
- rule := &fullyQualifiedObjectNameRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- dbMetadata: checkCtx.DBSchema,
- statementsText: checkCtx.Statements,
- }
-
- checker := NewGenericChecker([]Rule{rule})
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &fullyQualifiedObjectNameRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ dbMetadata: checkCtx.DBSchema,
+ tokens: stmtInfo.Tokens,
+ }
+ rule.SetBaseLine(stmtInfo.BaseLine)
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ checker := NewGenericChecker([]Rule{rule})
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type fullyQualifiedObjectNameRule struct {
BaseRule
- dbMetadata *storepb.DatabaseSchemaMetadata
- statementsText string
+ dbMetadata *storepb.DatabaseSchemaMetadata
+ tokens *antlr.CommonTokenStream
}
func (*fullyQualifiedObjectNameRule) Name() string {
@@ -257,14 +257,7 @@ func (r *fullyQualifiedObjectNameRule) handleSelectstmt(ctx *parser.SelectstmtCo
return
}
- // Extract the statement text for this SELECT
- startLine := ctx.GetStop().GetLine()
- endLine := ctx.GetStop().GetLine()
- statementText := extractStatementText(r.statementsText, startLine, endLine)
-
- if statementText == "" {
- return
- }
+ statementText := getTextFromTokens(r.tokens, ctx)
// Find all table references in the SELECT statement
for _, tableName := range r.findAllTablesInSelect(statementText) {
@@ -276,7 +269,7 @@ func (r *fullyQualifiedObjectNameRule) handleSelectstmt(ctx *parser.SelectstmtCo
Title: r.title,
Content: fmt.Sprintf("unqualified object name: '%s'", objName),
StartPosition: &storepb.Position{
- Line: int32(startLine),
+ Line: int32(ctx.GetStop().GetLine()),
Column: 0,
},
})
diff --git a/backend/plugin/advisor/pg/advisor_naming_index_convention.go b/backend/plugin/advisor/pg/advisor_naming_index_convention.go
index 61115bac34..827aa496f7 100644
--- a/backend/plugin/advisor/pg/advisor_naming_index_convention.go
+++ b/backend/plugin/advisor/pg/advisor_naming_index_convention.go
@@ -30,7 +30,7 @@ type NamingIndexConventionAdvisor struct {
// Check checks for index naming convention.
func (*NamingIndexConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_naming_primary_key_convention.go b/backend/plugin/advisor/pg/advisor_naming_primary_key_convention.go
index d854ade9c4..d33eb3ddd7 100644
--- a/backend/plugin/advisor/pg/advisor_naming_primary_key_convention.go
+++ b/backend/plugin/advisor/pg/advisor_naming_primary_key_convention.go
@@ -30,7 +30,7 @@ type NamingPKConventionAdvisor struct {
// Check checks for primary key naming convention.
func (*NamingPKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -59,27 +59,27 @@ func (*NamingPKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Cont
maxLength = advisor.DefaultNameLengthLimit
}
- rule := &namingPKConventionRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- format: format,
- maxLength: maxLength,
- templateList: templateList,
- originalMetadata: checkCtx.OriginalMetadata,
- statementsText: checkCtx.Statements,
- }
-
- checker := NewGenericChecker([]Rule{rule})
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &namingPKConventionRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ format: format,
+ maxLength: maxLength,
+ templateList: templateList,
+ originalMetadata: checkCtx.OriginalMetadata,
+ }
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ checker := NewGenericChecker([]Rule{rule})
+ rule.SetBaseLine(stmtInfo.BaseLine)
+ checker.SetBaseLine(stmtInfo.BaseLine)
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type namingPKConventionRule struct {
@@ -89,7 +89,6 @@ type namingPKConventionRule struct {
maxLength int
templateList []string
originalMetadata *model.DatabaseMetadata
- statementsText string
}
type pkMetaData struct {
diff --git a/backend/plugin/advisor/pg/advisor_naming_table.go b/backend/plugin/advisor/pg/advisor_naming_table.go
index a3bf7aa258..b7b9942778 100644
--- a/backend/plugin/advisor/pg/advisor_naming_table.go
+++ b/backend/plugin/advisor/pg/advisor_naming_table.go
@@ -30,7 +30,7 @@ type NamingTableConventionAdvisor struct {
// Check checks for table naming convention.
func (*NamingTableConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_naming_unique_key_convention.go b/backend/plugin/advisor/pg/advisor_naming_unique_key_convention.go
index e94e95ee01..b6dec21d7f 100644
--- a/backend/plugin/advisor/pg/advisor_naming_unique_key_convention.go
+++ b/backend/plugin/advisor/pg/advisor_naming_unique_key_convention.go
@@ -31,7 +31,7 @@ type NamingUKConventionAdvisor struct {
// Check checks for unique key naming convention.
func (*NamingUKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_statement_add_check_not_valid.go b/backend/plugin/advisor/pg/advisor_statement_add_check_not_valid.go
index 4dcaa56c18..d9c4ae810e 100644
--- a/backend/plugin/advisor/pg/advisor_statement_add_check_not_valid.go
+++ b/backend/plugin/advisor/pg/advisor_statement_add_check_not_valid.go
@@ -26,7 +26,7 @@ type StatementAddCheckNotValidAdvisor struct {
// Check checks for to add check not valid.
func (*StatementAddCheckNotValidAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_statement_add_fk_not_valid.go b/backend/plugin/advisor/pg/advisor_statement_add_fk_not_valid.go
index ba3814a640..aa7478ac5c 100644
--- a/backend/plugin/advisor/pg/advisor_statement_add_fk_not_valid.go
+++ b/backend/plugin/advisor/pg/advisor_statement_add_fk_not_valid.go
@@ -26,7 +26,7 @@ type StatementAddFKNotValidAdvisor struct {
// Check checks for adding foreign key constraints without NOT VALID.
func (*StatementAddFKNotValidAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_statement_affected_row_limit.go b/backend/plugin/advisor/pg/advisor_statement_affected_row_limit.go
index 8d79c1d6ac..f94f563e93 100644
--- a/backend/plugin/advisor/pg/advisor_statement_affected_row_limit.go
+++ b/backend/plugin/advisor/pg/advisor_statement_affected_row_limit.go
@@ -31,7 +31,7 @@ type StatementAffectedRowLimitAdvisor struct {
// Check checks for UPDATE/DELETE affected row limit.
func (*StatementAffectedRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -46,42 +46,42 @@ func (*StatementAffectedRowLimitAdvisor) Check(ctx context.Context, checkCtx adv
return nil, errors.New("number_payload is required for this rule")
}
- rule := &statementAffectedRowLimitRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- maxRow: int(numberPayload.Number),
- ctx: ctx,
- driver: checkCtx.Driver,
- usePostgresDatabaseOwner: checkCtx.UsePostgresDatabaseOwner,
- statementsText: checkCtx.Statements,
+ if int(numberPayload.Number) <= 0 || checkCtx.Driver == nil {
+ return nil, nil
}
- if int(numberPayload.Number) > 0 && checkCtx.Driver != nil {
- checker := NewGenericChecker([]Rule{rule})
-
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &statementAffectedRowLimitRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ maxRow: int(numberPayload.Number),
+ ctx: ctx,
+ driver: checkCtx.Driver,
+ usePostgresDatabaseOwner: checkCtx.UsePostgresDatabaseOwner,
+ tokens: stmtInfo.Tokens,
}
- return checker.GetAdviceList(), nil
+ rule.SetBaseLine(stmtInfo.BaseLine)
+
+ checker := NewGenericChecker([]Rule{rule})
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return nil, nil
+ return adviceList, nil
}
type statementAffectedRowLimitRule struct {
BaseRule
-
maxRow int
driver *sql.DB
ctx context.Context
explainCount int
setRoles []string
usePostgresDatabaseOwner bool
- statementsText string
+ tokens *antlr.CommonTokenStream
}
func (*statementAffectedRowLimitRule) Name() string {
@@ -122,8 +122,7 @@ func (r *statementAffectedRowLimitRule) handleVariablesetstmt(ctx *parser.Variab
setRestMore := ctx.Set_rest().Set_rest_more()
if setRestMore.ROLE() != nil {
// Store the SET ROLE statement text
- stmtText := extractStatementText(r.statementsText, ctx.GetStart().GetLine(), ctx.GetStop().GetLine())
- r.setRoles = append(r.setRoles, stmtText)
+ r.setRoles = append(r.setRoles, getTextFromTokens(r.tokens, ctx))
}
}
}
@@ -153,14 +152,14 @@ func (r *statementAffectedRowLimitRule) checkAffectedRows(ctx antlr.ParserRuleCo
r.explainCount++
// Get the statement text
- stmtText := extractStatementText(r.statementsText, ctx.GetStart().GetLine(), ctx.GetStop().GetLine())
- normalizedStmt := advisor.NormalizeStatement(stmtText)
+ statementText := getTextFromTokens(r.tokens, ctx)
+ normalizedStmt := advisor.NormalizeStatement(statementText)
// Run EXPLAIN to get estimated row count
res, err := advisor.Query(r.ctx, advisor.QueryContext{
UsePostgresDatabaseOwner: r.usePostgresDatabaseOwner,
PreExecutions: r.setRoles,
- }, r.driver, storepb.Engine_POSTGRES, fmt.Sprintf("EXPLAIN %s", stmtText))
+ }, r.driver, storepb.Engine_POSTGRES, fmt.Sprintf("EXPLAIN %s", statementText))
if err != nil {
r.AddAdvice(&storepb.Advice{
diff --git a/backend/plugin/advisor/pg/advisor_statement_check_set_role_variable.go b/backend/plugin/advisor/pg/advisor_statement_check_set_role_variable.go
index 9e2308177c..e46886b5c4 100644
--- a/backend/plugin/advisor/pg/advisor_statement_check_set_role_variable.go
+++ b/backend/plugin/advisor/pg/advisor_statement_check_set_role_variable.go
@@ -24,7 +24,7 @@ type StatementCheckSetRoleVariable struct {
}
func (*StatementCheckSetRoleVariable) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_statement_create_specify_schema.go b/backend/plugin/advisor/pg/advisor_statement_create_specify_schema.go
index 083b157f3c..65b9d9393f 100644
--- a/backend/plugin/advisor/pg/advisor_statement_create_specify_schema.go
+++ b/backend/plugin/advisor/pg/advisor_statement_create_specify_schema.go
@@ -24,7 +24,7 @@ type StatementCreateSpecifySchema struct {
}
func (*StatementCreateSpecifySchema) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_statement_disallow_add_column_with_default.go b/backend/plugin/advisor/pg/advisor_statement_disallow_add_column_with_default.go
index 2bb68955ae..e1228c9717 100644
--- a/backend/plugin/advisor/pg/advisor_statement_disallow_add_column_with_default.go
+++ b/backend/plugin/advisor/pg/advisor_statement_disallow_add_column_with_default.go
@@ -26,7 +26,7 @@ type StatementDisallowAddColumnWithDefaultAdvisor struct {
// Check checks for to disallow add column with default.
func (*StatementDisallowAddColumnWithDefaultAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_statement_disallow_add_not_null.go b/backend/plugin/advisor/pg/advisor_statement_disallow_add_not_null.go
index eed2b53adc..7addd04e23 100644
--- a/backend/plugin/advisor/pg/advisor_statement_disallow_add_not_null.go
+++ b/backend/plugin/advisor/pg/advisor_statement_disallow_add_not_null.go
@@ -28,7 +28,7 @@ type StatementDisallowAddNotNullAdvisor struct {
// Check checks for to disallow add not null.
func (*StatementDisallowAddNotNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_statement_disallow_commit.go b/backend/plugin/advisor/pg/advisor_statement_disallow_commit.go
index c067f327d4..2634cc6d5c 100644
--- a/backend/plugin/advisor/pg/advisor_statement_disallow_commit.go
+++ b/backend/plugin/advisor/pg/advisor_statement_disallow_commit.go
@@ -27,7 +27,7 @@ type StatementDisallowCommitAdvisor struct {
// Check checks for disallowing COMMIT statements.
func (*StatementDisallowCommitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -37,26 +37,25 @@ func (*StatementDisallowCommitAdvisor) Check(_ context.Context, checkCtx advisor
return nil, err
}
- rule := &statementDisallowCommitRule{
- BaseRule: BaseRule{level: level, title: checkCtx.Rule.Type.String()},
- statementsText: checkCtx.Statements,
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &statementDisallowCommitRule{
+ BaseRule: BaseRule{level: level, title: checkCtx.Rule.Type.String()},
+ tokens: stmtInfo.Tokens,
+ }
+ rule.SetBaseLine(stmtInfo.BaseLine)
+
+ checker := NewGenericChecker([]Rule{rule})
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- checker := NewGenericChecker([]Rule{rule})
-
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
- }
-
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type statementDisallowCommitRule struct {
BaseRule
-
- statementsText string
+ tokens *antlr.CommonTokenStream
}
// Name returns the rule name for logging/debugging.
@@ -84,7 +83,10 @@ func (r *statementDisallowCommitRule) OnEnter(ctx antlr.ParserRuleContext, nodeT
return nil
}
- stmtText := extractStatementText(r.statementsText, transactionCtx.GetStart().GetLine(), transactionCtx.GetStop().GetLine())
+ stmtText := getTextFromTokens(r.tokens, transactionCtx)
+ if stmtText == "" {
+ stmtText = "<unknown statement>"
+ }
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.StatementDisallowCommit.Int32(),
diff --git a/backend/plugin/advisor/pg/advisor_statement_disallow_on_del_cascade.go b/backend/plugin/advisor/pg/advisor_statement_disallow_on_del_cascade.go
index c4ba590882..98042d895c 100644
--- a/backend/plugin/advisor/pg/advisor_statement_disallow_on_del_cascade.go
+++ b/backend/plugin/advisor/pg/advisor_statement_disallow_on_del_cascade.go
@@ -27,7 +27,7 @@ type StatementDisallowOnDelCascadeAdvisor struct {
// Check checks for ON DELETE CASCADE.
func (*StatementDisallowOnDelCascadeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -37,28 +37,30 @@ func (*StatementDisallowOnDelCascadeAdvisor) Check(_ context.Context, checkCtx a
return nil, err
}
- rule := &statementDisallowOnDelCascadeRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- statementsText: checkCtx.Statements,
- }
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &statementDisallowOnDelCascadeRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ tokens: stmtInfo.Tokens,
+ }
- checker := NewGenericChecker([]Rule{rule})
+ checker := NewGenericChecker([]Rule{rule})
+ rule.SetBaseLine(stmtInfo.BaseLine)
+ checker.SetBaseLine(stmtInfo.BaseLine)
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type statementDisallowOnDelCascadeRule struct {
BaseRule
- statementsText string
+ tokens *antlr.CommonTokenStream
}
// Name returns the rule name.
@@ -111,6 +113,7 @@ func (r *statementDisallowOnDelCascadeRule) handleKeyDelete(ctx *parser.Key_dele
if line < 1 {
line = 1
}
+ statementText := getTextFromTokens(r.tokens, stmtCtx)
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.StatementDisallowCascade.Int32(),
@@ -119,7 +122,7 @@ func (r *statementDisallowOnDelCascadeRule) handleKeyDelete(ctx *parser.Key_dele
StartPosition: common.ConvertANTLRPositionToPosition(&common.ANTLRPosition{
Line: int32(line),
Column: 0,
- }, r.statementsText),
+ }, statementText),
})
}
}
diff --git a/backend/plugin/advisor/pg/advisor_statement_disallow_rm_tbl_cascade.go b/backend/plugin/advisor/pg/advisor_statement_disallow_rm_tbl_cascade.go
index 69f4591b20..8d9549b581 100644
--- a/backend/plugin/advisor/pg/advisor_statement_disallow_rm_tbl_cascade.go
+++ b/backend/plugin/advisor/pg/advisor_statement_disallow_rm_tbl_cascade.go
@@ -26,7 +26,7 @@ type StatementDisallowRemoveTblCascadeAdvisor struct {
// Check checks for CASCADE option in DROP TABLE and TRUNCATE TABLE statements.
func (*StatementDisallowRemoveTblCascadeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go b/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go
index 841af4a2af..963cfdb24c 100644
--- a/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go
+++ b/backend/plugin/advisor/pg/advisor_statement_dml_dry_run.go
@@ -28,7 +28,7 @@ type StatementDMLDryRunAdvisor struct {
// Check checks for DML dry run.
func (*StatementDMLDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -38,30 +38,31 @@ func (*StatementDMLDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Co
return nil, err
}
- rule := &statementDMLDryRunRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- ctx: ctx,
- driver: checkCtx.Driver,
- usePostgresDatabaseOwner: checkCtx.UsePostgresDatabaseOwner,
- statementsText: checkCtx.Statements,
- }
-
// Only run EXPLAIN queries if we have a database connection
- if rule.driver != nil {
- checker := NewGenericChecker([]Rule{rule})
+ if checkCtx.Driver == nil {
+ return nil, nil
+ }
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &statementDMLDryRunRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ ctx: ctx,
+ driver: checkCtx.Driver,
+ usePostgresDatabaseOwner: checkCtx.UsePostgresDatabaseOwner,
+ tokens: stmtInfo.Tokens,
}
- return checker.GetAdviceList(), nil
+ rule.SetBaseLine(stmtInfo.BaseLine)
+
+ checker := NewGenericChecker([]Rule{rule})
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return nil, nil
+ return adviceList, nil
}
type statementDMLDryRunRule struct {
@@ -71,7 +72,7 @@ type statementDMLDryRunRule struct {
explainCount int
setRoles []string
usePostgresDatabaseOwner bool
- statementsText string
+ tokens *antlr.CommonTokenStream
}
// Name returns the rule name.
@@ -111,8 +112,7 @@ func (r *statementDMLDryRunRule) handleVariablesetstmt(ctx *parser.Variablesetst
setRestMore := ctx.Set_rest().Set_rest_more()
if setRestMore.ROLE() != nil {
// Store the SET ROLE statement text
- stmtText := extractStatementText(r.statementsText, ctx.GetStart().GetLine(), ctx.GetStop().GetLine())
- r.setRoles = append(r.setRoles, stmtText)
+ r.setRoles = append(r.setRoles, getTextFromTokens(r.tokens, ctx))
}
}
}
@@ -149,15 +149,14 @@ func (r *statementDMLDryRunRule) checkDMLDryRun(ctx antlr.ParserRuleContext) {
r.explainCount++
- // Get the statement text
- stmtText := extractStatementText(r.statementsText, ctx.GetStart().GetLine(), ctx.GetStop().GetLine())
- normalizedStmt := advisor.NormalizeStatement(stmtText)
+ statementText := getTextFromTokens(r.tokens, ctx)
+ normalizedStmt := advisor.NormalizeStatement(statementText)
// Run EXPLAIN to perform dry run
_, err := advisor.Query(r.ctx, advisor.QueryContext{
UsePostgresDatabaseOwner: r.usePostgresDatabaseOwner,
PreExecutions: r.setRoles,
- }, r.driver, storepb.Engine_POSTGRES, fmt.Sprintf("EXPLAIN %s", stmtText))
+ }, r.driver, storepb.Engine_POSTGRES, fmt.Sprintf("EXPLAIN %s", statementText))
if err != nil {
r.AddAdvice(&storepb.Advice{
diff --git a/backend/plugin/advisor/pg/advisor_statement_maximum_limit_value.go b/backend/plugin/advisor/pg/advisor_statement_maximum_limit_value.go
index 4da2dc3c75..fa07514ae7 100644
--- a/backend/plugin/advisor/pg/advisor_statement_maximum_limit_value.go
+++ b/backend/plugin/advisor/pg/advisor_statement_maximum_limit_value.go
@@ -30,7 +30,7 @@ type StatementMaximumLimitValueAdvisor struct {
// Check checks for maximum LIMIT value.
func (*StatementMaximumLimitValueAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_statement_merge_alter_table.go b/backend/plugin/advisor/pg/advisor_statement_merge_alter_table.go
index bf8730291b..bf64d21e72 100644
--- a/backend/plugin/advisor/pg/advisor_statement_merge_alter_table.go
+++ b/backend/plugin/advisor/pg/advisor_statement_merge_alter_table.go
@@ -27,7 +27,7 @@ type StatementMergeAlterTableAdvisor struct {
// Check checks for no redundant ALTER TABLE statements.
func (*StatementMergeAlterTableAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_statement_no_leading_wildcard_like.go b/backend/plugin/advisor/pg/advisor_statement_no_leading_wildcard_like.go
index c7e3001b33..012d5e1743 100644
--- a/backend/plugin/advisor/pg/advisor_statement_no_leading_wildcard_like.go
+++ b/backend/plugin/advisor/pg/advisor_statement_no_leading_wildcard_like.go
@@ -13,6 +13,8 @@ import (
"github.com/bytebase/bytebase/backend/plugin/advisor/code"
)
+// Note: strings import is still needed for pattern checking (HasPrefix)
+
var (
_ advisor.Advisor = (*StatementNoLeadingWildcardLikeAdvisor)(nil)
)
@@ -27,7 +29,7 @@ type StatementNoLeadingWildcardLikeAdvisor struct {
// Check checks for no leading wildcard LIKE.
func (*StatementNoLeadingWildcardLikeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -37,29 +39,29 @@ func (*StatementNoLeadingWildcardLikeAdvisor) Check(_ context.Context, checkCtx
return nil, err
}
- rule := &statementNoLeadingWildcardLikeRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- statementsText: checkCtx.Statements,
- reportedStatements: make(map[antlr.ParserRuleContext]bool),
- }
-
- checker := NewGenericChecker([]Rule{rule})
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &statementNoLeadingWildcardLikeRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ tokens: stmtInfo.Tokens,
+ reportedStatements: make(map[antlr.ParserRuleContext]bool),
+ }
+ rule.SetBaseLine(stmtInfo.BaseLine)
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ checker := NewGenericChecker([]Rule{rule})
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type statementNoLeadingWildcardLikeRule struct {
BaseRule
- statementsText string
+ tokens *antlr.CommonTokenStream
reportedStatements map[antlr.ParserRuleContext]bool
}
@@ -113,7 +115,10 @@ func (r *statementNoLeadingWildcardLikeRule) handleAExprLike(ctx *parser.A_expr_
}
r.reportedStatements[stmtCtx] = true
- stmtText := extractStatementText(r.statementsText, stmtCtx.GetStart().GetLine(), stmtCtx.GetStop().GetLine())
+ stmtText := getTextFromTokens(r.tokens, stmtCtx)
+ if stmtText == "" {
+ stmtText = "<unknown statement>"
+ }
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.StatementLeadingWildcardLike.Int32(),
diff --git a/backend/plugin/advisor/pg/advisor_statement_no_select_all.go b/backend/plugin/advisor/pg/advisor_statement_no_select_all.go
index 66b83a9b0d..ad35ba60b6 100644
--- a/backend/plugin/advisor/pg/advisor_statement_no_select_all.go
+++ b/backend/plugin/advisor/pg/advisor_statement_no_select_all.go
@@ -27,7 +27,7 @@ type NoSelectAllAdvisor struct {
// Check checks for no "select *".
func (*NoSelectAllAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -37,28 +37,28 @@ func (*NoSelectAllAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([
return nil, err
}
- rule := &noSelectAllRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- statementsText: checkCtx.Statements,
- }
-
- checker := NewGenericChecker([]Rule{rule})
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &noSelectAllRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ tokens: stmtInfo.Tokens,
+ }
+ rule.SetBaseLine(stmtInfo.BaseLine)
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ checker := NewGenericChecker([]Rule{rule})
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type noSelectAllRule struct {
BaseRule
- statementsText string
+ tokens *antlr.CommonTokenStream
}
// Name returns the rule name.
@@ -96,46 +96,17 @@ func (r *noSelectAllRule) handleSimpleSelectPramary(ctx *parser.Simple_select_pr
for _, target := range allTargets {
// Check if target is a Target_star (SELECT *)
if _, ok := target.(*parser.Target_starContext); ok {
- // Find the top-level statement context to get the full statement text
- var stmtCtx antlr.ParserRuleContext
- parent := ctx.GetParent()
- for parent != nil {
- // Look for top-level statement contexts
- switch p := parent.(type) {
- case *parser.SelectstmtContext:
- if isTopLevel(p.GetParent()) {
- stmtCtx = p
- }
- case *parser.InsertstmtContext:
- if isTopLevel(p.GetParent()) {
- stmtCtx = p
- }
- }
- if stmtCtx != nil {
- break
- }
- parent = parent.GetParent()
+ stmtText := getTextFromTokens(r.tokens, ctx)
+ if stmtText == "" {
+ stmtText = "<unknown statement>"
}
-
- // If we found a top-level statement, extract its text
- var stmtText string
- var line int
- if stmtCtx != nil {
- stmtText = extractStatementText(r.statementsText, stmtCtx.GetStart().GetLine(), stmtCtx.GetStop().GetLine())
- line = stmtCtx.GetStart().GetLine()
- } else {
- // Fallback to the simple_select context
- stmtText = extractStatementText(r.statementsText, ctx.GetStart().GetLine(), ctx.GetStop().GetLine())
- line = ctx.GetStart().GetLine()
- }
-
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.StatementSelectAll.Int32(),
Title: r.title,
Content: fmt.Sprintf("\"%s\" uses SELECT all", stmtText),
StartPosition: &storepb.Position{
- Line: int32(line),
+ Line: int32(ctx.GetStart().GetLine()),
Column: 0,
},
})
diff --git a/backend/plugin/advisor/pg/advisor_statement_non_transactional.go b/backend/plugin/advisor/pg/advisor_statement_non_transactional.go
index ff5e146f21..cfc1ad8aaa 100644
--- a/backend/plugin/advisor/pg/advisor_statement_non_transactional.go
+++ b/backend/plugin/advisor/pg/advisor_statement_non_transactional.go
@@ -27,7 +27,7 @@ type NonTransactionalAdvisor struct {
// Check checks for non-transactional statements.
func (*NonTransactionalAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -37,28 +37,28 @@ func (*NonTransactionalAdvisor) Check(_ context.Context, checkCtx advisor.Contex
return nil, err
}
- rule := &nonTransactionalRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- statementsText: checkCtx.Statements,
- }
-
- checker := NewGenericChecker([]Rule{rule})
-
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &nonTransactionalRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ tokens: stmtInfo.Tokens,
+ }
+ checker := NewGenericChecker([]Rule{rule})
+ rule.SetBaseLine(stmtInfo.BaseLine)
+ checker.SetBaseLine(stmtInfo.BaseLine)
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type nonTransactionalRule struct {
BaseRule
- statementsText string
+ tokens *antlr.CommonTokenStream
}
// Name returns the rule name.
@@ -110,8 +110,8 @@ func (r *nonTransactionalRule) checkStatement(ctx antlr.ParserRuleContext) {
return
}
- stmtText := extractStatementText(r.statementsText, ctx.GetStart().GetLine(), ctx.GetStop().GetLine())
- if pg.IsNonTransactionStatement(stmtText) {
+ statementText := getTextFromTokens(r.tokens, ctx)
+ if pg.IsNonTransactionStatement(statementText) {
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.StatementNonTransactional.Int32(),
diff --git a/backend/plugin/advisor/pg/advisor_statement_object_owner_check.go b/backend/plugin/advisor/pg/advisor_statement_object_owner_check.go
index 709bc3c02e..2fa302db11 100644
--- a/backend/plugin/advisor/pg/advisor_statement_object_owner_check.go
+++ b/backend/plugin/advisor/pg/advisor_statement_object_owner_check.go
@@ -33,7 +33,7 @@ type StatementObjectOwnerCheckAdvisor struct {
}
func (*StatementObjectOwnerCheckAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_statement_where_required_select.go b/backend/plugin/advisor/pg/advisor_statement_where_required_select.go
index 3f0963b947..dbdf30a6dc 100644
--- a/backend/plugin/advisor/pg/advisor_statement_where_required_select.go
+++ b/backend/plugin/advisor/pg/advisor_statement_where_required_select.go
@@ -26,7 +26,7 @@ type StatementWhereRequiredSelectAdvisor struct {
// Check checks for WHERE clause requirement in SELECT statements.
func (*StatementWhereRequiredSelectAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -36,28 +36,28 @@ func (*StatementWhereRequiredSelectAdvisor) Check(_ context.Context, checkCtx ad
return nil, err
}
- rule := &statementWhereRequiredSelectRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- statementsText: checkCtx.Statements,
- }
-
- checker := NewGenericChecker([]Rule{rule})
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &statementWhereRequiredSelectRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ tokens: stmtInfo.Tokens,
+ }
+ rule.SetBaseLine(stmtInfo.BaseLine)
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ checker := NewGenericChecker([]Rule{rule})
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type statementWhereRequiredSelectRule struct {
BaseRule
- statementsText string
+ tokens *antlr.CommonTokenStream
}
// Name returns the rule name.
@@ -84,7 +84,7 @@ func (*statementWhereRequiredSelectRule) OnExit(_ antlr.ParserRuleContext, _ str
}
func (r *statementWhereRequiredSelectRule) handleSelectstmt(ctx *parser.SelectstmtContext) {
- r.checkSelect(ctx, ctx.GetStart(), ctx.GetStop(), func() (bool, bool) {
+ r.checkSelect(ctx, func() (bool, bool) {
return r.checkSelectClauses(ctx)
})
}
@@ -95,7 +95,7 @@ func (r *statementWhereRequiredSelectRule) handleSelectWithParens(ctx *parser.Se
return
}
- r.checkSelect(ctx, ctx.GetStart(), ctx.GetStop(), func() (bool, bool) {
+ r.checkSelect(ctx, func() (bool, bool) {
return r.checkSelectWithParensForWhere(ctx)
})
}
@@ -103,8 +103,6 @@ func (r *statementWhereRequiredSelectRule) handleSelectWithParens(ctx *parser.Se
// checkSelect is a common function to check for WHERE clause requirement
func (r *statementWhereRequiredSelectRule) checkSelect(
ctx antlr.ParserRuleContext,
- _ antlr.Token,
- _ antlr.Token,
checkFunc func() (hasWhere bool, hasFrom bool),
) {
// Check if this SELECT has a WHERE clause and FROM clause
@@ -120,11 +118,11 @@ func (r *statementWhereRequiredSelectRule) checkSelect(
return
}
- // Always use the full top-level statement text for the error message
- // This matches the legacy behavior where violations in subqueries
- // are reported with the full statement text
- stmtLine := r.findTopLevelLine(ctx)
- stmtText := extractStatementText(r.statementsText, stmtLine, stmtLine)
+ // Get clean statement text from token stream
+ stmtText := getTextFromTokens(r.tokens, ctx)
+ if stmtText == "" {
+ stmtText = "<unknown statement>"
+ }
r.AddAdvice(&storepb.Advice{
Status: r.level,
@@ -132,28 +130,12 @@ func (r *statementWhereRequiredSelectRule) checkSelect(
Title: r.title,
Content: fmt.Sprintf("\"%s\" requires WHERE clause", stmtText),
StartPosition: &storepb.Position{
- Line: int32(stmtLine),
+ Line: int32(ctx.GetStart().GetLine()),
Column: 0,
},
})
}
-// findTopLevelLine finds the line number of the top-level statement
-func (*statementWhereRequiredSelectRule) findTopLevelLine(ctx antlr.ParserRuleContext) int {
- for ctx != nil {
- if isTopLevel(ctx.GetParent()) {
- return ctx.GetStart().GetLine()
- }
- parent := ctx.GetParent()
- if ruleCtx, ok := parent.(antlr.ParserRuleContext); ok {
- ctx = ruleCtx
- } else {
- break
- }
- }
- return ctx.GetStart().GetLine()
-}
-
// checkSelectWithParensForWhere checks a select_with_parens for WHERE and FROM
func (r *statementWhereRequiredSelectRule) checkSelectWithParensForWhere(ctx parser.ISelect_with_parensContext) (hasWhere bool, hasFrom bool) {
if ctx == nil {
diff --git a/backend/plugin/advisor/pg/advisor_statement_where_required_update_delete.go b/backend/plugin/advisor/pg/advisor_statement_where_required_update_delete.go
index dbdb19a439..3dfa41478e 100644
--- a/backend/plugin/advisor/pg/advisor_statement_where_required_update_delete.go
+++ b/backend/plugin/advisor/pg/advisor_statement_where_required_update_delete.go
@@ -5,7 +5,6 @@ import (
"fmt"
"github.com/antlr4-go/antlr/v4"
-
parser "github.com/bytebase/parser/postgresql"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
@@ -27,7 +26,7 @@ type StatementWhereRequiredUpdateDeleteAdvisor struct {
// Check checks for WHERE clause requirement in UPDATE/DELETE statements.
func (*StatementWhereRequiredUpdateDeleteAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -37,28 +36,28 @@ func (*StatementWhereRequiredUpdateDeleteAdvisor) Check(_ context.Context, check
return nil, err
}
- rule := &statementWhereRequiredRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- statementsText: checkCtx.Statements,
- }
-
- checker := NewGenericChecker([]Rule{rule})
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &statementWhereRequiredRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ tokens: stmtInfo.Tokens,
+ }
+ rule.SetBaseLine(stmtInfo.BaseLine)
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ checker := NewGenericChecker([]Rule{rule})
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type statementWhereRequiredRule struct {
BaseRule
- statementsText string
+ tokens *antlr.CommonTokenStream
}
// Name returns the rule name.
@@ -91,7 +90,10 @@ func (r *statementWhereRequiredRule) handleUpdatestmt(ctx *parser.UpdatestmtCont
// Check if WHERE clause exists
if ctx.Where_or_current_clause() == nil || ctx.Where_or_current_clause().WHERE() == nil {
- stmtText := extractStatementText(r.statementsText, ctx.GetStart().GetLine(), ctx.GetStop().GetLine())
+ stmtText := getTextFromTokens(r.tokens, ctx)
+ if stmtText == "" {
+ stmtText = "<unknown statement>"
+ }
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.StatementNoWhere.Int32(),
@@ -112,7 +114,10 @@ func (r *statementWhereRequiredRule) handleDeletestmt(ctx *parser.DeletestmtCont
// Check if WHERE clause exists
if ctx.Where_or_current_clause() == nil || ctx.Where_or_current_clause().WHERE() == nil {
- stmtText := extractStatementText(r.statementsText, ctx.GetStart().GetLine(), ctx.GetStop().GetLine())
+ stmtText := getTextFromTokens(r.tokens, ctx)
+ if stmtText == "" {
+ stmtText = "<unknown statement>"
+ }
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.StatementNoWhere.Int32(),
diff --git a/backend/plugin/advisor/pg/advisor_table_comment_convention.go b/backend/plugin/advisor/pg/advisor_table_comment_convention.go
index 4d691e3683..b1924dfccf 100644
--- a/backend/plugin/advisor/pg/advisor_table_comment_convention.go
+++ b/backend/plugin/advisor/pg/advisor_table_comment_convention.go
@@ -27,7 +27,7 @@ type TableCommentConventionAdvisor struct {
}
func (*TableCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -44,18 +44,17 @@ func (*TableCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.
level: level,
title: checkCtx.Rule.Type.String(),
},
- payload: commentPayload,
- statementsText: checkCtx.Statements,
- createdTables: make(map[string]*tableInfo),
- tableComments: make(map[string]*tableCommentInfo),
+ payload: commentPayload,
+ createdTables: make(map[string]*tableInfo),
+ tableComments: make(map[string]*tableCommentInfo),
}
checker := NewGenericChecker([]Rule{rule})
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ for _, stmtInfo := range stmtInfos {
+ rule.SetBaseLine(stmtInfo.BaseLine)
+ checker.SetBaseLine(stmtInfo.BaseLine)
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
}
// Check each created table for comment requirements
@@ -110,9 +109,7 @@ type tableCommentInfo struct {
type tableCommentConventionRule struct {
BaseRule
- payload *storepb.SQLReviewRule_CommentConventionRulePayload
- statementsText string
-
+ payload *storepb.SQLReviewRule_CommentConventionRulePayload
createdTables map[string]*tableInfo
tableComments map[string]*tableCommentInfo
}
diff --git a/backend/plugin/advisor/pg/advisor_table_disallow_partition.go b/backend/plugin/advisor/pg/advisor_table_disallow_partition.go
index cc4a195bbd..d30e3d2c69 100644
--- a/backend/plugin/advisor/pg/advisor_table_disallow_partition.go
+++ b/backend/plugin/advisor/pg/advisor_table_disallow_partition.go
@@ -28,7 +28,7 @@ type TableDisallowPartitionAdvisor struct {
// Check checks for partitioned tables.
func (*TableDisallowPartitionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -38,28 +38,28 @@ func (*TableDisallowPartitionAdvisor) Check(_ context.Context, checkCtx advisor.
return nil, err
}
- rule := &tableDisallowPartitionRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- statementsText: checkCtx.Statements,
- }
-
- checker := NewGenericChecker([]Rule{rule})
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &tableDisallowPartitionRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ tokens: stmtInfo.Tokens,
+ }
+ rule.SetBaseLine(stmtInfo.BaseLine)
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ checker := NewGenericChecker([]Rule{rule})
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type tableDisallowPartitionRule struct {
BaseRule
- statementsText string
+ tokens *antlr.CommonTokenStream
}
// Name returns the rule name.
@@ -92,13 +92,11 @@ func (r *tableDisallowPartitionRule) handleCreatestmt(ctx *parser.CreatestmtCont
// Check if this is a partitioned table
if ctx.Optpartitionspec() != nil {
- stmtText := extractStatementText(r.statementsText, ctx.GetStart().GetLine(), ctx.GetStop().GetLine())
-
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.CreateTablePartition.Int32(),
Title: r.title,
- Content: fmt.Sprintf("Table partition is forbidden, but %q creates", stmtText),
+ Content: fmt.Sprintf("Table partition is forbidden, but %q creates", getTextFromTokens(r.tokens, ctx)),
StartPosition: &storepb.Position{
Line: int32(ctx.GetStart().GetLine()),
Column: 0,
@@ -115,16 +113,15 @@ func (r *tableDisallowPartitionRule) handlePartitionCmd(ctx *parser.Partition_cm
// Check for ATTACH PARTITION
if ctx.ATTACH() != nil && ctx.PARTITION() != nil {
- // Navigate up to get the Altertablestmt context for statement text
+ // Navigate up to get the Altertablestmt context for line position
parent := ctx.GetParent()
for parent != nil {
if alterTableCtx, ok := parent.(*parser.AltertablestmtContext); ok {
- stmtText := extractStatementText(r.statementsText, alterTableCtx.GetStart().GetLine(), alterTableCtx.GetStop().GetLine())
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.CreateTablePartition.Int32(),
Title: r.title,
- Content: fmt.Sprintf("Table partition is forbidden, but %q creates", stmtText),
+ Content: fmt.Sprintf("Table partition is forbidden, but %q creates", getTextFromTokens(r.tokens, alterTableCtx)),
StartPosition: &storepb.Position{
Line: int32(alterTableCtx.GetStart().GetLine()),
Column: 0,
diff --git a/backend/plugin/advisor/pg/advisor_table_drop_naming_convention.go b/backend/plugin/advisor/pg/advisor_table_drop_naming_convention.go
index 4366de441e..7d03c79c85 100644
--- a/backend/plugin/advisor/pg/advisor_table_drop_naming_convention.go
+++ b/backend/plugin/advisor/pg/advisor_table_drop_naming_convention.go
@@ -32,7 +32,7 @@ type TableDropNamingConventionAdvisor struct {
// Check checks for table drop with naming convention.
func (*TableDropNamingConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/pg/advisor_table_no_fk.go b/backend/plugin/advisor/pg/advisor_table_no_fk.go
index ad76a10ead..9537621d96 100644
--- a/backend/plugin/advisor/pg/advisor_table_no_fk.go
+++ b/backend/plugin/advisor/pg/advisor_table_no_fk.go
@@ -28,7 +28,7 @@ type TableNoFKAdvisor struct {
// Check checks table disallow foreign key.
func (*TableNoFKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -38,29 +38,29 @@ func (*TableNoFKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*
return nil, err
}
- rule := &tableNoFKRule{
- BaseRule: BaseRule{
- level: level,
- title: checkCtx.Rule.Type.String(),
- },
- statementsText: checkCtx.Statements,
- }
-
- checker := NewGenericChecker([]Rule{rule})
+ var adviceList []*storepb.Advice
+ for _, stmtInfo := range stmtInfos {
+ rule := &tableNoFKRule{
+ BaseRule: BaseRule{
+ level: level,
+ title: checkCtx.Rule.Type.String(),
+ },
+ tokens: stmtInfo.Tokens,
+ }
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ checker := NewGenericChecker([]Rule{rule})
+ checker.SetBaseLine(stmtInfo.BaseLine)
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
+ adviceList = append(adviceList, checker.GetAdviceList()...)
}
- return checker.GetAdviceList(), nil
+ return adviceList, nil
}
type tableNoFKRule struct {
BaseRule
- statementsText string
+ tokens *antlr.CommonTokenStream
}
func (*tableNoFKRule) Name() string {
@@ -182,12 +182,11 @@ func (r *tableNoFKRule) handleAltertablestmt(ctx antlr.ParserRuleContext) {
}
func (r *tableNoFKRule) addFKAdvice(schemaName, tableName string, ctx antlr.ParserRuleContext) {
- stmtText := extractStatementText(r.statementsText, ctx.GetStart().GetLine(), ctx.GetStop().GetLine())
r.AddAdvice(&storepb.Advice{
Status: r.level,
Code: code.TableHasFK.Int32(),
Title: r.title,
- Content: fmt.Sprintf("Foreign key is not allowed in the table %q.%q, related statement: \"%s\"", schemaName, tableName, stmtText),
+ Content: fmt.Sprintf("Foreign key is not allowed in the table %q.%q, related statement: \"%s\"", schemaName, tableName, getTextFromTokens(r.tokens, ctx)),
StartPosition: &storepb.Position{
Line: int32(ctx.GetStart().GetLine()),
Column: 0,
diff --git a/backend/plugin/advisor/pg/advisor_table_require_pk.go b/backend/plugin/advisor/pg/advisor_table_require_pk.go
index 8c3d43fea6..d71ec0b884 100644
--- a/backend/plugin/advisor/pg/advisor_table_require_pk.go
+++ b/backend/plugin/advisor/pg/advisor_table_require_pk.go
@@ -29,7 +29,7 @@ type TableRequirePKAdvisor struct {
// Check parses the given statement and checks for errors.
func (*TableRequirePKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ stmtInfos, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
@@ -44,17 +44,17 @@ func (*TableRequirePKAdvisor) Check(_ context.Context, checkCtx advisor.Context)
level: level,
title: checkCtx.Rule.Type.String(),
},
- statementsText: checkCtx.Statements,
- finalMetadata: checkCtx.FinalMetadata,
- tableMentions: make(map[string]*tableMention),
+ finalMetadata: checkCtx.FinalMetadata,
+ tableMentions: make(map[string]*tableMention),
}
checker := NewGenericChecker([]Rule{rule})
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
+ for _, stmtInfo := range stmtInfos {
+ rule.SetBaseLine(stmtInfo.BaseLine)
+ rule.tokens = stmtInfo.Tokens
+ checker.SetBaseLine(stmtInfo.BaseLine)
+ antlr.ParseTreeWalkerDefault.Walk(checker, stmtInfo.Tree)
}
// Simple Solution: Validate final state after walking all statements
@@ -66,12 +66,13 @@ func (*TableRequirePKAdvisor) Check(_ context.Context, checkCtx advisor.Context)
type tableMention struct {
startLine int
endLine int
+ text string
}
type tableRequirePKRule struct {
BaseRule
- statementsText string
- finalMetadata *model.DatabaseMetadata
+ tokens *antlr.CommonTokenStream
+ finalMetadata *model.DatabaseMetadata
// Simple Solution: Track last mention of each table
tableMentions map[string]*tableMention // key: "schema.table", value: last mention info
@@ -124,6 +125,7 @@ func (r *tableRequirePKRule) handleCreatestmt(ctx *parser.CreatestmtContext) {
r.tableMentions[key] = &tableMention{
startLine: ctx.GetStart().GetLine() + r.baseLine,
endLine: ctx.GetStop().GetLine() + r.baseLine,
+ text: getTextFromTokens(r.tokens, ctx),
}
}
@@ -148,6 +150,7 @@ func (r *tableRequirePKRule) handleAltertablestmt(ctx *parser.AltertablestmtCont
r.tableMentions[key] = &tableMention{
startLine: ctx.GetStart().GetLine() + r.baseLine,
endLine: ctx.GetStop().GetLine() + r.baseLine,
+ text: getTextFromTokens(r.tokens, ctx),
}
}
@@ -199,10 +202,9 @@ func (r *tableRequirePKRule) validateFinalState() {
if !hasPK {
content := fmt.Sprintf("Table %q.%q requires PRIMARY KEY", schemaName, tableName)
- // Extract and include the related statement
- statement := extractStatementText(r.statementsText, mention.startLine, mention.endLine)
- if statement != "" {
- content = fmt.Sprintf("%s, related statement: %q", content, statement)
+ // Include the related statement
+ if mention.text != "" {
+ content = fmt.Sprintf("%s, related statement: %q", content, mention.text)
}
// Note: We already added baseLine offset when storing the line number,
diff --git a/backend/plugin/advisor/pg/test/statement_disallow_commit.yaml b/backend/plugin/advisor/pg/test/statement_disallow_commit.yaml
index 5df5fa79d6..d28215b62b 100644
--- a/backend/plugin/advisor/pg/test/statement_disallow_commit.yaml
+++ b/backend/plugin/advisor/pg/test/statement_disallow_commit.yaml
@@ -7,7 +7,7 @@
- status: 2
code: 206
title: STATEMENT_DISALLOW_COMMIT
- content: 'Commit is not allowed, related statement: "CREATE TABLE techBook(id int, name varchar(255));"'
+ content: 'Commit is not allowed, related statement: "COMMIT"'
startposition:
line: 3
column: 0
@@ -25,7 +25,7 @@
- status: 2
code: 206
title: STATEMENT_DISALLOW_COMMIT
- content: 'Commit is not allowed, related statement: "CREATE TABLE techBook(id int, name varchar(255));"'
+ content: 'Commit is not allowed, related statement: "COMMIT"'
startposition:
line: 3
column: 0
@@ -33,7 +33,7 @@
- status: 2
code: 206
title: STATEMENT_DISALLOW_COMMIT
- content: 'Commit is not allowed, related statement: "CREATE TABLE techBook(id int, name varchar(255));"'
+ content: 'Commit is not allowed, related statement: "COMMIT"'
startposition:
line: 7
column: 0
diff --git a/backend/plugin/advisor/pg/test/statement_select_no_select_all.yaml b/backend/plugin/advisor/pg/test/statement_select_no_select_all.yaml
index 62ccc2c28a..f2c0c9d10b 100644
--- a/backend/plugin/advisor/pg/test/statement_select_no_select_all.yaml
+++ b/backend/plugin/advisor/pg/test/statement_select_no_select_all.yaml
@@ -17,7 +17,7 @@
- status: 2
code: 203
title: STATEMENT_SELECT_NO_SELECT_ALL
- content: '"SELECT a, b FROM (SELECT * from t1, t2) t" uses SELECT all'
+ content: '"SELECT * from t1, t2" uses SELECT all'
startposition:
line: 1
column: 0
@@ -28,7 +28,7 @@
- status: 2
code: 203
title: STATEMENT_SELECT_NO_SELECT_ALL
- content: '"INSERT INTO t SELECT * FROM t1" uses SELECT all'
+ content: '"SELECT * FROM t1" uses SELECT all'
startposition:
line: 1
column: 0
diff --git a/backend/plugin/advisor/pg/test/statement_where_require_select.yaml b/backend/plugin/advisor/pg/test/statement_where_require_select.yaml
index 86c6decb7a..963be6f136 100644
--- a/backend/plugin/advisor/pg/test/statement_where_require_select.yaml
+++ b/backend/plugin/advisor/pg/test/statement_where_require_select.yaml
@@ -17,7 +17,7 @@
- status: 2
code: 202
title: STATEMENT_WHERE_REQUIRE_SELECT
- content: '"SELECT a FROM t WHERE a > (SELECT max(id) FROM user)" requires WHERE clause'
+ content: '"(SELECT max(id) FROM user)" requires WHERE clause'
startposition:
line: 1
column: 0
diff --git a/backend/plugin/advisor/pg/test/table_disallow_partition.yaml b/backend/plugin/advisor/pg/test/table_disallow_partition.yaml
index c7f8e125c8..74e86ae3af 100644
--- a/backend/plugin/advisor/pg/test/table_disallow_partition.yaml
+++ b/backend/plugin/advisor/pg/test/table_disallow_partition.yaml
@@ -6,7 +6,7 @@
- status: 2
code: 608
title: TABLE_DISALLOW_PARTITION
- content: Table partition is forbidden, but "CREATE TABLE t(a int) PARTITION BY RANGE (a);" creates
+ content: Table partition is forbidden, but "CREATE TABLE t(a int) PARTITION BY RANGE (a)" creates
startposition:
line: 1
column: 0
@@ -17,7 +17,7 @@
- status: 2
code: 608
title: TABLE_DISALLOW_PARTITION
- content: Table partition is forbidden, but "ALTER TABLE tech_book ATTACH PARTITION p1 DEFAULT;" creates
+ content: Table partition is forbidden, but "ALTER TABLE tech_book ATTACH PARTITION p1 DEFAULT" creates
startposition:
line: 1
column: 0
diff --git a/backend/plugin/advisor/pg/test/table_require_pk.yaml b/backend/plugin/advisor/pg/test/table_require_pk.yaml
index 5833d8f9ca..11752a96d3 100644
--- a/backend/plugin/advisor/pg/test/table_require_pk.yaml
+++ b/backend/plugin/advisor/pg/test/table_require_pk.yaml
@@ -55,7 +55,7 @@
- status: 2
code: 601
title: TABLE_REQUIRE_PK
- content: 'Table "public"."book" requires PRIMARY KEY, related statement: "ALTER TABLE book DROP CONSTRAINT book_pkey;"'
+ content: 'Table "public"."book" requires PRIMARY KEY, related statement: "ALTER TABLE book DROP CONSTRAINT book_pkey"'
startposition:
line: 2
column: 0
@@ -69,7 +69,7 @@
- status: 2
code: 601
title: TABLE_REQUIRE_PK
- content: 'Table "public"."product" requires PRIMARY KEY, related statement: "ALTER TABLE product DROP CONSTRAINT product_pkey;"'
+ content: 'Table "public"."product" requires PRIMARY KEY, related statement: "ALTER TABLE product DROP CONSTRAINT product_pkey"'
startposition:
line: 3
column: 0
diff --git a/backend/plugin/advisor/pg/utils.go b/backend/plugin/advisor/pg/utils.go
index 8cabff5166..5d27f57639 100644
--- a/backend/plugin/advisor/pg/utils.go
+++ b/backend/plugin/advisor/pg/utils.go
@@ -9,8 +9,6 @@ import (
parser "github.com/bytebase/parser/postgresql"
"github.com/pkg/errors"
- "github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/parser/base"
"github.com/bytebase/bytebase/backend/plugin/parser/pg"
)
@@ -31,31 +29,15 @@ func isTopLevel(ctx antlr.Tree) bool {
}
}
-// 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")
- }
-
- 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),
- })
+// getTextFromTokens extracts the original text for a rule context from the token stream.
+// Uses GetTextFromRuleContext to include hidden channel tokens (whitespace, comments).
+// Returns clean text without leading/trailing whitespace.
+func getTextFromTokens(tokens *antlr.CommonTokenStream, ctx antlr.ParserRuleContext) string {
+ if tokens == nil || ctx == nil {
+ return ""
}
-
- return parseResults, nil
+ text := tokens.GetTextFromRuleContext(ctx)
+ return strings.TrimSpace(text)
}
// extractTableName extracts the table name (last component) from a qualified name.
@@ -107,31 +89,6 @@ func extractStringConstant(ctx parser.ISconstContext) string {
return text
}
-// extractStatementText extracts a statement from the full statements text using line numbers.
-// Handles multi-line statements by extracting all lines from startLine to endLine.
-func extractStatementText(statementsText string, startLine, endLine int) string {
- lines := strings.Split(statementsText, "\n")
- if startLine < 1 || startLine > len(lines) {
- return ""
- }
-
- // Convert to 0-indexed
- startIdx := startLine - 1
- endIdx := endLine - 1
-
- if endIdx >= len(lines) {
- endIdx = len(lines) - 1
- }
-
- // Extract the lines for this statement
- var stmtLines []string
- for i := startIdx; i <= endIdx; i++ {
- stmtLines = append(stmtLines, lines[i])
- }
-
- return strings.TrimSpace(strings.Join(stmtLines, " "))
-}
-
// getTemplateRegexp generates a regex pattern by replacing tokens in the template with actual values.
// Used by naming convention advisors to dynamically build patterns based on metadata.
func getTemplateRegexp(template string, templateList []string, tokens map[string]string) (*regexp.Regexp, error) {
diff --git a/backend/plugin/advisor/redshift/utils.go b/backend/plugin/advisor/redshift/utils.go
index df20910ed6..cf588ca9e7 100644
--- a/backend/plugin/advisor/redshift/utils.go
+++ b/backend/plugin/advisor/redshift/utils.go
@@ -11,15 +11,18 @@ import (
// 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 checkCtx.ParsedStatements == nil {
+ return nil, errors.New("ParsedStatements is not provided in context")
}
- if len(checkCtx.AST) == 0 {
- return nil, errors.New("AST is empty")
+ if len(checkCtx.ParsedStatements) == 0 {
+ return nil, errors.New("ParsedStatements is empty")
}
// Redshift typically processes a single statement
- unifiedAST := checkCtx.AST[0]
- antlrAST, ok := base.GetANTLRAST(unifiedAST)
+ stmt := checkCtx.ParsedStatements[0]
+ if stmt.AST == nil {
+ return nil, errors.New("AST is nil in ParsedStatement")
+ }
+ antlrAST, ok := base.GetANTLRAST(stmt.AST)
if !ok {
return nil, errors.New("AST type mismatch: expected ANTLR-based parser result")
}
diff --git a/backend/plugin/advisor/snowflake/rule_column_maximum_varchar_length.go b/backend/plugin/advisor/snowflake/rule_column_maximum_varchar_length.go
index 9bf76f2243..dc49c6a29e 100644
--- a/backend/plugin/advisor/snowflake/rule_column_maximum_varchar_length.go
+++ b/backend/plugin/advisor/snowflake/rule_column_maximum_varchar_length.go
@@ -37,7 +37,7 @@ type ColumnMaximumVarcharLengthAdvisor struct {
// Check checks for maximum varchar length.
func (*ColumnMaximumVarcharLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/rule_column_no_null.go b/backend/plugin/advisor/snowflake/rule_column_no_null.go
index bd79da9229..4271da4840 100644
--- a/backend/plugin/advisor/snowflake/rule_column_no_null.go
+++ b/backend/plugin/advisor/snowflake/rule_column_no_null.go
@@ -28,7 +28,7 @@ type ColumnNoNullAdvisor struct {
// Check checks for column no NULL value.
func (*ColumnNoNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/rule_column_require.go b/backend/plugin/advisor/snowflake/rule_column_require.go
index db889ea761..277417720b 100644
--- a/backend/plugin/advisor/snowflake/rule_column_require.go
+++ b/backend/plugin/advisor/snowflake/rule_column_require.go
@@ -33,7 +33,7 @@ type ColumnRequireAdvisor struct {
// Check checks for column requirement.
func (*ColumnRequireAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/rule_migration_compatibility.go b/backend/plugin/advisor/snowflake/rule_migration_compatibility.go
index eadace266f..388922c9e0 100644
--- a/backend/plugin/advisor/snowflake/rule_migration_compatibility.go
+++ b/backend/plugin/advisor/snowflake/rule_migration_compatibility.go
@@ -30,7 +30,7 @@ type MigrationCompatibilityAdvisor struct {
// Check checks for migration compatibility.
func (*MigrationCompatibilityAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/rule_naming_identifier_case.go b/backend/plugin/advisor/snowflake/rule_naming_identifier_case.go
index 5a2fa3acad..e815f92738 100644
--- a/backend/plugin/advisor/snowflake/rule_naming_identifier_case.go
+++ b/backend/plugin/advisor/snowflake/rule_naming_identifier_case.go
@@ -30,7 +30,7 @@ type NamingIdentifierCaseAdvisor struct {
// Check checks for identifier case.
func (*NamingIdentifierCaseAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/rule_naming_identifier_no_keyword.go b/backend/plugin/advisor/snowflake/rule_naming_identifier_no_keyword.go
index c621657fb3..16b87c9bd7 100644
--- a/backend/plugin/advisor/snowflake/rule_naming_identifier_no_keyword.go
+++ b/backend/plugin/advisor/snowflake/rule_naming_identifier_no_keyword.go
@@ -30,7 +30,7 @@ type NamingIdentifierNoKeywordAdvisor struct {
// Check checks for identifier naming convention without keyword.
func (*NamingIdentifierNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/rule_naming_table.go b/backend/plugin/advisor/snowflake/rule_naming_table.go
index d74f5ef9be..475a8a084c 100644
--- a/backend/plugin/advisor/snowflake/rule_naming_table.go
+++ b/backend/plugin/advisor/snowflake/rule_naming_table.go
@@ -32,7 +32,7 @@ type NamingTableAdvisor struct {
// Check checks for table naming convention.
func (*NamingTableAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/rule_naming_table_no_keyword.go b/backend/plugin/advisor/snowflake/rule_naming_table_no_keyword.go
index deba2d20b8..a57c91e1b1 100644
--- a/backend/plugin/advisor/snowflake/rule_naming_table_no_keyword.go
+++ b/backend/plugin/advisor/snowflake/rule_naming_table_no_keyword.go
@@ -29,7 +29,7 @@ type NamingTableNoKeywordAdvisor struct {
// Check checks for table naming convention without keyword.
func (*NamingTableNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/rule_select_no_select_all.go b/backend/plugin/advisor/snowflake/rule_select_no_select_all.go
index 7f02bca23a..872aa908a0 100644
--- a/backend/plugin/advisor/snowflake/rule_select_no_select_all.go
+++ b/backend/plugin/advisor/snowflake/rule_select_no_select_all.go
@@ -27,7 +27,7 @@ type SelectNoSelectAllAdvisor struct {
// Check checks for no select all.
func (*SelectNoSelectAllAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/rule_table_drop_naming_convention.go b/backend/plugin/advisor/snowflake/rule_table_drop_naming_convention.go
index 43d4680e69..5da33b13b0 100644
--- a/backend/plugin/advisor/snowflake/rule_table_drop_naming_convention.go
+++ b/backend/plugin/advisor/snowflake/rule_table_drop_naming_convention.go
@@ -31,7 +31,7 @@ type TableDropNamingConventionAdvisor struct {
// Check checks for table drop with naming convention.
func (*TableDropNamingConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/rule_table_no_foreign_key.go b/backend/plugin/advisor/snowflake/rule_table_no_foreign_key.go
index 8d348c4145..32b28c2ce6 100644
--- a/backend/plugin/advisor/snowflake/rule_table_no_foreign_key.go
+++ b/backend/plugin/advisor/snowflake/rule_table_no_foreign_key.go
@@ -29,7 +29,7 @@ type TableNoForeignKeyAdvisor struct {
// Check checks for table disallow foreign key.
func (*TableNoForeignKeyAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/rule_table_require_pk.go b/backend/plugin/advisor/snowflake/rule_table_require_pk.go
index 66c696a50e..e771a3fbb5 100644
--- a/backend/plugin/advisor/snowflake/rule_table_require_pk.go
+++ b/backend/plugin/advisor/snowflake/rule_table_require_pk.go
@@ -29,7 +29,7 @@ type TableRequirePkAdvisor struct {
// Check checks for table require primary key.
func (*TableRequirePkAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/rule_where_require_select.go b/backend/plugin/advisor/snowflake/rule_where_require_select.go
index 8c8312e240..0098012f88 100644
--- a/backend/plugin/advisor/snowflake/rule_where_require_select.go
+++ b/backend/plugin/advisor/snowflake/rule_where_require_select.go
@@ -27,7 +27,7 @@ type WhereRequireForSelectAdvisor struct {
// Check checks for WHERE clause requirement.
func (*WhereRequireForSelectAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/rule_where_require_update_delete.go b/backend/plugin/advisor/snowflake/rule_where_require_update_delete.go
index 2118bac603..e56bacfeaf 100644
--- a/backend/plugin/advisor/snowflake/rule_where_require_update_delete.go
+++ b/backend/plugin/advisor/snowflake/rule_where_require_update_delete.go
@@ -27,7 +27,7 @@ type WhereRequireForUpdateDeleteAdvisor struct {
// Check checks for WHERE clause requirement.
func (*WhereRequireForUpdateDeleteAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, err := getANTLRTree(checkCtx)
+ parseResults, err := advisor.GetANTLRParseResults(checkCtx)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/advisor/snowflake/utils.go b/backend/plugin/advisor/snowflake/utils.go
deleted file mode 100644
index 6292bc285f..0000000000
--- a/backend/plugin/advisor/snowflake/utils.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package snowflake
-
-import (
- "github.com/pkg/errors"
-
- "github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/parser/base"
-)
-
-// getANTLRTree extracts the 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/sql_review.go b/backend/plugin/advisor/sql_review.go
index 044bb3886f..2b2f72e483 100644
--- a/backend/plugin/advisor/sql_review.go
+++ b/backend/plugin/advisor/sql_review.go
@@ -131,9 +131,9 @@ func SQLReviewCheck(
ruleType := rule.Type
// Set per-rule fields
- checkContext.AST = asts
- checkContext.Statements = statements
+ checkContext.StatementsTotalSize = len(statements)
checkContext.Rule = rule
+ checkContext.ParsedStatements = stmts
adviceList, err := Check(
ctx,
diff --git a/backend/plugin/advisor/tidb/utils.go b/backend/plugin/advisor/tidb/utils.go
index 175dd089a9..bf894f1491 100644
--- a/backend/plugin/advisor/tidb/utils.go
+++ b/backend/plugin/advisor/tidb/utils.go
@@ -82,12 +82,16 @@ func needDefault(column *ast.ColumnDef) bool {
// 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")
+ if checkCtx.ParsedStatements == nil {
+ return nil, errors.New("ParsedStatements is not provided in context")
}
+
var stmtNodes []ast.StmtNode
- for _, unifiedAST := range checkCtx.AST {
- tidbAST, ok := tidbparser.GetTiDBAST(unifiedAST)
+ for _, stmt := range checkCtx.ParsedStatements {
+ if stmt.AST == nil {
+ continue
+ }
+ tidbAST, ok := tidbparser.GetTiDBAST(stmt.AST)
if !ok {
return nil, errors.New("AST type mismatch: expected TiDB parser result")
}
diff --git a/backend/plugin/advisor/utils_for_tests.go b/backend/plugin/advisor/utils_for_tests.go
index f3d5198821..651efd90b7 100644
--- a/backend/plugin/advisor/utils_for_tests.go
+++ b/backend/plugin/advisor/utils_for_tests.go
@@ -216,8 +216,6 @@ func RunSQLReviewRuleTest(t *testing.T, rule *storepb.SQLReviewRule, dbType stor
ruleList := []*storepb.SQLReviewRule{rule}
checkCtx := Context{
- Charset: "",
- Collation: "",
DBType: dbType,
OriginalMetadata: originalMetadata,
FinalMetadata: finalMetadata,
diff --git a/backend/plugin/parser/plsql/split.go b/backend/plugin/parser/plsql/split.go
index 943c939151..ec00684061 100644
--- a/backend/plugin/parser/plsql/split.go
+++ b/backend/plugin/parser/plsql/split.go
@@ -69,6 +69,8 @@ func SplitSQL(statement string) ([]base.Statement, error) {
result = append(result, base.Statement{
Text: text,
+ // BaseLine is 0-based line offset of this statement in the original SQL
+ BaseLine: stmt.GetStart().GetLine() - 1,
Start: common.ConvertANTLRPositionToPosition(
&common.ANTLRPosition{
Line: int32(stmt.GetStart().GetLine()),
diff --git a/backend/plugin/parser/plsql/split_test.go b/backend/plugin/parser/plsql/split_test.go
index cf1999abd6..973e2e1d22 100644
--- a/backend/plugin/parser/plsql/split_test.go
+++ b/backend/plugin/parser/plsql/split_test.go
@@ -33,6 +33,7 @@ func TestOracleSplitMultiSQL(t *testing.T) {
res: []base.Statement{
{
Text: `select * from t`,
+ BaseLine: 1,
ByteOffsetStart: 5,
ByteOffsetEnd: 20,
Start: &storepb.Position{Line: 2, Column: 5},
@@ -40,6 +41,7 @@ func TestOracleSplitMultiSQL(t *testing.T) {
},
{
Text: `create table table$1 (id int)`,
+ BaseLine: 2,
ByteOffsetStart: 26,
ByteOffsetEnd: 56,
Start: &storepb.Position{Line: 3, Column: 5},
@@ -163,6 +165,7 @@ END;
res: []base.Statement{
{
Text: "CREATE OR REPLACE PROCEDURE proc1 IS\nBEGIN\n NULL;\nEND;",
+ BaseLine: 0,
Start: &storepb.Position{Line: 1, Column: 1},
End: &storepb.Position{Line: 4, Column: 4},
ByteOffsetStart: 0,
@@ -170,6 +173,7 @@ END;
},
{
Text: "CREATE OR REPLACE PROCEDURE proc2 IS\nBEGIN\n NULL;\nEND;",
+ BaseLine: 5,
Start: &storepb.Position{Line: 6, Column: 1},
End: &storepb.Position{Line: 9, Column: 4},
ByteOffsetStart: 60,
@@ -186,6 +190,7 @@ SELECT * FROM t2;`,
res: []base.Statement{
{
Text: "SELECT * FROM t1",
+ BaseLine: 0,
Start: &storepb.Position{Line: 1, Column: 1},
End: &storepb.Position{Line: 1, Column: 15},
ByteOffsetStart: 0,
@@ -193,6 +198,7 @@ SELECT * FROM t2;`,
},
{
Text: "SELECT * FROM t2",
+ BaseLine: 2,
Start: &storepb.Position{Line: 3, Column: 1},
End: &storepb.Position{Line: 3, Column: 15},
ByteOffsetStart: 20,
diff --git a/backend/runner/plancheck/statement_advise_executor.go b/backend/runner/plancheck/statement_advise_executor.go
index 64a017ac42..c1d31537e8 100644
--- a/backend/runner/plancheck/statement_advise_executor.go
+++ b/backend/runner/plancheck/statement_advise_executor.go
@@ -169,8 +169,6 @@ func (e *StatementAdviseExecutor) runReview(
connection := driver.GetDB()
adviceList, err := advisor.SQLReviewCheck(ctx, e.sheetManager, statement, reviewConfig.SqlReviewRules, advisor.Context{
- Charset: dbMetadata.GetProto().CharacterSet,
- Collation: dbMetadata.GetProto().Collation,
DBSchema: dbMetadata.GetProto(),
EnableSDL: enableSDL,
DBType: instance.Metadata.GetEngine(),
diff --git a/backend/tests/test-data/sql_review_pg.yaml b/backend/tests/test-data/sql_review_pg.yaml
index 2561b4f587..4ae684af4a 100644
--- a/backend/tests/test-data/sql_review_pg.yaml
+++ b/backend/tests/test-data/sql_review_pg.yaml
@@ -14,22 +14,22 @@
result:
- |-
{
- "status": "SUCCESS",
- "title": "OK"
+ "status": "SUCCESS",
+ "title": "OK"
}
run: false
- statement: CREATE TABLE user(id);
result:
- |-
{
- "status": "ERROR",
- "title": "Syntax error",
- "content": "Syntax error at line 1:14 \nrelated text: CREATE TABLE user",
- "code": 201,
- "sqlReviewReport": {
- "startPosition": {
- "line": 1,
- "column": 14
+ "status": "ERROR",
+ "title": "Syntax error",
+ "content": "Syntax error at line 1:14 \nrelated text: CREATE TABLE user",
+ "code": 201,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 1,
+ "column": 14
}
}
}
@@ -46,121 +46,121 @@
result:
- |-
{
- "status": "ERROR",
- "title": "TABLE_REQUIRE_PK",
- "content": "Table \"public\".\"userTable\" requires PRIMARY KEY, related statement: \"CREATE TABLE \\\"userTable\\\"( id INT, name VARCHAR(255), \\\"roomId\\\" INT, CONSTRAINT uk1 UNIQUE (id, name), CONSTRAINT fk1 FOREIGN KEY (\\\"roomId\\\") REFERENCES room(id) );\"",
- "code": 601,
- "sqlReviewReport": {
- "startPosition": {
- "line": 1
+ "status": "ERROR",
+ "title": "TABLE_REQUIRE_PK",
+ "content": "Table \"public\".\"userTable\" requires PRIMARY KEY, related statement: \"CREATE TABLE \\\"userTable\\\"(\\n id INT,\\n name VARCHAR(255),\\n \\\"roomId\\\" INT,\\n CONSTRAINT uk1 UNIQUE (id, name),\\n CONSTRAINT fk1 FOREIGN KEY (\\\"roomId\\\") REFERENCES room(id)\\n )\"",
+ "code": 601,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 1
}
}
}
- |-
{
- "status": "ERROR",
- "title": "TABLE_NO_FOREIGN_KEY",
- "content": "Foreign key is not allowed in the table \"public\".\"userTable\", related statement: \"CREATE TABLE \"userTable\"( id INT, name VARCHAR(255), \"roomId\" INT, CONSTRAINT uk1 UNIQUE (id, name), CONSTRAINT fk1 FOREIGN KEY (\"roomId\") REFERENCES room(id) );\"",
- "code": 602,
- "sqlReviewReport": {
- "startPosition": {
- "line": 1
+ "status": "ERROR",
+ "title": "TABLE_NO_FOREIGN_KEY",
+ "content": "Foreign key is not allowed in the table \"public\".\"userTable\", related statement: \"CREATE TABLE \"userTable\"(\n id INT,\n name VARCHAR(255),\n \"roomId\" INT,\n CONSTRAINT uk1 UNIQUE (id, name),\n CONSTRAINT fk1 FOREIGN KEY (\"roomId\") REFERENCES room(id)\n )\"",
+ "code": 602,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 1
}
}
}
- |-
{
- "status": "WARNING",
- "title": "NAMING_TABLE",
- "content": "\"userTable\" mismatches table naming convention, naming format should be \"^[a-z]+(_[a-z]+)*$\"",
- "code": 301,
- "sqlReviewReport": {
- "startPosition": {
- "line": 1
+ "status": "WARNING",
+ "title": "NAMING_TABLE",
+ "content": "\"userTable\" mismatches table naming convention, naming format should be \"^[a-z]+(_[a-z]+)*$\"",
+ "code": 301,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 1
}
}
}
- |-
{
- "status": "WARNING",
- "title": "NAMING_COLUMN",
- "content": "\"userTable\".\"roomId\" mismatches column naming convention, naming format should be \"^[a-z]+(_[a-z]+)*$\"",
- "code": 302,
- "sqlReviewReport": {
- "startPosition": {
- "line": 4
+ "status": "WARNING",
+ "title": "NAMING_COLUMN",
+ "content": "\"userTable\".\"roomId\" mismatches column naming convention, naming format should be \"^[a-z]+(_[a-z]+)*$\"",
+ "code": 302,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 4
}
}
}
- |-
{
- "status": "WARNING",
- "title": "NAMING_INDEX_UK",
- "content": "Unique key in table \"userTable\" mismatches the naming convention, expect \"^$|^uk_userTable_id_name$\" but found \"uk1\"",
- "code": 304,
- "sqlReviewReport": {
- "startPosition": {
- "line": 5
+ "status": "WARNING",
+ "title": "NAMING_INDEX_UK",
+ "content": "Unique key in table \"userTable\" mismatches the naming convention, expect \"^$|^uk_userTable_id_name$\" but found \"uk1\"",
+ "code": 304,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 5
}
}
}
- |-
{
- "status": "WARNING",
- "title": "NAMING_INDEX_FK",
- "content": "Foreign key in table \"userTable\" mismatches the naming convention, expect \"^$|^fk_userTable_roomId_room_id$\" but found \"fk1\"",
- "code": 305,
- "sqlReviewReport": {
- "startPosition": {
- "line": 1
+ "status": "WARNING",
+ "title": "NAMING_INDEX_FK",
+ "content": "Foreign key in table \"userTable\" mismatches the naming convention, expect \"^$|^fk_userTable_roomId_room_id$\" but found \"fk1\"",
+ "code": 305,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 1
}
}
}
- |-
{
- "status": "WARNING",
- "title": "COLUMN_REQUIRED",
- "content": "Table \"userTable\" requires columns: created_ts, creator_id, updated_ts, updater_id",
- "code": 401,
- "sqlReviewReport": {
- "startPosition": {
- "line": 1
+ "status": "WARNING",
+ "title": "COLUMN_REQUIRED",
+ "content": "Table \"userTable\" requires columns: created_ts, creator_id, updated_ts, updater_id",
+ "code": 401,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 1
}
}
}
- |-
{
- "status": "WARNING",
- "title": "COLUMN_NO_NULL",
- "content": "Column \"id\" in \"public\".\"userTable\" cannot have NULL value",
- "code": 402,
- "sqlReviewReport": {
- "startPosition": {
- "line": 2
+ "status": "WARNING",
+ "title": "COLUMN_NO_NULL",
+ "content": "Column \"id\" in \"public\".\"userTable\" cannot have NULL value",
+ "code": 402,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 2
}
}
}
- |-
{
- "status": "WARNING",
- "title": "COLUMN_NO_NULL",
- "content": "Column \"name\" in \"public\".\"userTable\" cannot have NULL value",
- "code": 402,
- "sqlReviewReport": {
- "startPosition": {
- "line": 3
+ "status": "WARNING",
+ "title": "COLUMN_NO_NULL",
+ "content": "Column \"name\" in \"public\".\"userTable\" cannot have NULL value",
+ "code": 402,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 3
}
}
}
- |-
{
- "status": "WARNING",
- "title": "COLUMN_NO_NULL",
- "content": "Column \"roomId\" in \"public\".\"userTable\" cannot have NULL value",
- "code": 402,
- "sqlReviewReport": {
- "startPosition": {
- "line": 4
+ "status": "WARNING",
+ "title": "COLUMN_NO_NULL",
+ "content": "Column \"roomId\" in \"public\".\"userTable\" cannot have NULL value",
+ "code": 402,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 4
}
}
}
@@ -169,13 +169,13 @@
result:
- |-
{
- "status": "ERROR",
- "title": "STATEMENT_WHERE_REQUIRE_UPDATE_DELETE",
- "content": "\"DELETE FROM t\" requires WHERE clause",
- "code": 202,
- "sqlReviewReport": {
- "startPosition": {
- "line": 1
+ "status": "ERROR",
+ "title": "STATEMENT_WHERE_REQUIRE_UPDATE_DELETE",
+ "content": "\"DELETE FROM t\" requires WHERE clause",
+ "code": 202,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 1
}
}
}
@@ -184,13 +184,13 @@
result:
- |-
{
- "status": "ERROR",
- "title": "STATEMENT_WHERE_NO_LEADING_WILDCARD_LIKE",
- "content": "\"DELETE FROM t WHERE a like '%abc'\" uses leading wildcard LIKE",
- "code": 204,
- "sqlReviewReport": {
- "startPosition": {
- "line": 1
+ "status": "ERROR",
+ "title": "STATEMENT_WHERE_NO_LEADING_WILDCARD_LIKE",
+ "content": "\"DELETE FROM t WHERE a like '%abc'\" uses leading wildcard LIKE",
+ "code": 204,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 1
}
}
}
@@ -199,16 +199,16 @@
result:
- |-
{
- "status": "SUCCESS",
- "title": "OK"
+ "status": "SUCCESS",
+ "title": "OK"
}
run: false
- statement: INSERT INTO t VALUES (1), (2)
result:
- |-
{
- "status": "SUCCESS",
- "title": "OK"
+ "status": "SUCCESS",
+ "title": "OK"
}
run: false
- statement: |-
@@ -224,33 +224,33 @@
result:
- |-
{
- "status": "SUCCESS",
- "title": "OK"
+ "status": "SUCCESS",
+ "title": "OK"
}
run: true
- statement: ALTER INDEX pk_tech_book_id RENAME TO pk1
result:
- |-
{
- "status": "WARNING",
- "title": "NAMING_INDEX_PK",
- "content": "Primary key in table \"tech_book\" mismatches the naming convention, expect \"^$|^pk_tech_book_id$\" but found \"pk1\"",
- "code": 306,
- "sqlReviewReport": {
- "startPosition": {
- "line": 1
+ "status": "WARNING",
+ "title": "NAMING_INDEX_PK",
+ "content": "Primary key in table \"tech_book\" mismatches the naming convention, expect \"^$|^pk_tech_book_id$\" but found \"pk1\"",
+ "code": 306,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 1
}
}
}
- |-
{
- "status": "WARNING",
- "title": "SCHEMA_BACKWARD_COMPATIBILITY",
- "content": "\"ALTER INDEX pk_tech_book_id RENAME TO pk1\" may cause incompatibility with the existing data and code",
- "code": 102,
- "sqlReviewReport": {
- "startPosition": {
- "line": 1
+ "status": "WARNING",
+ "title": "SCHEMA_BACKWARD_COMPATIBILITY",
+ "content": "\"ALTER INDEX pk_tech_book_id RENAME TO pk1\" may cause incompatibility with the existing data and code",
+ "code": 102,
+ "sqlReviewReport": {
+ "startPosition": {
+ "line": 1
}
}
}