Skip to content

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

refactor(parser): consolidate ParseResult types into shared base package (#18185)

h3n4ld7ee28ecb04a
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 f5c3bdd05d..ee355e46a9 100644
--- a/backend/plugin/advisor/mssql/rule_column_maximum_varchar_length.go
+++ b/backend/plugin/advisor/mssql/rule_column_maximum_varchar_length.go
@@ -17,6 +17,7 @@ import (
"github.com/bytebase/bytebase/backend/common/log"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -34,7 +35,7 @@ type ColumnMaximumVarcharLengthAdvisor struct {
// Check checks for maximum varchar length.
func (*ColumnMaximumVarcharLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
diff --git a/backend/plugin/advisor/mssql/rule_column_no_null.go b/backend/plugin/advisor/mssql/rule_column_no_null.go
index 5d0affab90..27103bf616 100644
--- a/backend/plugin/advisor/mssql/rule_column_no_null.go
+++ b/backend/plugin/advisor/mssql/rule_column_no_null.go
@@ -12,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"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -29,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, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
diff --git a/backend/plugin/advisor/mssql/rule_column_require.go b/backend/plugin/advisor/mssql/rule_column_require.go
index 19df566ccc..e7225db9a3 100644
--- a/backend/plugin/advisor/mssql/rule_column_require.go
+++ b/backend/plugin/advisor/mssql/rule_column_require.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -31,7 +32,7 @@ type ColumnRequireAdvisor struct {
// Check checks for column requirement..
func (*ColumnRequireAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
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 f4779de191..798004d026 100644
--- a/backend/plugin/advisor/mssql/rule_column_type_disallow_list.go
+++ b/backend/plugin/advisor/mssql/rule_column_type_disallow_list.go
@@ -14,7 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -30,7 +30,7 @@ type ColumnTypeDisallowListAdvisor struct {
}
func (*ColumnTypeDisallowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
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 51507bae00..bc29302351 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
@@ -11,7 +11,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"
- tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
func init() {
@@ -22,7 +22,7 @@ type FunctionDisallowCreateOrAlterAdvisor struct{}
// Check implements advisor.Advisor.
func (*FunctionDisallowCreateOrAlterAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
diff --git a/backend/plugin/advisor/mssql/rule_index_not_redundant.go b/backend/plugin/advisor/mssql/rule_index_not_redundant.go
index 9077b51caa..010a23ed82 100644
--- a/backend/plugin/advisor/mssql/rule_index_not_redundant.go
+++ b/backend/plugin/advisor/mssql/rule_index_not_redundant.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
@@ -32,7 +33,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, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to AST tree")
}
diff --git a/backend/plugin/advisor/mssql/rule_migration_compatibility.go b/backend/plugin/advisor/mssql/rule_migration_compatibility.go
index d5a40e199e..d91a37f7d2 100644
--- a/backend/plugin/advisor/mssql/rule_migration_compatibility.go
+++ b/backend/plugin/advisor/mssql/rule_migration_compatibility.go
@@ -13,6 +13,7 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -30,7 +31,7 @@ type MigrationCompatibilityAdvisor struct {
// Check checks for migration compatibility.
func (*MigrationCompatibilityAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
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 6c29450590..f63e1b2f6b 100644
--- a/backend/plugin/advisor/mssql/rule_naming_identifier_no_keyword.go
+++ b/backend/plugin/advisor/mssql/rule_naming_identifier_no_keyword.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -30,7 +31,7 @@ type NamingIdentifierNoKeywordAdvisor struct {
// Check checks for identifier naming convention without keyword.
func (*NamingIdentifierNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
diff --git a/backend/plugin/advisor/mssql/rule_naming_table.go b/backend/plugin/advisor/mssql/rule_naming_table.go
index bdcb5c7128..308a304b89 100644
--- a/backend/plugin/advisor/mssql/rule_naming_table.go
+++ b/backend/plugin/advisor/mssql/rule_naming_table.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"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -32,7 +33,7 @@ type NamingTableAdvisor struct {
// Check checks for table naming convention..
func (*NamingTableAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
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 bdbae1cf33..8ba8ceae76 100644
--- a/backend/plugin/advisor/mssql/rule_naming_table_no_keyword.go
+++ b/backend/plugin/advisor/mssql/rule_naming_table_no_keyword.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -30,7 +31,7 @@ type NamingTableNoKeywordAdvisor struct {
// Check checks for table naming convention without keyword.
func (*NamingTableNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
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 f647f04dde..fb9515d0b8 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
@@ -11,7 +11,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"
- tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
func init() {
@@ -21,7 +21,7 @@ func init() {
type ProcedureDisallowCreateOrAlterAdvisor struct{}
func (*ProcedureDisallowCreateOrAlterAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
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 90d1622bf6..0182bab188 100644
--- a/backend/plugin/advisor/mssql/rule_select_no_select_all.go
+++ b/backend/plugin/advisor/mssql/rule_select_no_select_all.go
@@ -11,7 +11,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"
- tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -28,7 +28,7 @@ type SelectNoSelectAllAdvisor struct {
// Check checks for no select all.
func (*SelectNoSelectAllAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
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 2778fc9a66..c8c5adc7e0 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
@@ -14,6 +14,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"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -24,7 +25,7 @@ func init() {
type DisallowCrossDBQueriesAdvisor struct{}
func (*DisallowCrossDBQueriesAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
diff --git a/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_ddl.go b/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_ddl.go
index ea2e23e904..369c1b147e 100644
--- a/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_ddl.go
+++ b/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_ddl.go
@@ -12,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"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -32,7 +33,7 @@ func (*StatementDisallowMixInDDLAdvisor) Check(_ context.Context, checkCtx advis
default:
return nil, nil
}
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
diff --git a/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_dml.go b/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_dml.go
index e3158de763..8e6e9c92c8 100644
--- a/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_dml.go
+++ b/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_dml.go
@@ -12,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"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -32,7 +33,7 @@ func (*StatementDisallowMixInDMLAdvisor) Check(_ context.Context, checkCtx advis
default:
return nil, nil
}
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
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 744c233793..4a37d06b0e 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
@@ -12,7 +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"
- tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
func init() {
@@ -24,7 +24,7 @@ type DisallowFuncAndCalculationsAdvisor struct{}
var _ advisor.Advisor = (*DisallowFuncAndCalculationsAdvisor)(nil)
func (*DisallowFuncAndCalculationsAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to AST tree")
}
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 8661127136..c5dc6fcc1a 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
@@ -11,7 +11,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"
- tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -28,7 +28,7 @@ type WhereRequirementForSelectAdvisor struct {
// Check checks for WHERE clause requirement.
func (*WhereRequirementForSelectAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
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 55cd25dbf5..13ae7ca07f 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
@@ -11,7 +11,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"
- tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -28,7 +28,7 @@ type WhereRequirementForUpdateDeleteAdvisor struct {
// Check checks for WHERE clause requirement.
func (*WhereRequirementForUpdateDeleteAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
diff --git a/backend/plugin/advisor/mssql/rule_table_disallow_ddl.go b/backend/plugin/advisor/mssql/rule_table_disallow_ddl.go
index b030e4ed81..566e1128bd 100644
--- a/backend/plugin/advisor/mssql/rule_table_disallow_ddl.go
+++ b/backend/plugin/advisor/mssql/rule_table_disallow_ddl.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -29,7 +30,7 @@ type TableDisallowDDLAdvisor struct {
}
func (*TableDisallowDDLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
diff --git a/backend/plugin/advisor/mssql/rule_table_disallow_dml.go b/backend/plugin/advisor/mssql/rule_table_disallow_dml.go
index ff508c2c72..1cc0db0a33 100644
--- a/backend/plugin/advisor/mssql/rule_table_disallow_dml.go
+++ b/backend/plugin/advisor/mssql/rule_table_disallow_dml.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -29,7 +30,7 @@ type TableDisallowDMLAdvisor struct {
}
func (*TableDisallowDMLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
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 9ea9d64072..614418aee0 100644
--- a/backend/plugin/advisor/mssql/rule_table_drop_naming_convention.go
+++ b/backend/plugin/advisor/mssql/rule_table_drop_naming_convention.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -31,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, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
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 dab5e760d1..d740bc0110 100644
--- a/backend/plugin/advisor/mssql/rule_table_no_foreign_key.go
+++ b/backend/plugin/advisor/mssql/rule_table_no_foreign_key.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -30,7 +31,7 @@ type TableNoForeignKeyAdvisor struct {
// Check checks for table disallow foreign key..
func (*TableNoForeignKeyAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
diff --git a/backend/plugin/advisor/mssql/rule_table_require_pk.go b/backend/plugin/advisor/mssql/rule_table_require_pk.go
index 565f8085aa..ec4d347924 100644
--- a/backend/plugin/advisor/mssql/rule_table_require_pk.go
+++ b/backend/plugin/advisor/mssql/rule_table_require_pk.go
@@ -12,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"
tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
)
@@ -29,7 +30,7 @@ type TableRequirePkAdvisor struct {
// Check checks for table require primary key..
func (*TableRequirePkAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- parseResults, ok := checkCtx.AST.([]*tsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult list")
}
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 bee5b2b361..7399079953 100644
--- a/backend/plugin/advisor/mysql/rule_builtin_prior_backup_check.go
+++ b/backend/plugin/advisor/mysql/rule_builtin_prior_backup_check.go
@@ -11,6 +11,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -31,7 +32,7 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx adv
}
var adviceList []*storepb.Advice
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
@@ -110,7 +111,7 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx adv
return adviceList, nil
}
-func prepareTransformation(databaseName string, parseResult []*mysqlparser.ParseResult) ([]*mysqlparser.TableReference, error) {
+func prepareTransformation(databaseName string, parseResult []*base.ParseResult) ([]*mysqlparser.TableReference, error) {
var result []*mysqlparser.TableReference
for i, sql := range parseResult {
tables, err := mysqlparser.ExtractTables(databaseName, sql, i)
diff --git a/backend/plugin/advisor/mysql/rule_charset_allowlist.go b/backend/plugin/advisor/mysql/rule_charset_allowlist.go
index 2d388f9b1b..561043c52b 100644
--- a/backend/plugin/advisor/mysql/rule_charset_allowlist.go
+++ b/backend/plugin/advisor/mysql/rule_charset_allowlist.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ type CharsetAllowlistAdvisor struct {
// Check checks for charset allowlist.
func (*CharsetAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_collation_allowlist.go b/backend/plugin/advisor/mysql/rule_collation_allowlist.go
index 68899868f1..1fb4432201 100644
--- a/backend/plugin/advisor/mysql/rule_collation_allowlist.go
+++ b/backend/plugin/advisor/mysql/rule_collation_allowlist.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ type CollationAllowlistAdvisor struct {
// Check checks for collation allowlist.
func (*CollationAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 1eafd5523b..9726b58d06 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
@@ -15,6 +15,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -34,7 +35,7 @@ type ColumnAutoIncrementInitialValueAdvisor struct {
// Check checks for auto-increment column initial value.
func (*ColumnAutoIncrementInitialValueAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 ef591c1c22..99d031f285 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
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -33,7 +34,7 @@ type ColumnAutoIncrementMustIntegerAdvisor struct {
// Check checks for auto-increment column type.
func (*ColumnAutoIncrementMustIntegerAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 3013bce358..665a8932bb 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
@@ -15,6 +15,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -34,7 +35,7 @@ type ColumnAutoIncrementMustUnsignedAdvisor struct {
// Check checks for unsigned auto-increment column.
func (*ColumnAutoIncrementMustUnsignedAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_column_comment_convention.go b/backend/plugin/advisor/mysql/rule_column_comment_convention.go
index 519108b4c7..80f0f6bf58 100644
--- a/backend/plugin/advisor/mysql/rule_column_comment_convention.go
+++ b/backend/plugin/advisor/mysql/rule_column_comment_convention.go
@@ -12,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -31,7 +32,7 @@ type ColumnCommentConventionAdvisor struct {
// Check checks for column comment convention.
func (*ColumnCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 a9f0938cda..b400c420ac 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
@@ -15,6 +15,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -39,7 +40,7 @@ type ColumnCurrentTimeCountLimitAdvisor struct {
// Check checks for current time column count limit.
func (*ColumnCurrentTimeCountLimitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_column_disallow_changing.go b/backend/plugin/advisor/mysql/rule_column_disallow_changing.go
index 67d41982fd..4af62ab88b 100644
--- a/backend/plugin/advisor/mysql/rule_column_disallow_changing.go
+++ b/backend/plugin/advisor/mysql/rule_column_disallow_changing.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -33,7 +34,7 @@ type ColumnDisallowChangingAdvisor struct {
// Check checks for disallow CHANGE COLUMN statement.
func (*ColumnDisallowChangingAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 7f60378d71..c444d51e7d 100644
--- a/backend/plugin/advisor/mysql/rule_column_disallow_changing_order.go
+++ b/backend/plugin/advisor/mysql/rule_column_disallow_changing_order.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -33,7 +34,7 @@ type ColumnDisallowChangingOrderAdvisor struct {
// Check checks for disallow changing column order.
func (*ColumnDisallowChangingOrderAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 045b38c1d2..bcbfc5c0e3 100644
--- a/backend/plugin/advisor/mysql/rule_column_disallow_changing_type.go
+++ b/backend/plugin/advisor/mysql/rule_column_disallow_changing_type.go
@@ -15,6 +15,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -35,7 +36,7 @@ type ColumnDisallowChangingTypeAdvisor struct {
// Check checks for disallow changing column type.
func (*ColumnDisallowChangingTypeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/mysql/rule_column_disallow_drop.go b/backend/plugin/advisor/mysql/rule_column_disallow_drop.go
index b3f680ce4c..52c67b805b 100644
--- a/backend/plugin/advisor/mysql/rule_column_disallow_drop.go
+++ b/backend/plugin/advisor/mysql/rule_column_disallow_drop.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -31,7 +32,7 @@ type ColumnDisallowDropAdvisor struct {
// Check checks for disallow DROP COLUMN statement.
func (*ColumnDisallowDropAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 e3d4f63dc1..8176daf50f 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
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -33,7 +34,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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 6f4c8fa0bc..8523e17e1b 100644
--- a/backend/plugin/advisor/mysql/rule_column_disallow_set_charset.go
+++ b/backend/plugin/advisor/mysql/rule_column_disallow_set_charset.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ type ColumnDisallowSetCharsetAdvisor struct {
// Check checks for disallow set column charset.
func (*ColumnDisallowSetCharsetAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 1b5727d0ac..0a36aaf2da 100644
--- a/backend/plugin/advisor/mysql/rule_column_maximum_character_length.go
+++ b/backend/plugin/advisor/mysql/rule_column_maximum_character_length.go
@@ -15,6 +15,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -34,7 +35,7 @@ type ColumnMaximumCharacterLengthAdvisor struct {
// Check checks for maximum character length.
func (*ColumnMaximumCharacterLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 e324130166..b428d2ea2d 100644
--- a/backend/plugin/advisor/mysql/rule_column_maximum_varchar_length.go
+++ b/backend/plugin/advisor/mysql/rule_column_maximum_varchar_length.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -33,7 +34,7 @@ type ColumnMaximumVarcharLengthAdvisor struct {
// Check checks for maximum varchar length.
func (*ColumnMaximumVarcharLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_column_no_null.go b/backend/plugin/advisor/mysql/rule_column_no_null.go
index 32ef3f3111..2442aec8e0 100644
--- a/backend/plugin/advisor/mysql/rule_column_no_null.go
+++ b/backend/plugin/advisor/mysql/rule_column_no_null.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -33,7 +34,7 @@ type ColumnNoNullAdvisor struct {
// Check checks for column no NULL value.
func (*ColumnNoNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
@@ -49,7 +50,7 @@ func (*ColumnNoNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) (
// Create the generic checker with the rule
checker := NewGenericChecker([]Rule{rule})
- for _, stmtNode := range root {
+ for _, stmtNode := range list {
rule.SetBaseLine(stmtNode.BaseLine)
checker.SetBaseLine(stmtNode.BaseLine)
antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)
diff --git a/backend/plugin/advisor/mysql/rule_column_require_charset.go b/backend/plugin/advisor/mysql/rule_column_require_charset.go
index 86ba84969c..ae6c9ca71b 100644
--- a/backend/plugin/advisor/mysql/rule_column_require_charset.go
+++ b/backend/plugin/advisor/mysql/rule_column_require_charset.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -30,7 +31,7 @@ type ColumnRequireCharsetAdvisor struct {
}
func (*ColumnRequireCharsetAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_column_require_collation.go b/backend/plugin/advisor/mysql/rule_column_require_collation.go
index 691b1e9db5..2e2f2bc9b1 100644
--- a/backend/plugin/advisor/mysql/rule_column_require_collation.go
+++ b/backend/plugin/advisor/mysql/rule_column_require_collation.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -29,7 +30,7 @@ type ColumnRequireCollationAdvisor struct {
}
func (*ColumnRequireCollationAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_column_require_default.go b/backend/plugin/advisor/mysql/rule_column_require_default.go
index 1805c22731..78d1a5de6d 100644
--- a/backend/plugin/advisor/mysql/rule_column_require_default.go
+++ b/backend/plugin/advisor/mysql/rule_column_require_default.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ type ColumnRequireDefaultAdvisor struct {
// Check checks for column default requirement.
func (*ColumnRequireDefaultAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_column_required.go b/backend/plugin/advisor/mysql/rule_column_required.go
index 40f227f7a6..eb1ed3906c 100644
--- a/backend/plugin/advisor/mysql/rule_column_required.go
+++ b/backend/plugin/advisor/mysql/rule_column_required.go
@@ -15,6 +15,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -34,7 +35,7 @@ type ColumnRequirementAdvisor struct {
// Check checks for the column requirement.
func (*ColumnRequirementAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 0ad61faef8..63500c7d2c 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
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -33,7 +34,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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 9ddf0424cb..b6ef96ec8f 100644
--- a/backend/plugin/advisor/mysql/rule_column_type_disallow_list.go
+++ b/backend/plugin/advisor/mysql/rule_column_type_disallow_list.go
@@ -15,6 +15,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -34,7 +35,7 @@ type ColumnTypeDisallowListAdvisor struct {
// Check checks for column type restriction.
func (*ColumnTypeDisallowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 686b962935..ee7cca0a2e 100644
--- a/backend/plugin/advisor/mysql/rule_database_drop_empty_db.go
+++ b/backend/plugin/advisor/mysql/rule_database_drop_empty_db.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -33,7 +34,7 @@ type DatabaseAllowDropIfEmptyAdvisor struct {
// Check checks for drop table naming convention.
func (*DatabaseAllowDropIfEmptyAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql ParseResult")
}
@@ -49,7 +50,7 @@ func (*DatabaseAllowDropIfEmptyAdvisor) Check(_ context.Context, checkCtx adviso
// Create the generic checker with the rule
checker := NewGenericChecker([]Rule{rule})
- for _, stmt := range list {
+ for _, stmt := range stmtList {
rule.SetBaseLine(stmt.BaseLine)
checker.SetBaseLine(stmt.BaseLine)
antlr.ParseTreeWalkerDefault.Walk(checker, stmt.Tree)
diff --git a/backend/plugin/advisor/mysql/rule_disallow_procedure.go b/backend/plugin/advisor/mysql/rule_disallow_procedure.go
index d282fad943..993642e9d4 100644
--- a/backend/plugin/advisor/mysql/rule_disallow_procedure.go
+++ b/backend/plugin/advisor/mysql/rule_disallow_procedure.go
@@ -13,6 +13,7 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -30,7 +31,7 @@ type ProcedureDisallowCreateAdvisor struct {
// Check checks for disallow create procedure.
func (*ProcedureDisallowCreateAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/mysql/rule_event_disallow_create.go b/backend/plugin/advisor/mysql/rule_event_disallow_create.go
index 857008f8f5..d2555f24fd 100644
--- a/backend/plugin/advisor/mysql/rule_event_disallow_create.go
+++ b/backend/plugin/advisor/mysql/rule_event_disallow_create.go
@@ -13,6 +13,7 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -30,7 +31,7 @@ type EventDisallowCreateAdvisor struct {
// Check checks for disallow creating event.
func (*EventDisallowCreateAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/mysql/rule_function_disallow_create.go b/backend/plugin/advisor/mysql/rule_function_disallow_create.go
index 62d7e99c5b..a4d17bbec6 100644
--- a/backend/plugin/advisor/mysql/rule_function_disallow_create.go
+++ b/backend/plugin/advisor/mysql/rule_function_disallow_create.go
@@ -13,6 +13,7 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -30,7 +31,7 @@ type FunctionDisallowCreateAdvisor struct {
// Check checks for disallow creating function.
func (*FunctionDisallowCreateAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/mysql/rule_function_disallowed_list.go b/backend/plugin/advisor/mysql/rule_function_disallowed_list.go
index e1eff2b4d1..b4cd812f63 100644
--- a/backend/plugin/advisor/mysql/rule_function_disallowed_list.go
+++ b/backend/plugin/advisor/mysql/rule_function_disallowed_list.go
@@ -15,6 +15,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -31,7 +32,7 @@ type FunctionDisallowedListAdvisor struct {
}
func (*FunctionDisallowedListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 87b2a7183d..7fa7268101 100644
--- a/backend/plugin/advisor/mysql/rule_index_key_number_limit.go
+++ b/backend/plugin/advisor/mysql/rule_index_key_number_limit.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 1dd6d61bed..83717507c5 100644
--- a/backend/plugin/advisor/mysql/rule_index_no_duplicate_column.go
+++ b/backend/plugin/advisor/mysql/rule_index_no_duplicate_column.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -33,7 +34,7 @@ type IndexNoDuplicateColumnAdvisor struct {
// Check checks for no duplicate columns in index.
func (*IndexNoDuplicateColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/mysql/rule_index_pk_type.go b/backend/plugin/advisor/mysql/rule_index_pk_type.go
index c43284bd83..83bfb20a09 100644
--- a/backend/plugin/advisor/mysql/rule_index_pk_type.go
+++ b/backend/plugin/advisor/mysql/rule_index_pk_type.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -34,7 +35,7 @@ type IndexPkTypeAdvisor struct {
// Check checks for correct type of PK.
func (*IndexPkTypeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 0cf85b35bd..76ca61c723 100644
--- a/backend/plugin/advisor/mysql/rule_index_primary_key_type_allowlist.go
+++ b/backend/plugin/advisor/mysql/rule_index_primary_key_type_allowlist.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -33,7 +34,7 @@ type IndexPrimaryKeyTypeAllowlistAdvisor struct {
// Check checks for primary key type allowlist.
func (*IndexPrimaryKeyTypeAllowlistAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 ec2e2ddb28..76fb980a33 100644
--- a/backend/plugin/advisor/mysql/rule_index_total_number_limit.go
+++ b/backend/plugin/advisor/mysql/rule_index_total_number_limit.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -34,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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 e117ff1c12..e12fa72039 100644
--- a/backend/plugin/advisor/mysql/rule_index_type_allow_list.go
+++ b/backend/plugin/advisor/mysql/rule_index_type_allow_list.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -30,7 +31,7 @@ type IndexTypeAllowListAdvisor struct {
}
func (*IndexTypeAllowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 3eef6f76dd..98ce6bb23c 100644
--- a/backend/plugin/advisor/mysql/rule_index_type_no_blob.go
+++ b/backend/plugin/advisor/mysql/rule_index_type_no_blob.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -34,7 +35,7 @@ type IndexTypeNoBlobAdvisor struct {
// Check checks for index type no blob.
func (*IndexTypeNoBlobAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 efb51e4af6..c896bdd81d 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
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -34,7 +35,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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 eee753b4a3..5cafa25773 100644
--- a/backend/plugin/advisor/mysql/rule_insert_must_specify_column.go
+++ b/backend/plugin/advisor/mysql/rule_insert_must_specify_column.go
@@ -12,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -31,7 +32,7 @@ type InsertMustSpecifyColumnAdvisor struct {
// Check checks for to enforce column specified.
func (*InsertMustSpecifyColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_insert_row_limit.go b/backend/plugin/advisor/mysql/rule_insert_row_limit.go
index d7d95f06d9..5bbe60b65c 100644
--- a/backend/plugin/advisor/mysql/rule_insert_row_limit.go
+++ b/backend/plugin/advisor/mysql/rule_insert_row_limit.go
@@ -14,6 +14,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ type InsertRowLimitAdvisor struct {
// Check checks for insert row limit.
func (*InsertRowLimitAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql ParseResult")
}
diff --git a/backend/plugin/advisor/mysql/rule_migration_compatibility.go b/backend/plugin/advisor/mysql/rule_migration_compatibility.go
index 8d44542211..28751aa4e0 100644
--- a/backend/plugin/advisor/mysql/rule_migration_compatibility.go
+++ b/backend/plugin/advisor/mysql/rule_migration_compatibility.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ type CompatibilityAdvisor struct {
// Check checks schema backward compatibility.
func (*CompatibilityAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 85293849a7..3ce2dfe4cb 100644
--- a/backend/plugin/advisor/mysql/rule_naming_auto_increment_column.go
+++ b/backend/plugin/advisor/mysql/rule_naming_auto_increment_column.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ type NamingAutoIncrementColumnAdvisor struct {
// Check checks for auto-increment naming convention.
func (*NamingAutoIncrementColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/mysql/rule_naming_column.go b/backend/plugin/advisor/mysql/rule_naming_column.go
index 91efe5e842..91150427b6 100644
--- a/backend/plugin/advisor/mysql/rule_naming_column.go
+++ b/backend/plugin/advisor/mysql/rule_naming_column.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -30,7 +31,7 @@ type NamingColumnConventionAdvisor struct {
// Check checks for column naming convention.
func (*NamingColumnConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql ParseResult")
}
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 da4602f669..1939024be2 100644
--- a/backend/plugin/advisor/mysql/rule_naming_foreign_key_convention.go
+++ b/backend/plugin/advisor/mysql/rule_naming_foreign_key_convention.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
@@ -53,7 +54,7 @@ func (*NamingFKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Cont
// Create the generic checker with the rule
checker := NewGenericChecker([]Rule{rule})
- for _, stmtNode := range root {
+ for _, stmtNode := range list {
rule.SetBaseLine(stmtNode.BaseLine)
checker.SetBaseLine(stmtNode.BaseLine)
antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)
diff --git a/backend/plugin/advisor/mysql/rule_naming_identifier_no_keyword.go b/backend/plugin/advisor/mysql/rule_naming_identifier_no_keyword.go
index 2f15917740..0753c45192 100644
--- a/backend/plugin/advisor/mysql/rule_naming_identifier_no_keyword.go
+++ b/backend/plugin/advisor/mysql/rule_naming_identifier_no_keyword.go
@@ -13,7 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/mysql/rule_naming_index_convention.go b/backend/plugin/advisor/mysql/rule_naming_index_convention.go
index 2357341f47..b3e8f2eb77 100644
--- a/backend/plugin/advisor/mysql/rule_naming_index_convention.go
+++ b/backend/plugin/advisor/mysql/rule_naming_index_convention.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -41,7 +42,7 @@ type NamingIndexConventionAdvisor struct {
// Check checks for index naming convention.
func (*NamingIndexConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
@@ -62,7 +63,7 @@ func (*NamingIndexConventionAdvisor) Check(_ context.Context, checkCtx advisor.C
// Create the generic checker with the rule
checker := NewGenericChecker([]Rule{rule})
- for _, stmtNode := range root {
+ for _, stmtNode := range list {
rule.SetBaseLine(stmtNode.BaseLine)
checker.SetBaseLine(stmtNode.BaseLine)
antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)
diff --git a/backend/plugin/advisor/mysql/rule_naming_table.go b/backend/plugin/advisor/mysql/rule_naming_table.go
index d534d02a62..03626e873d 100644
--- a/backend/plugin/advisor/mysql/rule_naming_table.go
+++ b/backend/plugin/advisor/mysql/rule_naming_table.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ type NamingTableConventionAdvisor struct {
// Check checks for table naming convention.
func (*NamingTableConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
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 6974fd5179..7a8eb6edea 100644
--- a/backend/plugin/advisor/mysql/rule_naming_unique_key_convention.go
+++ b/backend/plugin/advisor/mysql/rule_naming_unique_key_convention.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -33,7 +34,7 @@ type NamingUKConventionAdvisor struct {
// Check checks for index naming convention.
func (*NamingUKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
@@ -54,7 +55,7 @@ func (*NamingUKConventionAdvisor) Check(_ context.Context, checkCtx advisor.Cont
// Create the generic checker with the rule
checker := NewGenericChecker([]Rule{rule})
- for _, stmtNode := range root {
+ for _, stmtNode := range list {
rule.SetBaseLine(stmtNode.BaseLine)
checker.SetBaseLine(stmtNode.BaseLine)
antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)
diff --git a/backend/plugin/advisor/mysql/rule_online_migration.go b/backend/plugin/advisor/mysql/rule_online_migration.go
index f9c0e922de..bfa0bf3b4b 100644
--- a/backend/plugin/advisor/mysql/rule_online_migration.go
+++ b/backend/plugin/advisor/mysql/rule_online_migration.go
@@ -15,7 +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"
- parserbase "github.com/bytebase/bytebase/backend/plugin/parser/base"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -35,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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to StmtNode")
}
@@ -131,7 +131,7 @@ type OnlineMigrationRule struct {
dbMetadata *model.DatabaseMetadata
checkCtx advisor.Context
currentDatabase string
- changedResources map[string]parserbase.SchemaResource
+ changedResources map[string]base.SchemaResource
ghostCompatible bool
start *storepb.Position
end *storepb.Position
@@ -148,7 +148,7 @@ func NewOnlineMigrationRule(level storepb.Advice_Status, title string, minRows i
dbMetadata: dbMetadata,
checkCtx: checkCtx,
currentDatabase: checkCtx.CurrentDatabase,
- changedResources: make(map[string]parserbase.SchemaResource),
+ changedResources: make(map[string]base.SchemaResource),
}
}
@@ -227,7 +227,7 @@ func (r *OnlineMigrationRule) checkAlterTable(ctx *mysql.AlterTableContext) {
if !mysqlparser.IsTopMySQLRule(&ctx.BaseParserRuleContext) {
return
}
- resource := parserbase.SchemaResource{
+ resource := base.SchemaResource{
Database: r.currentDatabase,
}
db, table := mysqlparser.NormalizeMySQLTableRef(ctx.TableRef())
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 8204f5a2de..a9c448e0e5 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
@@ -12,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -29,7 +30,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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 5215dfe8bc..26fe57ad25 100644
--- a/backend/plugin/advisor/mysql/rule_statement_affected_row_limit.go
+++ b/backend/plugin/advisor/mysql/rule_statement_affected_row_limit.go
@@ -14,6 +14,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_ddl.go b/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_ddl.go
index 6710b4c1a8..9b1f8e0155 100644
--- a/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_ddl.go
+++ b/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_ddl.go
@@ -11,6 +11,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ func (*StatementDisallowMixInDDLAdvisor) Check(_ context.Context, checkCtx advis
return nil, nil
}
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_dml.go b/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_dml.go
index b24b4cb37c..1c423709fa 100644
--- a/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_dml.go
+++ b/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_dml.go
@@ -11,6 +11,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ func (*StatementDisallowMixInDMLAdvisor) Check(_ context.Context, checkCtx advis
return nil, nil
}
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 182ccf5956..65f6fd6a0b 100644
--- a/backend/plugin/advisor/mysql/rule_statement_disallow_using_filesort.go
+++ b/backend/plugin/advisor/mysql/rule_statement_disallow_using_filesort.go
@@ -14,6 +14,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -30,7 +31,7 @@ type StatementDisallowUsingFilesortAdvisor struct {
}
func (*StatementDisallowUsingFilesortAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql ParseResult")
}
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 2b28ae914f..f3786c70a9 100644
--- a/backend/plugin/advisor/mysql/rule_statement_disallow_using_temporary.go
+++ b/backend/plugin/advisor/mysql/rule_statement_disallow_using_temporary.go
@@ -14,6 +14,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -30,7 +31,7 @@ type StatementDisallowUsingTemporaryAdvisor struct {
}
func (*StatementDisallowUsingTemporaryAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql ParseResult")
}
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 7ac544e907..12a8633c2b 100644
--- a/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.go
+++ b/backend/plugin/advisor/mysql/rule_statement_dml_dry_run.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ type StatementDmlDryRunAdvisor struct {
// Check checks for DML dry run.
func (*StatementDmlDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 eb487422c6..8e234f5720 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
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -29,7 +30,7 @@ type StatementJoinStrictColumnAttrsAdvisor struct {
}
func (*StatementJoinStrictColumnAttrsAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 c0090d2c73..18167ff6ec 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
@@ -12,7 +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"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -27,7 +27,7 @@ type StatementMaximumJoinTableCountAdvisor struct {
}
func (*StatementMaximumJoinTableCountAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 ac83863adf..a8e40beaf2 100644
--- a/backend/plugin/advisor/mysql/rule_statement_maximum_limit_value.go
+++ b/backend/plugin/advisor/mysql/rule_statement_maximum_limit_value.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -30,7 +31,7 @@ type StatementMaximumLimitValueAdvisor struct {
}
func (*StatementMaximumLimitValueAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 a16bb11ef7..3273bf2431 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
@@ -9,7 +9,7 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -24,7 +24,7 @@ type StatementMaximumStatementsInTransactionAdvisor struct {
}
func (*StatementMaximumStatementsInTransactionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 53c33f5a08..60c3024190 100644
--- a/backend/plugin/advisor/mysql/rule_statement_merge_alter_table.go
+++ b/backend/plugin/advisor/mysql/rule_statement_merge_alter_table.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ type StatementMergeAlterTableAdvisor struct {
// Check checks for merging ALTER TABLE statements.
func (*StatementMergeAlterTableAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 b1bb49b644..f180e7147b 100644
--- a/backend/plugin/advisor/mysql/rule_statement_query_minimum_plan_level.go
+++ b/backend/plugin/advisor/mysql/rule_statement_query_minimum_plan_level.go
@@ -15,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -30,7 +31,7 @@ type StatementQueryMinumumPlanLevelAdvisor struct {
}
func (*StatementQueryMinumumPlanLevelAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 63840b91ce..b4236aaaaf 100644
--- a/backend/plugin/advisor/mysql/rule_statement_select_full_table_scan.go
+++ b/backend/plugin/advisor/mysql/rule_statement_select_full_table_scan.go
@@ -15,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ type StatementSelectFullTableScanAdvisor struct {
}
func (*StatementSelectFullTableScanAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 19f467b5ad..83ae218b8a 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
@@ -13,7 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -28,7 +28,7 @@ type StatementWhereDisallowUsingFunctionAdvisor struct {
}
func (*StatementWhereDisallowUsingFunctionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 131915e3c1..c2c11bf79f 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
@@ -12,7 +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"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -27,7 +27,7 @@ type StatementWhereMaximumLogicalOperatorCountAdvisor struct {
}
func (*StatementWhereMaximumLogicalOperatorCountAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 dbed6d22d4..205c960d29 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
@@ -12,7 +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"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -27,7 +27,7 @@ type StatementWhereNoEqualNullAdvisor struct {
}
func (*StatementWhereNoEqualNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_stmt_disallow_commit.go b/backend/plugin/advisor/mysql/rule_stmt_disallow_commit.go
index 53c86a722c..a930cac370 100644
--- a/backend/plugin/advisor/mysql/rule_stmt_disallow_commit.go
+++ b/backend/plugin/advisor/mysql/rule_stmt_disallow_commit.go
@@ -12,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -31,7 +32,7 @@ type StatementDisallowCommitAdvisor struct {
// Check checks for disallowing commit.
func (*StatementDisallowCommitAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/mysql/rule_stmt_disallow_limit.go b/backend/plugin/advisor/mysql/rule_stmt_disallow_limit.go
index b3727d6e37..e671dfcb7c 100644
--- a/backend/plugin/advisor/mysql/rule_stmt_disallow_limit.go
+++ b/backend/plugin/advisor/mysql/rule_stmt_disallow_limit.go
@@ -12,7 +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"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -31,7 +31,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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 5ac28d80a7..e86749392d 100644
--- a/backend/plugin/advisor/mysql/rule_stmt_disallow_order_by.go
+++ b/backend/plugin/advisor/mysql/rule_stmt_disallow_order_by.go
@@ -12,7 +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"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -31,7 +31,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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 0c2f103752..06488224c7 100644
--- a/backend/plugin/advisor/mysql/rule_stmt_max_execution_time.go
+++ b/backend/plugin/advisor/mysql/rule_stmt_max_execution_time.go
@@ -13,7 +13,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"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -30,7 +30,7 @@ type MaxExecutionTimeAdvisor struct {
}
func (*MaxExecutionTimeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
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 3710cbf60b..5ab62559be 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
@@ -13,7 +13,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"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -32,7 +32,7 @@ type NoLeadingWildcardLikeAdvisor struct {
// Check checks for no leading wildcard LIKE.
func (*NoLeadingWildcardLikeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ root, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 8bc726f21a..d92824747e 100644
--- a/backend/plugin/advisor/mysql/rule_stmt_no_select_all.go
+++ b/backend/plugin/advisor/mysql/rule_stmt_no_select_all.go
@@ -12,7 +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"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -31,7 +31,7 @@ type NoSelectAllAdvisor struct {
// Check checks for no "select *".
func (*NoSelectAllAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ root, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 d12bb27ff4..c1cb8804ea 100644
--- a/backend/plugin/advisor/mysql/rule_stmt_require_algorithm_or_lock_options.go
+++ b/backend/plugin/advisor/mysql/rule_stmt_require_algorithm_or_lock_options.go
@@ -11,6 +11,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -31,7 +32,7 @@ type RequireAlgorithmOrLockOptionAdvisor struct {
}
func (*RequireAlgorithmOrLockOptionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
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 df9853f4e9..ffbad63900 100644
--- a/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_select.go
+++ b/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_select.go
@@ -12,7 +12,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"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -31,7 +31,7 @@ type WhereRequirementForSelectAdvisor struct {
// Check checks for the WHERE clause requirement.
func (*WhereRequirementForSelectAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to StmtNode")
}
@@ -47,7 +47,7 @@ func (*WhereRequirementForSelectAdvisor) Check(_ context.Context, checkCtx advis
// Create the generic checker with the rule
checker := NewGenericChecker([]Rule{rule})
- for _, stmtNode := range root {
+ for _, stmtNode := range stmtList {
rule.SetBaseLine(stmtNode.BaseLine)
checker.SetBaseLine(stmtNode.BaseLine)
antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)
diff --git a/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_update_delete.go b/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_update_delete.go
index 13435c95e1..79f63a5147 100644
--- a/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_update_delete.go
+++ b/backend/plugin/advisor/mysql/rule_stmt_where_requirement_for_update_delete.go
@@ -12,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -31,7 +32,7 @@ type WhereRequirementForUpdateDeleteAdvisor struct {
// Check checks for the WHERE clause requirement.
func (*WhereRequirementForUpdateDeleteAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
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 f136f1f93d..d518fd0f84 100644
--- a/backend/plugin/advisor/mysql/rule_table_comment_convention.go
+++ b/backend/plugin/advisor/mysql/rule_table_comment_convention.go
@@ -12,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -31,7 +32,7 @@ type TableCommentConventionAdvisor struct {
// Check checks for table comment convention.
func (*TableCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_ddl.go b/backend/plugin/advisor/mysql/rule_table_disallow_ddl.go
index 73fcaa22fc..3510d623d2 100644
--- a/backend/plugin/advisor/mysql/rule_table_disallow_ddl.go
+++ b/backend/plugin/advisor/mysql/rule_table_disallow_ddl.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -29,7 +30,7 @@ type TableDisallowDDLAdvisor struct {
}
func (*TableDisallowDDLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_dml.go b/backend/plugin/advisor/mysql/rule_table_disallow_dml.go
index 1c85882fbf..fad8bf95a0 100644
--- a/backend/plugin/advisor/mysql/rule_table_disallow_dml.go
+++ b/backend/plugin/advisor/mysql/rule_table_disallow_dml.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -29,7 +30,7 @@ type TableDisallowDMLAdvisor struct {
}
func (*TableDisallowDMLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_partition.go b/backend/plugin/advisor/mysql/rule_table_disallow_partition.go
index 4f47c99631..ded6032c1a 100644
--- a/backend/plugin/advisor/mysql/rule_table_disallow_partition.go
+++ b/backend/plugin/advisor/mysql/rule_table_disallow_partition.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -32,7 +33,7 @@ type TableDisallowPartitionAdvisor struct {
// Check checks for disallow table partition.
func (*TableDisallowPartitionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 47c3158fa6..a1b6f2f12f 100644
--- a/backend/plugin/advisor/mysql/rule_table_disallow_set_charset.go
+++ b/backend/plugin/advisor/mysql/rule_table_disallow_set_charset.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -28,7 +29,7 @@ type TableDisallowSetCharsetAdvisor struct {
}
func (*TableDisallowSetCharsetAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_table_disallow_trigger.go b/backend/plugin/advisor/mysql/rule_table_disallow_trigger.go
index a8921b4169..7cb3764971 100644
--- a/backend/plugin/advisor/mysql/rule_table_disallow_trigger.go
+++ b/backend/plugin/advisor/mysql/rule_table_disallow_trigger.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -30,7 +31,7 @@ type TableDisallowTriggerAdvisor struct {
// Check checks for disallow table trigger.
func (*TableDisallowTriggerAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
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 6688228269..1abd01bc17 100644
--- a/backend/plugin/advisor/mysql/rule_table_drop_naming_convention.go
+++ b/backend/plugin/advisor/mysql/rule_table_drop_naming_convention.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -33,7 +34,7 @@ type TableDropNamingConventionAdvisor struct {
// Check checks for drop table naming convention.
func (*TableDropNamingConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/mysql/rule_table_limit_size.go b/backend/plugin/advisor/mysql/rule_table_limit_size.go
index 643f867906..3b2822f170 100644
--- a/backend/plugin/advisor/mysql/rule_table_limit_size.go
+++ b/backend/plugin/advisor/mysql/rule_table_limit_size.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/plugin/advisor"
@@ -36,7 +37,7 @@ func (*MaximumTableSizeAdvisor) Check(_ context.Context, checkCtx advisor.Contex
return nil, err
}
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 679bad0cca..154f259a04 100644
--- a/backend/plugin/advisor/mysql/rule_table_no_duplicate_index.go
+++ b/backend/plugin/advisor/mysql/rule_table_no_duplicate_index.go
@@ -17,6 +17,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -34,7 +35,7 @@ type TableNoDuplicateIndexAdvisor struct {
// Check checks for no duplicate index in table.
func (*TableNoDuplicateIndexAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/mysql/rule_table_no_fk.go b/backend/plugin/advisor/mysql/rule_table_no_fk.go
index 10b5ff1e5e..47e47e36f3 100644
--- a/backend/plugin/advisor/mysql/rule_table_no_fk.go
+++ b/backend/plugin/advisor/mysql/rule_table_no_fk.go
@@ -15,6 +15,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -34,7 +35,7 @@ type TableNoFKAdvisor struct {
// Check checks table disallow foreign key.
func (*TableNoFKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
@@ -49,7 +50,7 @@ func (*TableNoFKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*
// Create the generic checker with the rule
checker := NewGenericChecker([]Rule{rule})
- for _, stmtNode := range root {
+ for _, stmtNode := range list {
rule.SetBaseLine(stmtNode.BaseLine)
checker.SetBaseLine(stmtNode.BaseLine)
antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)
diff --git a/backend/plugin/advisor/mysql/rule_table_require_charset.go b/backend/plugin/advisor/mysql/rule_table_require_charset.go
index 974b66bd5c..02fbcb73eb 100644
--- a/backend/plugin/advisor/mysql/rule_table_require_charset.go
+++ b/backend/plugin/advisor/mysql/rule_table_require_charset.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -29,7 +30,7 @@ type TableRequireCharsetAdvisor struct {
}
func (*TableRequireCharsetAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_table_require_collation.go b/backend/plugin/advisor/mysql/rule_table_require_collation.go
index 46c946fa5f..7f3f60dbfc 100644
--- a/backend/plugin/advisor/mysql/rule_table_require_collation.go
+++ b/backend/plugin/advisor/mysql/rule_table_require_collation.go
@@ -13,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -29,7 +30,7 @@ type TableRequireCollationAdvisor struct {
}
func (*TableRequireCollationAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_table_require_pk.go b/backend/plugin/advisor/mysql/rule_table_require_pk.go
index d7aa86c58b..6dad9374d4 100644
--- a/backend/plugin/advisor/mysql/rule_table_require_pk.go
+++ b/backend/plugin/advisor/mysql/rule_table_require_pk.go
@@ -14,6 +14,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -38,7 +39,7 @@ type TableRequirePKAdvisor struct {
// Check checks table requires PK.
func (*TableRequirePKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- root, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
@@ -54,7 +55,7 @@ func (*TableRequirePKAdvisor) Check(_ context.Context, checkCtx advisor.Context)
// Create the generic checker with the rule
checker := NewGenericChecker([]Rule{rule})
- for _, stmtNode := range root {
+ for _, stmtNode := range list {
rule.SetBaseLine(stmtNode.BaseLine)
checker.SetBaseLine(stmtNode.BaseLine)
antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)
diff --git a/backend/plugin/advisor/mysql/rule_table_text_fields_total_length.go b/backend/plugin/advisor/mysql/rule_table_text_fields_total_length.go
index 40a2162bb1..f9aba9ede9 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
@@ -17,6 +17,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/store/model"
)
@@ -33,7 +34,7 @@ type TableMaximumVarcharLengthAdvisor struct {
}
func (*TableMaximumVarcharLengthAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
diff --git a/backend/plugin/advisor/mysql/rule_use_innodb.go b/backend/plugin/advisor/mysql/rule_use_innodb.go
index da59a6cd70..7d71793fea 100644
--- a/backend/plugin/advisor/mysql/rule_use_innodb.go
+++ b/backend/plugin/advisor/mysql/rule_use_innodb.go
@@ -14,6 +14,7 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -35,7 +36,7 @@ type UseInnoDBAdvisor struct {
// Check checks for using InnoDB engine.
func (*UseInnoDBAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- list, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
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 37aac838b4..ee643f1687 100644
--- a/backend/plugin/advisor/mysql/rule_view_disallow_create.go
+++ b/backend/plugin/advisor/mysql/rule_view_disallow_create.go
@@ -13,6 +13,7 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
advisorcode "github.com/bytebase/bytebase/backend/plugin/advisor/code"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -30,7 +31,7 @@ type ViewDisallowCreateAdvisor struct {
// Check checks for disallow creating view.
func (*ViewDisallowCreateAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/oceanbase/advisor_disallow_offline_ddl.go b/backend/plugin/advisor/oceanbase/advisor_disallow_offline_ddl.go
index a6f54e2c33..bda675fed9 100644
--- a/backend/plugin/advisor/oceanbase/advisor_disallow_offline_ddl.go
+++ b/backend/plugin/advisor/oceanbase/advisor_disallow_offline_ddl.go
@@ -17,6 +17,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -34,7 +35,7 @@ type DisallowOfflineDdlAdvisor struct {
// Check checks for disallow Offline DDL.
func (*DisallowOfflineDdlAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parser result")
}
diff --git a/backend/plugin/advisor/oceanbase/advisor_insert_row_limit.go b/backend/plugin/advisor/oceanbase/advisor_insert_row_limit.go
index ecbfb0e14a..5325d0584b 100644
--- a/backend/plugin/advisor/oceanbase/advisor_insert_row_limit.go
+++ b/backend/plugin/advisor/oceanbase/advisor_insert_row_limit.go
@@ -13,6 +13,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -30,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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ list, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql ParseResult")
}
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 c77bd0e975..a6cd3cf50f 100644
--- a/backend/plugin/advisor/oceanbase/advisor_statement_affected_row_limit.go
+++ b/backend/plugin/advisor/oceanbase/advisor_statement_affected_row_limit.go
@@ -14,6 +14,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"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
)
@@ -31,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, ok := checkCtx.AST.([]*mysqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to mysql parse result")
}
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 1b6ce5d0d9..68c53d4974 100644
--- a/backend/plugin/advisor/oracle/rule_builtin_prior_backup_check.go
+++ b/backend/plugin/advisor/oracle/rule_builtin_prior_backup_check.go
@@ -13,6 +13,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 +33,7 @@ func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx adv
return nil, nil
}
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 e3ebd9f99b..77bc2b0ac9 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
@@ -14,7 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -31,7 +31,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, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
diff --git a/backend/plugin/advisor/oracle/rule_column_comment_convention.go b/backend/plugin/advisor/oracle/rule_column_comment_convention.go
index e4c61b0a98..25663f9738 100644
--- a/backend/plugin/advisor/oracle/rule_column_comment_convention.go
+++ b/backend/plugin/advisor/oracle/rule_column_comment_convention.go
@@ -13,6 +13,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"
)
@@ -29,7 +30,7 @@ type ColumnCommentConventionAdvisor struct {
}
func (*ColumnCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 fc926c2547..d9ffe3695d 100644
--- a/backend/plugin/advisor/oracle/rule_column_maximum_character_length.go
+++ b/backend/plugin/advisor/oracle/rule_column_maximum_character_length.go
@@ -15,7 +15,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -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, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 f21bf44788..e3724012e7 100644
--- a/backend/plugin/advisor/oracle/rule_column_maximum_varchar_length.go
+++ b/backend/plugin/advisor/oracle/rule_column_maximum_varchar_length.go
@@ -15,7 +15,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -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, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
diff --git a/backend/plugin/advisor/oracle/rule_column_no_null.go b/backend/plugin/advisor/oracle/rule_column_no_null.go
index bf7945f027..df0a189e47 100644
--- a/backend/plugin/advisor/oracle/rule_column_no_null.go
+++ b/backend/plugin/advisor/oracle/rule_column_no_null.go
@@ -14,7 +14,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"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -33,7 +33,7 @@ type ColumnNoNullAdvisor struct {
// Check checks for column no NULL value.
func (*ColumnNoNullAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
diff --git a/backend/plugin/advisor/oracle/rule_column_require.go b/backend/plugin/advisor/oracle/rule_column_require.go
index 6a145eb0a8..ad28b8f1b8 100644
--- a/backend/plugin/advisor/oracle/rule_column_require.go
+++ b/backend/plugin/advisor/oracle/rule_column_require.go
@@ -16,7 +16,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -33,7 +33,7 @@ type ColumnRequireAdvisor struct {
// Check checks for column requirement.
func (*ColumnRequireAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
diff --git a/backend/plugin/advisor/oracle/rule_column_require_default.go b/backend/plugin/advisor/oracle/rule_column_require_default.go
index ca011b6eb4..c7af634354 100644
--- a/backend/plugin/advisor/oracle/rule_column_require_default.go
+++ b/backend/plugin/advisor/oracle/rule_column_require_default.go
@@ -15,7 +15,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -32,7 +32,7 @@ type ColumnRequireDefaultAdvisor struct {
// Check checks for column default requirement.
func (*ColumnRequireDefaultAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 f4228bb8c1..b98c4e069f 100644
--- a/backend/plugin/advisor/oracle/rule_column_type_disallow_list.go
+++ b/backend/plugin/advisor/oracle/rule_column_type_disallow_list.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
)
@@ -31,7 +32,7 @@ type ColumnTypeDisallowListAdvisor struct {
// Check checks for column type disallow list.
func (*ColumnTypeDisallowListAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 341a1f313f..3acd19f9f0 100644
--- a/backend/plugin/advisor/oracle/rule_index_key_number_limit.go
+++ b/backend/plugin/advisor/oracle/rule_index_key_number_limit.go
@@ -14,7 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -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, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 13176a01ac..c5956cc6b9 100644
--- a/backend/plugin/advisor/oracle/rule_insert_must_specify_column.go
+++ b/backend/plugin/advisor/oracle/rule_insert_must_specify_column.go
@@ -12,7 +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"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -29,7 +29,7 @@ type InsertMustSpecifyColumnAdvisor struct {
// Check checks for to enforce column specified.
func (*InsertMustSpecifyColumnAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
diff --git a/backend/plugin/advisor/oracle/rule_naming_identifier_case.go b/backend/plugin/advisor/oracle/rule_naming_identifier_case.go
index 3d4761013c..7c3b259e04 100644
--- a/backend/plugin/advisor/oracle/rule_naming_identifier_case.go
+++ b/backend/plugin/advisor/oracle/rule_naming_identifier_case.go
@@ -14,7 +14,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"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -31,7 +31,7 @@ type NamingIdentifierCaseAdvisor struct {
// Check checks for identifier case.
func (*NamingIdentifierCaseAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 3dcf899149..7e578c14a2 100644
--- a/backend/plugin/advisor/oracle/rule_naming_identifier_no_keyword.go
+++ b/backend/plugin/advisor/oracle/rule_naming_identifier_no_keyword.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
)
@@ -31,7 +32,7 @@ type NamingIdentifierNoKeywordAdvisor struct {
// Check checks for identifier naming convention without keyword.
func (*NamingIdentifierNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
diff --git a/backend/plugin/advisor/oracle/rule_naming_table.go b/backend/plugin/advisor/oracle/rule_naming_table.go
index 814431a52c..863a331ed6 100644
--- a/backend/plugin/advisor/oracle/rule_naming_table.go
+++ b/backend/plugin/advisor/oracle/rule_naming_table.go
@@ -14,7 +14,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"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -31,7 +31,7 @@ type NamingTableAdvisor struct {
// Check checks for table naming convention.
func (*NamingTableAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 25451d11bd..f8fd00849b 100644
--- a/backend/plugin/advisor/oracle/rule_naming_table_no_keyword.go
+++ b/backend/plugin/advisor/oracle/rule_naming_table_no_keyword.go
@@ -14,6 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
)
@@ -31,7 +32,7 @@ type NamingTableNoKeywordAdvisor struct {
// Check checks for table naming convention without keyword.
func (*NamingTableNoKeywordAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 35c63fca09..ccb8081673 100644
--- a/backend/plugin/advisor/oracle/rule_select_no_select_all.go
+++ b/backend/plugin/advisor/oracle/rule_select_no_select_all.go
@@ -12,7 +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"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -29,7 +29,7 @@ type SelectNoSelectAllAdvisor struct {
// Check checks for no select all.
func (*SelectNoSelectAllAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
diff --git a/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_ddl.go b/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_ddl.go
index 0f1272b038..1476135437 100644
--- a/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_ddl.go
+++ b/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_ddl.go
@@ -12,7 +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"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -32,7 +32,7 @@ func (*StatementDisallowMixInDDLAdvisor) Check(_ context.Context, checkCtx advis
default:
return nil, nil
}
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
diff --git a/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_dml.go b/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_dml.go
index 755279d857..27ab30fe88 100644
--- a/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_dml.go
+++ b/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_dml.go
@@ -12,7 +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"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -33,7 +33,7 @@ func (*StatementDisallowMixInDMLAdvisor) Check(_ context.Context, checkCtx advis
return nil, nil
}
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 64a07cc9bb..8cba2c1f04 100644
--- a/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.go
+++ b/backend/plugin/advisor/oracle/rule_statement_dml_dry_run.go
@@ -14,6 +14,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/plsql"
)
@@ -29,7 +30,7 @@ type StatementDmlDryRunAdvisor struct {
}
func (*StatementDmlDryRunAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsql.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
diff --git a/backend/plugin/advisor/oracle/rule_table_comment_convention.go b/backend/plugin/advisor/oracle/rule_table_comment_convention.go
index 31e10bab10..f461412918 100644
--- a/backend/plugin/advisor/oracle/rule_table_comment_convention.go
+++ b/backend/plugin/advisor/oracle/rule_table_comment_convention.go
@@ -13,6 +13,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"
)
@@ -29,7 +30,7 @@ type TableCommentConventionAdvisor struct {
}
func (*TableCommentConventionAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 40dd523d34..353b4bae6f 100644
--- a/backend/plugin/advisor/oracle/rule_table_no_foreign_key.go
+++ b/backend/plugin/advisor/oracle/rule_table_no_foreign_key.go
@@ -14,7 +14,7 @@ import (
"github.com/bytebase/bytebase/backend/common"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -31,7 +31,7 @@ type TableNoForeignKeyAdvisor struct {
// Check checks for table disallow foreign key.
func (*TableNoForeignKeyAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
diff --git a/backend/plugin/advisor/oracle/rule_table_require_pk.go b/backend/plugin/advisor/oracle/rule_table_require_pk.go
index fb7f456a78..c16b4baecf 100644
--- a/backend/plugin/advisor/oracle/rule_table_require_pk.go
+++ b/backend/plugin/advisor/oracle/rule_table_require_pk.go
@@ -13,7 +13,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"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -30,7 +30,7 @@ type TableRequirePKAdvisor struct {
// Check checks table requires PK.
func (*TableRequirePKAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 93228b174d..087d1bd9e8 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
@@ -13,7 +13,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"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -30,7 +30,7 @@ type WhereNoLeadingWildcardLikeAdvisor struct {
// Check checks for no leading wildcard LIKE.
func (*WhereNoLeadingWildcardLikeAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 c845ecc66e..9040607ddd 100644
--- a/backend/plugin/advisor/oracle/rule_where_require_for_select.go
+++ b/backend/plugin/advisor/oracle/rule_where_require_for_select.go
@@ -13,7 +13,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"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -30,7 +30,7 @@ type WhereRequireForSelectAdvisor struct {
// Check checks for WHERE clause requirement.
func (*WhereRequireForSelectAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
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 448d768252..cf9b640b9d 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
@@ -12,7 +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"
- plsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/plsql"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
var (
@@ -29,7 +29,7 @@ type WhereRequireForUpdateDeleteAdvisor struct {
// Check checks for WHERE clause requirement.
func (*WhereRequireForUpdateDeleteAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- stmtList, ok := checkCtx.AST.([]*plsqlparser.ParseResult)
+ stmtList, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert to ParseResult")
}
diff --git a/backend/plugin/advisor/pg/utils.go b/backend/plugin/advisor/pg/utils.go
index 3940924f0b..ab656de763 100644
--- a/backend/plugin/advisor/pg/utils.go
+++ b/backend/plugin/advisor/pg/utils.go
@@ -10,6 +10,7 @@ import (
"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"
)
@@ -34,14 +35,14 @@ func isTopLevel(ctx antlr.Tree) bool {
// 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) ([]*pg.ParseResult, error) {
+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")
}
- parseResults, ok := checkCtx.AST.([]*pg.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
- return nil, errors.Errorf("AST type mismatch: expected []*pg.ParseResult, got %T", checkCtx.AST)
+ return nil, errors.Errorf("AST type mismatch: expected []*base.ParseResult, got %T", checkCtx.AST)
}
return parseResults, nil
diff --git a/backend/plugin/advisor/snowflake/utils.go b/backend/plugin/advisor/snowflake/utils.go
index cad7a95be5..01443eebe6 100644
--- a/backend/plugin/advisor/snowflake/utils.go
+++ b/backend/plugin/advisor/snowflake/utils.go
@@ -4,21 +4,21 @@ import (
"github.com/pkg/errors"
"github.com/bytebase/bytebase/backend/plugin/advisor"
- snowsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/snowflake"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
// 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) ([]*snowsqlparser.ParseResult, error) {
+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")
}
- parseResults, ok := checkCtx.AST.([]*snowsqlparser.ParseResult)
+ parseResults, ok := checkCtx.AST.([]*base.ParseResult)
if !ok {
- return nil, errors.Errorf("AST type mismatch: expected []*snowsqlparser.ParseResult, got %T", checkCtx.AST)
+ return nil, errors.Errorf("AST type mismatch: expected []*base.ParseResult, got %T", checkCtx.AST)
}
return parseResults, nil
diff --git a/backend/plugin/parser/base/base.go b/backend/plugin/parser/base/base.go
index db6d1d9b04..f345f7dba9 100644
--- a/backend/plugin/parser/base/base.go
+++ b/backend/plugin/parser/base/base.go
@@ -149,3 +149,15 @@ func GetOffsetLength(total int) int {
length++
}
}
+
+// ParseResult is the result of parsing SQL statements.
+type ParseResult struct {
+ Tree antlr.Tree
+ Tokens *antlr.CommonTokenStream
+ // BaseLine stores the zero-based line offset where this SQL statement starts in the original multi-statement input.
+ // When splitting a multi-statement SQL script (e.g., "SELECT 1;\nSELECT 2;"), each statement is parsed separately.
+ // BaseLine tracks the original line number (minus 1) of the first token in this statement, allowing error messages
+ // and positions to be correctly reported relative to the original script rather than the isolated statement.
+ // Calculated as: token.GetLine() - 1 (since ANTLR uses 1-based line numbers, but BaseLine is 0-based for offset arithmetic).
+ BaseLine int
+}
diff --git a/backend/plugin/parser/base/interface.go b/backend/plugin/parser/base/interface.go
index 4b5f9e72fc..843d11f584 100644
--- a/backend/plugin/parser/base/interface.go
+++ b/backend/plugin/parser/base/interface.go
@@ -266,15 +266,15 @@ func RegisterParseFunc(engine storepb.Engine, f ParseFunc) {
// Parse parses the SQL statement and returns the AST.
// The return type (any) varies by database engine:
// - TiDB: []ast.StmtNode (github.com/pingcap/tidb/pkg/parser/ast)
-// - MySQL, MariaDB, OceanBase: []*ParseResult (github.com/bytebase/bytebase/backend/plugin/parser/mysql)
-// - PostgreSQL: []*ParseResult (github.com/bytebase/bytebase/backend/plugin/parser/pg) - ANTLR-based
+// - MySQL, MariaDB, OceanBase: []*base.ParseResult (github.com/bytebase/bytebase/backend/plugin/parser/base)
+// - PostgreSQL: []*base.ParseResult (github.com/bytebase/bytebase/backend/plugin/parser/base) - ANTLR-based
// - CockroachDB: statements.Statements (github.com/cockroachdb/cockroachdb-parser/pkg/sql/parser/statements)
// - Redshift: antlr.Tree
// - Oracle: antlr.Tree
-// - Snowflake: []*ParseResult (github.com/bytebase/bytebase/backend/plugin/parser/snowflake) - ANTLR-based
+// - Snowflake: []*base.ParseResult (github.com/bytebase/bytebase/backend/plugin/parser/base) - ANTLR-based
// - MSSQL: antlr.Tree
// - DynamoDB (PartiQL): antlr.Tree
-// - Doris: *ParseResult (github.com/bytebase/bytebase/backend/plugin/parser/doris)
+// - Doris: *base.ParseResult (github.com/bytebase/bytebase/backend/plugin/parser/base)
func Parse(engine storepb.Engine, statement string) (any, error) {
f, ok := parsers[engine]
if !ok {
diff --git a/backend/plugin/parser/bigquery/bigquery.go b/backend/plugin/parser/bigquery/bigquery.go
index 3b73660ad4..cabca49fd6 100644
--- a/backend/plugin/parser/bigquery/bigquery.go
+++ b/backend/plugin/parser/bigquery/bigquery.go
@@ -11,20 +11,14 @@ import (
"github.com/bytebase/bytebase/backend/utils"
)
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
-
// ParseBigQuerySQL parses the given SQL statement by using antlr4. Returns a list of AST and token stream if no error.
-func ParseBigQuerySQL(statement string) ([]*ParseResult, error) {
+func ParseBigQuerySQL(statement string) ([]*base.ParseResult, error) {
stmts, err := SplitSQL(statement)
if err != nil {
return nil, err
}
- var result []*ParseResult
+ var result []*base.ParseResult
for _, stmt := range stmts {
if stmt.Empty {
continue
@@ -40,7 +34,7 @@ func ParseBigQuerySQL(statement string) ([]*ParseResult, error) {
return result, nil
}
-func parseSingleBigQuerySQL(statement string, baseLine int) (*ParseResult, error) {
+func parseSingleBigQuerySQL(statement string, baseLine int) (*base.ParseResult, error) {
statement = strings.TrimRightFunc(statement, utils.IsSpaceOrSemicolon) + "\n;"
inputStream := antlr.NewInputStream(statement)
lexer := parser.NewGoogleSQLLexer(inputStream)
@@ -74,7 +68,7 @@ func parseSingleBigQuerySQL(statement string, baseLine int) (*ParseResult, error
return nil, parserErrorListener.Err
}
- result := &ParseResult{
+ result := &base.ParseResult{
Tree: tree,
Tokens: stream,
BaseLine: baseLine,
diff --git a/backend/plugin/parser/cassandra/cassandra.go b/backend/plugin/parser/cassandra/cassandra.go
index 81897dc168..65d7b85216 100644
--- a/backend/plugin/parser/cassandra/cassandra.go
+++ b/backend/plugin/parser/cassandra/cassandra.go
@@ -16,7 +16,7 @@ func init() {
}
// parseCassandraForRegistry is the ParseFunc for Cassandra.
-// Returns []*ParseResult on success.
+// Returns []*base.ParseResult on success.
func parseCassandraForRegistry(statement string) (any, error) {
result, err := ParseCassandraSQL(statement)
if err != nil {
@@ -25,20 +25,14 @@ func parseCassandraForRegistry(statement string) (any, error) {
return result, nil
}
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
-
// ParseCassandraSQL parses the given CQL statement by using antlr4. Returns a list of AST and token stream if no error.
-func ParseCassandraSQL(statement string) ([]*ParseResult, error) {
+func ParseCassandraSQL(statement string) ([]*base.ParseResult, error) {
stmts, err := SplitSQL(statement)
if err != nil {
return nil, err
}
- var result []*ParseResult
+ var result []*base.ParseResult
for _, stmt := range stmts {
if stmt.Empty {
continue
@@ -54,7 +48,7 @@ func ParseCassandraSQL(statement string) ([]*ParseResult, error) {
return result, nil
}
-func parseSingleCassandraSQL(statement string, baseLine int) (*ParseResult, error) {
+func parseSingleCassandraSQL(statement string, baseLine int) (*base.ParseResult, error) {
statement = strings.TrimRightFunc(statement, utils.IsSpaceOrSemicolon) + "\n;"
inputStream := antlr.NewInputStream(statement)
lexer := cql.NewCqlLexer(inputStream)
@@ -88,7 +82,7 @@ func parseSingleCassandraSQL(statement string, baseLine int) (*ParseResult, erro
return nil, parserErrorListener.Err
}
- result := &ParseResult{
+ result := &base.ParseResult{
Tree: tree,
Tokens: stream,
BaseLine: baseLine,
diff --git a/backend/plugin/parser/cosmosdb/cosmosdb.go b/backend/plugin/parser/cosmosdb/cosmosdb.go
index d31da387b6..38d472a1f9 100644
--- a/backend/plugin/parser/cosmosdb/cosmosdb.go
+++ b/backend/plugin/parser/cosmosdb/cosmosdb.go
@@ -10,21 +10,15 @@ import (
"github.com/bytebase/bytebase/backend/utils"
)
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
-
// ParseCosmosDBQuery parses the given CosmosDB SQL statement by using antlr4. Returns a list of AST and token stream if no error.
// Note: CosmosDB only supports single SELECT statements, so this will typically return a list with one element.
-func ParseCosmosDBQuery(statement string) ([]*ParseResult, error) {
+func ParseCosmosDBQuery(statement string) ([]*base.ParseResult, error) {
stmts, err := SplitSQL(statement)
if err != nil {
return nil, err
}
- var result []*ParseResult
+ var result []*base.ParseResult
for _, stmt := range stmts {
if stmt.Empty {
continue
@@ -40,7 +34,7 @@ func ParseCosmosDBQuery(statement string) ([]*ParseResult, error) {
return result, nil
}
-func parseSingleCosmosDBQuery(statement string, baseLine int) (*ParseResult, error) {
+func parseSingleCosmosDBQuery(statement string, baseLine int) (*base.ParseResult, error) {
statement = strings.TrimRightFunc(statement, utils.IsSpaceOrSemicolon)
inputStream := antlr.NewInputStream(statement)
lexer := parser.NewCosmosDBLexer(inputStream)
@@ -74,7 +68,7 @@ func parseSingleCosmosDBQuery(statement string, baseLine int) (*ParseResult, err
return nil, parserErrorListener.Err
}
- result := &ParseResult{
+ result := &base.ParseResult{
Tree: tree,
Tokens: stream,
BaseLine: baseLine,
diff --git a/backend/plugin/parser/doris/doris.go b/backend/plugin/parser/doris/doris.go
index 067b17e24f..63e332b707 100644
--- a/backend/plugin/parser/doris/doris.go
+++ b/backend/plugin/parser/doris/doris.go
@@ -13,7 +13,7 @@ func init() {
}
// parseDorisForRegistry is the ParseFunc for Doris.
-// Returns []*ParseResult on success.
+// Returns []*base.ParseResult on success.
func parseDorisForRegistry(statement string) (any, error) {
result, err := ParseDorisSQL(statement)
if err != nil {
@@ -22,21 +22,14 @@ func parseDorisForRegistry(statement string) (any, error) {
return result, nil
}
-// ParseResult is the result of parsing a Doris statement.
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
-
// ParseDorisSQL parses the given SQL statement by using antlr4. Returns a list of AST and token stream if no error.
-func ParseDorisSQL(statement string) ([]*ParseResult, error) {
+func ParseDorisSQL(statement string) ([]*base.ParseResult, error) {
stmts, err := SplitSQL(statement)
if err != nil {
return nil, err
}
- var result []*ParseResult
+ var result []*base.ParseResult
for _, stmt := range stmts {
if stmt.Empty {
continue
@@ -52,7 +45,7 @@ func ParseDorisSQL(statement string) ([]*ParseResult, error) {
return result, nil
}
-func parseSingleDorisSQL(statement string, baseLine int) (*ParseResult, error) {
+func parseSingleDorisSQL(statement string, baseLine int) (*base.ParseResult, error) {
lexer := parser.NewDorisSQLLexer(antlr.NewInputStream(statement))
stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)
p := parser.NewDorisSQLParser(stream)
@@ -81,7 +74,7 @@ func parseSingleDorisSQL(statement string, baseLine int) (*ParseResult, error) {
return nil, parserErrorListener.Err
}
- result := &ParseResult{
+ result := &base.ParseResult{
Tree: tree,
Tokens: stream,
BaseLine: baseLine,
diff --git a/backend/plugin/parser/doris/query_span_extractor.go b/backend/plugin/parser/doris/query_span_extractor.go
index 6fcec909f3..dc8d210d5a 100644
--- a/backend/plugin/parser/doris/query_span_extractor.go
+++ b/backend/plugin/parser/doris/query_span_extractor.go
@@ -71,7 +71,7 @@ func (q *querySpanExtractor) getQuerySpan(ctx context.Context, statement string)
}, nil
}
-func getAccessTables(database string, parseResult *ParseResult, ctes map[string]bool, gCtx base.GetQuerySpanContext, ignoreCaseSensitive bool) base.SourceColumnSet {
+func getAccessTables(database string, parseResult *base.ParseResult, ctes map[string]bool, gCtx base.GetQuerySpanContext, ignoreCaseSensitive bool) base.SourceColumnSet {
// First, extract CTEs from the query
cteListener := newCTEListener()
antlr.ParseTreeWalkerDefault.Walk(cteListener, parseResult.Tree)
diff --git a/backend/plugin/parser/mysql/backup.go b/backend/plugin/parser/mysql/backup.go
index 889a86dd9f..dc8bfbd86b 100644
--- a/backend/plugin/parser/mysql/backup.go
+++ b/backend/plugin/parser/mysql/backup.go
@@ -423,7 +423,7 @@ func (l *suffixSelectStatementListener) EnterUpdateStatement(ctx *parser.UpdateS
}
}
-func ExtractTables(databaseName string, parseResult *ParseResult, offset int) ([]StatementInfo, error) {
+func ExtractTables(databaseName string, parseResult *base.ParseResult, offset int) ([]StatementInfo, error) {
listener := &tableReferenceListener{
databaseName: databaseName,
offset: offset,
diff --git a/backend/plugin/parser/mysql/mysql.go b/backend/plugin/parser/mysql/mysql.go
index d76d42f813..7e9be3ae3b 100644
--- a/backend/plugin/parser/mysql/mysql.go
+++ b/backend/plugin/parser/mysql/mysql.go
@@ -28,15 +28,8 @@ func parseMySQLForRegistry(statement string) (any, error) {
return ParseMySQL(statement)
}
-// ParseResult is the result of parsing a MySQL statement.
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
-
// ParseMySQL parses the given SQL statement and returns the AST.
-func ParseMySQL(statement string) ([]*ParseResult, error) {
+func ParseMySQL(statement string) ([]*base.ParseResult, error) {
statement, err := DealWithDelimiter(statement)
if err != nil {
return nil, err
@@ -224,8 +217,8 @@ func mysqlAddSemicolonIfNeeded(sql string) string {
return sql
}
-func parseInputStream(input *antlr.InputStream, statement string) ([]*ParseResult, error) {
- var result []*ParseResult
+func parseInputStream(input *antlr.InputStream, statement string) ([]*base.ParseResult, error) {
+ var result []*base.ParseResult
lexer := parser.NewMySQLLexer(input)
stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)
@@ -249,7 +242,7 @@ func parseInputStream(input *antlr.InputStream, statement string) ([]*ParseResul
continue
}
- result = append(result, &ParseResult{
+ result = append(result, &base.ParseResult{
Tree: tree,
Tokens: tokens,
BaseLine: s.BaseLine,
diff --git a/backend/plugin/parser/mysql/resource_change.go b/backend/plugin/parser/mysql/resource_change.go
index 7f1f5bd743..60b5aec476 100644
--- a/backend/plugin/parser/mysql/resource_change.go
+++ b/backend/plugin/parser/mysql/resource_change.go
@@ -20,9 +20,9 @@ func init() {
}
func extractChangedResources(currentDatabase string, _ string, dbMetadata *model.DatabaseMetadata, asts any, statement string) (*base.ChangeSummary, error) {
- nodes, ok := asts.([]*ParseResult)
+ nodes, ok := asts.([]*base.ParseResult)
if !ok {
- return nil, errors.Errorf("invalid ast type %T", asts)
+ return nil, errors.Errorf("invalid ast type %T, expected []*base.ParseResult", asts)
}
changedResources := model.NewChangedResources(dbMetadata)
l := &resourceChangedListener{
diff --git a/backend/plugin/parser/mysql/restore.go b/backend/plugin/parser/mysql/restore.go
index 7cd7ae6bf5..5dce1840d1 100644
--- a/backend/plugin/parser/mysql/restore.go
+++ b/backend/plugin/parser/mysql/restore.go
@@ -49,7 +49,7 @@ func GenerateRestoreSQL(ctx context.Context, rCtx base.RestoreContext, statement
return doGenerate(ctx, rCtx, sqlForComment, parseResult[0], backupItem)
}
-func doGenerate(ctx context.Context, rCtx base.RestoreContext, sqlForComment string, parseResult *ParseResult, backupItem *storepb.PriorBackupDetail_Item) (string, error) {
+func doGenerate(ctx context.Context, rCtx base.RestoreContext, sqlForComment string, parseResult *base.ParseResult, backupItem *storepb.PriorBackupDetail_Item) (string, error) {
_, sourceDatabase, err := common.GetInstanceDatabaseID(backupItem.SourceTable.Database)
if err != nil {
return "", errors.Wrapf(err, "failed to get source database ID for %s", backupItem.SourceTable.Database)
diff --git a/backend/plugin/parser/mysql/statement_type.go b/backend/plugin/parser/mysql/statement_type.go
index d90b17231f..9c45acf761 100644
--- a/backend/plugin/parser/mysql/statement_type.go
+++ b/backend/plugin/parser/mysql/statement_type.go
@@ -3,12 +3,14 @@ package mysql
import (
"github.com/bytebase/parser/mysql"
"github.com/pkg/errors"
+
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
func GetStatementTypes(asts any) ([]string, error) {
- nodes, ok := asts.([]*ParseResult)
+ nodes, ok := asts.([]*base.ParseResult)
if !ok {
- return nil, errors.Errorf("invalid ast type %T", asts)
+ return nil, errors.Errorf("invalid ast type %T, expected []*base.ParseResult", asts)
}
sqlTypeSet := make(map[string]bool)
for _, node := range nodes {
@@ -23,7 +25,7 @@ func GetStatementTypes(asts any) ([]string, error) {
}
// GetStatementType return the type of statement.
-func getStatementType(stmt *ParseResult) string {
+func getStatementType(stmt *base.ParseResult) string {
for _, child := range stmt.Tree.GetChildren() {
switch ctx := child.(type) {
case *mysql.QueryContext:
diff --git a/backend/plugin/parser/partiql/partiql.go b/backend/plugin/parser/partiql/partiql.go
index 5ab268e818..d2ee5f3cce 100644
--- a/backend/plugin/parser/partiql/partiql.go
+++ b/backend/plugin/parser/partiql/partiql.go
@@ -17,7 +17,7 @@ func init() {
}
// parsePartiQLForRegistry is the ParseFunc for PartiQL.
-// Returns []*ParseResult on success.
+// Returns []*base.ParseResult on success.
func parsePartiQLForRegistry(statement string) (any, error) {
result, err := ParsePartiQL(statement)
if err != nil {
@@ -26,20 +26,14 @@ func parsePartiQLForRegistry(statement string) (any, error) {
return result, nil
}
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
-
// ParsePartiQL parses the given PartiQL statement by using antlr4. Returns a list of AST and token stream if no error.
-func ParsePartiQL(statement string) ([]*ParseResult, error) {
+func ParsePartiQL(statement string) ([]*base.ParseResult, error) {
stmts, err := SplitSQL(statement)
if err != nil {
return nil, err
}
- var result []*ParseResult
+ var result []*base.ParseResult
for _, stmt := range stmts {
if stmt.Empty {
continue
@@ -55,7 +49,7 @@ func ParsePartiQL(statement string) ([]*ParseResult, error) {
return result, nil
}
-func parseSinglePartiQL(statement string, baseLine int) (*ParseResult, error) {
+func parseSinglePartiQL(statement string, baseLine int) (*base.ParseResult, error) {
statement = strings.TrimRightFunc(statement, utils.IsSpaceOrSemicolon) + "\n;"
inputStream := antlr.NewInputStream(statement)
lexer := parser.NewPartiQLLexer(inputStream)
@@ -89,7 +83,7 @@ func parseSinglePartiQL(statement string, baseLine int) (*ParseResult, error) {
return nil, parserErrorListener.Err
}
- result := &ParseResult{
+ result := &base.ParseResult{
Tree: tree,
Tokens: stream,
BaseLine: baseLine,
diff --git a/backend/plugin/parser/pg/pg.go b/backend/plugin/parser/pg/pg.go
index 84d0217e75..e9f9288472 100644
--- a/backend/plugin/parser/pg/pg.go
+++ b/backend/plugin/parser/pg/pg.go
@@ -20,21 +20,15 @@ func parsePostgreSQLForRegistry(statement string) (any, error) {
return ParsePostgreSQL(statement)
}
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
-
// ParsePostgreSQL parses the given SQL and returns a list of ParseResult (one per statement).
// Use the PostgreSQL parser based on antlr4.
-func ParsePostgreSQL(sql string) ([]*ParseResult, error) {
+func ParsePostgreSQL(sql string) ([]*base.ParseResult, error) {
stmts, err := SplitSQL(sql)
if err != nil {
return nil, err
}
- var results []*ParseResult
+ var results []*base.ParseResult
for _, stmt := range stmts {
if stmt.Empty {
continue
@@ -51,7 +45,7 @@ func ParsePostgreSQL(sql string) ([]*ParseResult, error) {
}
// parseSinglePostgreSQL parses a single PostgreSQL statement and returns the ParseResult.
-func parseSinglePostgreSQL(sql string, baseLine int) (*ParseResult, error) {
+func parseSinglePostgreSQL(sql string, baseLine int) (*base.ParseResult, error) {
lexer := parser.NewPostgreSQLLexer(antlr.NewInputStream(sql))
stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)
p := parser.NewPostgreSQLParser(stream)
@@ -80,7 +74,7 @@ func parseSinglePostgreSQL(sql string, baseLine int) (*ParseResult, error) {
return nil, parserErrorListener.Err
}
- result := &ParseResult{
+ result := &base.ParseResult{
Tree: tree,
Tokens: stream,
BaseLine: baseLine,
@@ -91,7 +85,7 @@ func parseSinglePostgreSQL(sql string, baseLine int) (*ParseResult, error) {
// ParsePostgreSQLPLBlock parses the given PL/pgSQL block (BEGIN...END) and returns the ParseResult.
// Use the PostgreSQL parser based on antlr4, starting from pl_block rule.
-func ParsePostgreSQLPLBlock(plBlock string) (*ParseResult, error) {
+func ParsePostgreSQLPLBlock(plBlock string) (*base.ParseResult, error) {
lexer := parser.NewPostgreSQLLexer(antlr.NewInputStream(plBlock))
stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)
p := parser.NewPostgreSQLParser(stream)
@@ -119,7 +113,7 @@ func ParsePostgreSQLPLBlock(plBlock string) (*ParseResult, error) {
return nil, parserErrorListener.Err
}
- result := &ParseResult{
+ result := &base.ParseResult{
Tree: tree,
Tokens: stream,
}
diff --git a/backend/plugin/parser/pg/resource_change.go b/backend/plugin/parser/pg/resource_change.go
index f276d928f3..7dff78c83d 100644
--- a/backend/plugin/parser/pg/resource_change.go
+++ b/backend/plugin/parser/pg/resource_change.go
@@ -20,9 +20,9 @@ func init() {
}
func extractChangedResources(database string, _ string, dbMetadata *model.DatabaseMetadata, asts any, statement string) (*base.ChangeSummary, error) {
- parseResults, ok := asts.([]*ParseResult)
+ parseResults, ok := asts.([]*base.ParseResult)
if !ok {
- return nil, errors.Errorf("invalid ast type %T, expected []*ParseResult", asts)
+ return nil, errors.Errorf("invalid ast type %T, expected []*base.ParseResult", asts)
}
changedResources := model.NewChangedResources(dbMetadata)
diff --git a/backend/plugin/parser/pg/restore.go b/backend/plugin/parser/pg/restore.go
index 6126efbce7..0c97312128 100644
--- a/backend/plugin/parser/pg/restore.go
+++ b/backend/plugin/parser/pg/restore.go
@@ -40,7 +40,7 @@ func GenerateRestoreSQL(ctx context.Context, rCtx base.RestoreContext, statement
}
// Find the parse result that contains the statement at the backup position
- var targetResult *ParseResult
+ var targetResult *base.ParseResult
for _, parseResult := range parseResults {
// Walk the tree to find if this parse result contains the target statement
finder := &statementAtPositionFinder{
@@ -74,7 +74,7 @@ func GenerateRestoreSQL(ctx context.Context, rCtx base.RestoreContext, statement
return doGenerate(ctx, rCtx, sqlForComment, targetResult, backupItem, prependStatements)
}
-func doGenerate(ctx context.Context, rCtx base.RestoreContext, sqlForComment string, tree *ParseResult, backupItem *storepb.PriorBackupDetail_Item, prependStatements string) (string, error) {
+func doGenerate(ctx context.Context, rCtx base.RestoreContext, sqlForComment string, tree *base.ParseResult, backupItem *storepb.PriorBackupDetail_Item, prependStatements string) (string, error) {
_, sourceDatabase, err := common.GetInstanceDatabaseID(backupItem.SourceTable.Database)
if err != nil {
return "", errors.Wrapf(err, "failed to get source database ID for %s", backupItem.SourceTable.Database)
diff --git a/backend/plugin/parser/pg/statement_type.go b/backend/plugin/parser/pg/statement_type.go
index 472ed6577b..2d260c1061 100644
--- a/backend/plugin/parser/pg/statement_type.go
+++ b/backend/plugin/parser/pg/statement_type.go
@@ -3,6 +3,8 @@ package pg
import (
"github.com/antlr4-go/antlr/v4"
"github.com/pkg/errors"
+
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
// StatementTypeWithPosition contains statement type and its position information.
@@ -16,9 +18,9 @@ type StatementTypeWithPosition struct {
// GetStatementTypes returns statement types with position information.
// The line numbers are one-based.
func GetStatementTypes(asts any) ([]StatementTypeWithPosition, error) {
- parseResults, ok := asts.([]*ParseResult)
+ parseResults, ok := asts.([]*base.ParseResult)
if !ok {
- return nil, errors.Errorf("invalid ast type %T, expected []*ParseResult", asts)
+ return nil, errors.Errorf("invalid ast type %T, expected []*base.ParseResult", asts)
}
if len(parseResults) == 0 {
diff --git a/backend/plugin/parser/plsql/plsql.go b/backend/plugin/parser/plsql/plsql.go
index 5a4e5b0add..ecf5d21483 100644
--- a/backend/plugin/parser/plsql/plsql.go
+++ b/backend/plugin/parser/plsql/plsql.go
@@ -19,7 +19,7 @@ func init() {
}
// parsePLSQLForRegistry is the ParseFunc for PL/SQL.
-// Returns []*ParseResult on success.
+// Returns []*base.ParseResult on success.
func parsePLSQLForRegistry(statement string) (any, error) {
return ParsePLSQL(statement + ";")
}
@@ -57,17 +57,10 @@ func ParseVersion(banner string) (*Version, error) {
return nil, errors.Errorf("failed to parse version from banner: %s", banner)
}
-// ParseResult is the result of parsing a PL/SQL statement.
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
-
// ParsePLSQL parses the given PLSQL and returns a list of parse results.
// It first parses the whole statement to get the AST, then splits by unit_statement
// and sql_plus_command nodes, and re-parses each individual statement.
-func ParsePLSQL(sql string) ([]*ParseResult, error) {
+func ParsePLSQL(sql string) ([]*base.ParseResult, error) {
sql = addSemicolonIfNeeded(sql)
// First pass: parse the whole statement to get the AST for splitting
@@ -83,7 +76,7 @@ func ParsePLSQL(sql string) ([]*ParseResult, error) {
}
// Iterate through children in order to preserve statement ordering and re-parse each one
- var result []*ParseResult
+ var result []*base.ParseResult
for _, child := range sqlScript.GetChildren() {
var stmtText string
var stmtBaseLine int
@@ -111,7 +104,7 @@ func ParsePLSQL(sql string) ([]*ParseResult, error) {
return nil, err
}
- result = append(result, &ParseResult{
+ result = append(result, &base.ParseResult{
Tree: stmtTree,
Tokens: stmtTokens,
BaseLine: stmtBaseLine,
diff --git a/backend/plugin/parser/plsql/resource_change.go b/backend/plugin/parser/plsql/resource_change.go
index 3040d8f446..2d1e92932a 100644
--- a/backend/plugin/parser/plsql/resource_change.go
+++ b/backend/plugin/parser/plsql/resource_change.go
@@ -17,7 +17,7 @@ func init() {
func extractChangedResources(currentDatabase string, _ string, dbMetadata *model.DatabaseMetadata, asts any, statement string) (*base.ChangeSummary, error) {
// currentDatabase is the same as currentSchema for Oracle.
- results, ok := asts.([]*ParseResult)
+ results, ok := asts.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert ast to []*ParseResult, got %T", asts)
}
diff --git a/backend/plugin/parser/plsql/statement_type.go b/backend/plugin/parser/plsql/statement_type.go
index 9a96dbcbc2..a7a5cfae1c 100644
--- a/backend/plugin/parser/plsql/statement_type.go
+++ b/backend/plugin/parser/plsql/statement_type.go
@@ -4,10 +4,12 @@ import (
"github.com/antlr4-go/antlr/v4"
parser "github.com/bytebase/parser/plsql"
"github.com/pkg/errors"
+
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
)
func GetStatementTypes(asts any) ([]string, error) {
- nodes, ok := asts.([]*ParseResult)
+ nodes, ok := asts.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("invalid ast type %T", asts)
}
diff --git a/backend/plugin/parser/redshift/redshift.go b/backend/plugin/parser/redshift/redshift.go
index 61649f1df7..8bb915d967 100644
--- a/backend/plugin/parser/redshift/redshift.go
+++ b/backend/plugin/parser/redshift/redshift.go
@@ -17,27 +17,20 @@ func init() {
}
// parseRedshiftForRegistry is the ParseFunc for Redshift.
-// Returns []*ParseResult (list of AST nodes, one per statement) on success.
+// Returns []*base.ParseResult (list of AST nodes, one per statement) on success.
func parseRedshiftForRegistry(statement string) (any, error) {
return ParseRedshift(statement)
}
-// ParseResult is the result of parsing a Redshift statement.
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
-
// ParseRedshift parses the given SQL statement and returns a list of ParseResults.
// Each ParseResult represents one statement with its AST, tokens, and base line offset.
-func ParseRedshift(sql string) ([]*ParseResult, error) {
+func ParseRedshift(sql string) ([]*base.ParseResult, error) {
stmts, err := SplitSQL(sql)
if err != nil {
return nil, errors.Wrap(err, "failed to split SQL")
}
- var results []*ParseResult
+ var results []*base.ParseResult
for _, stmt := range stmts {
if stmt.Empty {
continue
@@ -54,7 +47,7 @@ func ParseRedshift(sql string) ([]*ParseResult, error) {
}
// parseSingleRedshift parses a single Redshift statement by using antlr4. Returns the AST and token stream if no error.
-func parseSingleRedshift(statement string, baseLine int) (*ParseResult, error) {
+func parseSingleRedshift(statement string, baseLine int) (*base.ParseResult, error) {
statement = strings.TrimRightFunc(statement, utils.IsSpaceOrSemicolon) + ";"
inputStream := antlr.NewInputStream(statement)
lexer := parser.NewRedshiftLexer(inputStream)
@@ -88,7 +81,7 @@ func parseSingleRedshift(statement string, baseLine int) (*ParseResult, error) {
return nil, parserErrorListener.Err
}
- result := &ParseResult{
+ result := &base.ParseResult{
Tree: tree,
Tokens: stream,
BaseLine: baseLine,
diff --git a/backend/plugin/parser/snowflake/snowflake.go b/backend/plugin/parser/snowflake/snowflake.go
index d45b37614e..767d607283 100644
--- a/backend/plugin/parser/snowflake/snowflake.go
+++ b/backend/plugin/parser/snowflake/snowflake.go
@@ -17,26 +17,20 @@ func init() {
}
// parseSnowflakeForRegistry is the ParseFunc for Snowflake.
-// Returns []*ParseResult on success.
+// Returns []*base.ParseResult on success.
func parseSnowflakeForRegistry(statement string) (any, error) {
return ParseSnowSQL(statement)
}
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
-
// ParseSnowSQL parses the given SQL and returns a list of ParseResult (one per statement).
// Use the Snowflake parser based on antlr4.
-func ParseSnowSQL(sql string) ([]*ParseResult, error) {
+func ParseSnowSQL(sql string) ([]*base.ParseResult, error) {
stmts, err := SplitSQL(sql)
if err != nil {
return nil, err
}
- var results []*ParseResult
+ var results []*base.ParseResult
for _, stmt := range stmts {
if stmt.Empty {
continue
@@ -53,7 +47,7 @@ func ParseSnowSQL(sql string) ([]*ParseResult, error) {
}
// parseSingleSnowSQL parses a single Snowflake statement and returns the ParseResult.
-func parseSingleSnowSQL(statement string, baseLine int) (*ParseResult, error) {
+func parseSingleSnowSQL(statement string, baseLine int) (*base.ParseResult, error) {
statement = strings.TrimRightFunc(statement, utils.IsSpaceOrSemicolon) + "\n;"
inputStream := antlr.NewInputStream(statement)
lexer := parser.NewSnowflakeLexer(inputStream)
@@ -87,7 +81,7 @@ func parseSingleSnowSQL(statement string, baseLine int) (*ParseResult, error) {
return nil, parserErrorListener.Err
}
- result := &ParseResult{
+ result := &base.ParseResult{
Tree: tree,
Tokens: stream,
BaseLine: baseLine,
diff --git a/backend/plugin/parser/spanner/spanner.go b/backend/plugin/parser/spanner/spanner.go
index 75c1b5af85..bc318eb5cb 100644
--- a/backend/plugin/parser/spanner/spanner.go
+++ b/backend/plugin/parser/spanner/spanner.go
@@ -11,21 +11,15 @@ import (
"github.com/bytebase/bytebase/backend/utils"
)
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
-
// ParseSpannerGoogleSQL parses the given SQL and returns a list of ParseResult (one per statement).
// Use the GoogleSQL parser based on antlr4.
-func ParseSpannerGoogleSQL(sql string) ([]*ParseResult, error) {
+func ParseSpannerGoogleSQL(sql string) ([]*base.ParseResult, error) {
stmts, err := SplitSQL(sql)
if err != nil {
return nil, err
}
- var results []*ParseResult
+ var results []*base.ParseResult
for _, stmt := range stmts {
if stmt.Empty {
continue
@@ -42,7 +36,7 @@ func ParseSpannerGoogleSQL(sql string) ([]*ParseResult, error) {
}
// parseSingleSpannerGoogleSQL parses a single Spanner statement and returns the ParseResult.
-func parseSingleSpannerGoogleSQL(statement string, baseLine int) (*ParseResult, error) {
+func parseSingleSpannerGoogleSQL(statement string, baseLine int) (*base.ParseResult, error) {
statement = strings.TrimRightFunc(statement, utils.IsSpaceOrSemicolon) + "\n;"
inputStream := antlr.NewInputStream(statement)
lexer := parser.NewGoogleSQLLexer(inputStream)
@@ -76,7 +70,7 @@ func parseSingleSpannerGoogleSQL(statement string, baseLine int) (*ParseResult,
return nil, parserErrorListener.Err
}
- result := &ParseResult{
+ result := &base.ParseResult{
Tree: tree,
Tokens: stream,
BaseLine: baseLine,
diff --git a/backend/plugin/parser/tidb/backup.go b/backend/plugin/parser/tidb/backup.go
index 79839ee9df..70a7e24510 100644
--- a/backend/plugin/parser/tidb/backup.go
+++ b/backend/plugin/parser/tidb/backup.go
@@ -424,7 +424,7 @@ type TableReference struct {
Alias string
}
-func extractTables(databaseName string, parseResult *mysql.ParseResult, offset int) ([]statementInfo, error) {
+func extractTables(databaseName string, parseResult *base.ParseResult, offset int) ([]statementInfo, error) {
listener := &tableReferenceListener{
databaseName: databaseName,
offset: offset,
diff --git a/backend/plugin/parser/tidb/tidb.go b/backend/plugin/parser/tidb/tidb.go
index ccd18be1a2..9cfddeb3b5 100644
--- a/backend/plugin/parser/tidb/tidb.go
+++ b/backend/plugin/parser/tidb/tidb.go
@@ -104,14 +104,7 @@ func ParseTiDB(sql string, charset string, collation string) ([]ast.StmtNode, er
return nodes, nil
}
-// ParseResult is the result of parsing a MySQL statement.
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
-
-func ANTLRParseTiDB(statement string) ([]*ParseResult, error) {
+func ANTLRParseTiDB(statement string) ([]*base.ParseResult, error) {
statement, err := DealWithDelimiter(statement)
if err != nil {
return nil, err
@@ -160,8 +153,8 @@ func parseSingleStatement(baseLine int, statement string) (antlr.Tree, *antlr.Co
return tree, stream, nil
}
-func parseInputStream(input *antlr.InputStream, statement string) ([]*ParseResult, error) {
- var result []*ParseResult
+func parseInputStream(input *antlr.InputStream, statement string) ([]*base.ParseResult, error) {
+ var result []*base.ParseResult
lexer := parser.NewTiDBLexer(input)
stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)
@@ -185,7 +178,7 @@ func parseInputStream(input *antlr.InputStream, statement string) ([]*ParseResul
continue
}
- result = append(result, &ParseResult{
+ result = append(result, &base.ParseResult{
Tree: tree,
Tokens: tokens,
BaseLine: s.BaseLine,
diff --git a/backend/plugin/parser/trino/trino.go b/backend/plugin/parser/trino/trino.go
index 989f75373c..48ccf05045 100644
--- a/backend/plugin/parser/trino/trino.go
+++ b/backend/plugin/parser/trino/trino.go
@@ -13,21 +13,16 @@ import (
)
// ParseResult is the result of parsing a Trino statement.
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
// ParseTrino parses the given SQL statement and returns a list of ParseResults.
// Each ParseResult represents one statement with its AST, tokens, and base line offset.
-func ParseTrino(sql string) ([]*ParseResult, error) {
+func ParseTrino(sql string) ([]*base.ParseResult, error) {
stmts, err := SplitSQL(sql)
if err != nil {
return nil, errors.Wrap(err, "failed to split SQL")
}
- var results []*ParseResult
+ var results []*base.ParseResult
for _, stmt := range stmts {
if stmt.Empty {
continue
@@ -44,7 +39,7 @@ func ParseTrino(sql string) ([]*ParseResult, error) {
}
// parseSingleTrino parses a single Trino statement and returns the ParseResult.
-func parseSingleTrino(sql string, baseLine int) (*ParseResult, error) {
+func parseSingleTrino(sql string, baseLine int) (*base.ParseResult, error) {
// Add a semicolon if it's missing to allow users to omit the semicolon
trimmedSQL := strings.TrimRightFunc(sql, unicode.IsSpace)
if len(trimmedSQL) > 0 && !strings.HasSuffix(trimmedSQL, ";") {
@@ -84,7 +79,7 @@ func parseSingleTrino(sql string, baseLine int) (*ParseResult, error) {
}
// Return the parse result
- return &ParseResult{
+ return &base.ParseResult{
Tree: tree,
Tokens: stream,
BaseLine: baseLine,
diff --git a/backend/plugin/parser/tsql/resource_change.go b/backend/plugin/parser/tsql/resource_change.go
index 00a10b72e0..43defbd810 100644
--- a/backend/plugin/parser/tsql/resource_change.go
+++ b/backend/plugin/parser/tsql/resource_change.go
@@ -20,7 +20,7 @@ func init() {
}
func extractChangedResources(currentDatabase string, currentSchema string, dbMetadata *model.DatabaseMetadata, asts any, statement string) (*base.ChangeSummary, error) {
- parseResults, ok := asts.([]*ParseResult)
+ parseResults, ok := asts.([]*base.ParseResult)
if !ok {
return nil, errors.Errorf("failed to convert ast to ParseResult list")
}
diff --git a/backend/plugin/parser/tsql/restore.go b/backend/plugin/parser/tsql/restore.go
index 7d694731e4..811c2b8d6c 100644
--- a/backend/plugin/parser/tsql/restore.go
+++ b/backend/plugin/parser/tsql/restore.go
@@ -40,7 +40,7 @@ func GenerateRestoreSQL(ctx context.Context, rCtx base.RestoreContext, statement
}
// Find the parse result that contains the statement at the backup position
- var targetResult *ParseResult
+ var targetResult *base.ParseResult
for _, parseResult := range parseResults {
// Walk the tree to find if this parse result contains the target statement
finder := &statementAtPositionFinder{
@@ -68,7 +68,7 @@ func GenerateRestoreSQL(ctx context.Context, rCtx base.RestoreContext, statement
return doGenerate(ctx, rCtx, sqlForComment, targetResult, backupItem)
}
-func doGenerate(ctx context.Context, rCtx base.RestoreContext, sqlForComment string, tree *ParseResult, backupItem *storepb.PriorBackupDetail_Item) (string, error) {
+func doGenerate(ctx context.Context, rCtx base.RestoreContext, sqlForComment string, tree *base.ParseResult, backupItem *storepb.PriorBackupDetail_Item) (string, error) {
_, sourceDatabase, err := common.GetInstanceDatabaseID(backupItem.SourceTable.Database)
if err != nil {
return "", errors.Wrapf(err, "failed to get source database ID for %s", backupItem.SourceTable.Database)
diff --git a/backend/plugin/parser/tsql/tsql.go b/backend/plugin/parser/tsql/tsql.go
index 33a8b53a2e..61bf8c0e36 100644
--- a/backend/plugin/parser/tsql/tsql.go
+++ b/backend/plugin/parser/tsql/tsql.go
@@ -18,26 +18,20 @@ func init() {
}
// parseTSQLForRegistry is the ParseFunc for T-SQL.
-// Returns []*ParseResult on success.
+// Returns []*base.ParseResult on success.
func parseTSQLForRegistry(statement string) (any, error) {
return ParseTSQL(statement)
}
-type ParseResult struct {
- Tree antlr.Tree
- Tokens *antlr.CommonTokenStream
- BaseLine int
-}
-
// ParseTSQL parses the given SQL and returns a list of ParseResult (one per statement).
// Use the T-SQL parser based on antlr4.
-func ParseTSQL(sql string) ([]*ParseResult, error) {
+func ParseTSQL(sql string) ([]*base.ParseResult, error) {
stmts, err := SplitSQL(sql)
if err != nil {
return nil, err
}
- var results []*ParseResult
+ var results []*base.ParseResult
for _, stmt := range stmts {
if stmt.Empty {
continue
@@ -54,7 +48,7 @@ func ParseTSQL(sql string) ([]*ParseResult, error) {
}
// parseSingleTSQL parses a single T-SQL statement and returns the ParseResult.
-func parseSingleTSQL(statement string, baseLine int) (*ParseResult, error) {
+func parseSingleTSQL(statement string, baseLine int) (*base.ParseResult, error) {
inputStream := antlr.NewInputStream(statement)
lexer := parser.NewTSqlLexer(inputStream)
stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)
@@ -87,7 +81,7 @@ func parseSingleTSQL(statement string, baseLine int) (*ParseResult, error) {
return nil, parserErrorListener.Err
}
- result := &ParseResult{
+ result := &base.ParseResult{
Tree: tree,
Tokens: stream,
BaseLine: baseLine,
diff --git a/backend/plugin/schema/mysql/walk_through.go b/backend/plugin/schema/mysql/walk_through.go
index a44d6a9cba..f1b6f37092 100644
--- a/backend/plugin/schema/mysql/walk_through.go
+++ b/backend/plugin/schema/mysql/walk_through.go
@@ -13,6 +13,7 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor/code"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
"github.com/bytebase/bytebase/backend/plugin/parser/tidb"
"github.com/bytebase/bytebase/backend/plugin/schema"
@@ -43,7 +44,7 @@ func WalkThrough(d *model.DatabaseMetadata, ast any) *storepb.Advice {
d.CreateSchema("")
}
- nodeList, ok := ast.([]*mysqlparser.ParseResult)
+ nodeList, ok := ast.([]*base.ParseResult)
if !ok {
return &storepb.Advice{
Status: storepb.Advice_ERROR,
@@ -79,7 +80,7 @@ func (l *mysqlListener) EnterQuery(ctx *mysql.QueryContext) {
l.lineNumber = l.baseLine + ctx.GetStart().GetLine()
}
-func mysqlChangeState(d *model.DatabaseMetadata, in *mysqlparser.ParseResult) *storepb.Advice {
+func mysqlChangeState(d *model.DatabaseMetadata, in *base.ParseResult) *storepb.Advice {
listener := &mysqlListener{
baseLine: in.BaseLine,
databaseMetadata: d,
diff --git a/backend/plugin/schema/pg/walk_through.go b/backend/plugin/schema/pg/walk_through.go
index 4fb8d43cf0..1178de3445 100644
--- a/backend/plugin/schema/pg/walk_through.go
+++ b/backend/plugin/schema/pg/walk_through.go
@@ -9,6 +9,7 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/advisor/code"
+ "github.com/bytebase/bytebase/backend/plugin/parser/base"
pgparser "github.com/bytebase/bytebase/backend/plugin/parser/pg"
"github.com/bytebase/bytebase/backend/plugin/schema"
"github.com/bytebase/bytebase/backend/store/model"
@@ -26,13 +27,13 @@ func init() {
// WalkThrough walks through the PostgreSQL ANTLR parse tree and builds catalog metadata.
func WalkThrough(d *model.DatabaseMetadata, ast any) *storepb.Advice {
// ANTLR-based walkthrough
- parseResults, ok := ast.([]*pgparser.ParseResult)
+ parseResults, ok := ast.([]*base.ParseResult)
if !ok {
return &storepb.Advice{
Status: storepb.Advice_ERROR,
Code: code.Internal.Int32(),
- Title: fmt.Sprintf("PostgreSQL walk-through expects []*pgparser.ParseResult, got %T", ast),
- Content: fmt.Sprintf("PostgreSQL walk-through expects []*pgparser.ParseResult, got %T", ast),
+ Title: fmt.Sprintf("PostgreSQL walk-through expects []*base.ParseResult, got %T", ast),
+ Content: fmt.Sprintf("PostgreSQL walk-through expects []*base.ParseResult, got %T", ast),
StartPosition: &storepb.Position{
Line: 0,
},