Skip to content

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

refactor: consolidate DDL/DML distinction in plan checks and SQL review (#18277)

p0ny715218792239
diff --git a/backend/api/v1/plan_service_plan_check.go b/backend/api/v1/plan_service_plan_check.go
index 1fe5a0d3b7..06f8b2118a 100644
--- a/backend/api/v1/plan_service_plan_check.go
+++ b/backend/api/v1/plan_service_plan_check.go
@@ -189,16 +189,19 @@ func getPlanCheckRunsFromChangeDatabaseConfigForDatabase(ctx context.Context, s
return nil, errors.Errorf("sheet %d not found in project %s", sheetUID, plan.ProjectID)
}
+ enableSDL := config.Type == storepb.PlanConfig_ChangeDatabaseConfig_SDL
+
var planCheckRuns []*store.PlanCheckRunMessage
planCheckRuns = append(planCheckRuns, &store.PlanCheckRunMessage{
PlanUID: plan.UID,
Status: store.PlanCheckRunStatusRunning,
Type: store.PlanCheckDatabaseConnect,
Config: &storepb.PlanCheckRunConfig{
- SheetUid: int32(sheetUID),
- ChangeDatabaseType: convertToChangeDatabaseType(config.Type, config.EnableGhost),
- InstanceId: instance.ResourceID,
- DatabaseName: database.DatabaseName,
+ SheetUid: int32(sheetUID),
+ InstanceId: instance.ResourceID,
+ DatabaseName: database.DatabaseName,
+ EnableGhost: config.EnableGhost,
+ EnableSdl: enableSDL,
},
})
@@ -207,11 +210,12 @@ func getPlanCheckRunsFromChangeDatabaseConfigForDatabase(ctx context.Context, s
Status: store.PlanCheckRunStatusRunning,
Type: store.PlanCheckDatabaseStatementAdvise,
Config: &storepb.PlanCheckRunConfig{
- SheetUid: int32(sheetUID),
- ChangeDatabaseType: convertToChangeDatabaseType(config.Type, config.EnableGhost),
- InstanceId: instance.ResourceID,
- DatabaseName: database.DatabaseName,
- EnablePriorBackup: config.EnablePriorBackup,
+ SheetUid: int32(sheetUID),
+ InstanceId: instance.ResourceID,
+ DatabaseName: database.DatabaseName,
+ EnablePriorBackup: config.EnablePriorBackup,
+ EnableGhost: config.EnableGhost,
+ EnableSdl: enableSDL,
},
})
planCheckRuns = append(planCheckRuns, &store.PlanCheckRunMessage{
@@ -219,10 +223,11 @@ func getPlanCheckRunsFromChangeDatabaseConfigForDatabase(ctx context.Context, s
Status: store.PlanCheckRunStatusRunning,
Type: store.PlanCheckDatabaseStatementSummaryReport,
Config: &storepb.PlanCheckRunConfig{
- SheetUid: int32(sheetUID),
- ChangeDatabaseType: convertToChangeDatabaseType(config.Type, config.EnableGhost),
- InstanceId: instance.ResourceID,
- DatabaseName: database.DatabaseName,
+ SheetUid: int32(sheetUID),
+ InstanceId: instance.ResourceID,
+ DatabaseName: database.DatabaseName,
+ EnableGhost: config.EnableGhost,
+ EnableSdl: enableSDL,
},
})
if config.Type == storepb.PlanConfig_ChangeDatabaseConfig_MIGRATE && config.EnableGhost {
@@ -231,11 +236,12 @@ func getPlanCheckRunsFromChangeDatabaseConfigForDatabase(ctx context.Context, s
Status: store.PlanCheckRunStatusRunning,
Type: store.PlanCheckDatabaseGhostSync,
Config: &storepb.PlanCheckRunConfig{
- SheetUid: int32(sheetUID),
- ChangeDatabaseType: convertToChangeDatabaseType(config.Type, config.EnableGhost),
- InstanceId: instance.ResourceID,
- DatabaseName: database.DatabaseName,
- GhostFlags: config.GhostFlags,
+ SheetUid: int32(sheetUID),
+ InstanceId: instance.ResourceID,
+ DatabaseName: database.DatabaseName,
+ EnableGhost: config.EnableGhost,
+ EnableSdl: enableSDL,
+ GhostFlags: config.GhostFlags,
},
})
}
@@ -243,20 +249,6 @@ func getPlanCheckRunsFromChangeDatabaseConfigForDatabase(ctx context.Context, s
return planCheckRuns, nil
}
-func convertToChangeDatabaseType(t storepb.PlanConfig_ChangeDatabaseConfig_Type, enableGhost bool) storepb.PlanCheckRunConfig_ChangeDatabaseType {
- switch t {
- case storepb.PlanConfig_ChangeDatabaseConfig_MIGRATE:
- if enableGhost {
- return storepb.PlanCheckRunConfig_DDL_GHOST
- }
- return storepb.PlanCheckRunConfig_DDL
- case storepb.PlanConfig_ChangeDatabaseConfig_SDL:
- return storepb.PlanCheckRunConfig_SDL
- default:
- return storepb.PlanCheckRunConfig_CHANGE_DATABASE_TYPE_UNSPECIFIED
- }
-}
-
func getSheetUIDsFromChangeDatabaseConfig(config *storepb.PlanConfig_ChangeDatabaseConfig) ([]int, error) {
var sheetUIDs []int
if config.Sheet != "" {
diff --git a/backend/api/v1/release_service_check.go b/backend/api/v1/release_service_check.go
index 49d5fe8a3f..64e33412b5 100644
--- a/backend/api/v1/release_service_check.go
+++ b/backend/api/v1/release_service_check.go
@@ -266,10 +266,6 @@ loop:
}
}
- changeType := storepb.PlanCheckRunConfig_DDL
- if file.EnableGhost {
- changeType = storepb.PlanCheckRunConfig_DDL_GHOST
- }
// Get SQL summary report for the statement and target database.
// Including affected rows.
summaryReport, err := plancheck.GetSQLSummaryReport(ctx, s.store, s.sheetManager, s.dbFactory, database, statement)
@@ -281,7 +277,7 @@ loop:
resp.AffectedRows += summaryReport.AffectedRows
}
if common.EngineSupportSQLReview(engine) {
- adviceStatus, sqlReviewAdvices, err := s.runSQLReviewCheckForFile(ctx, originMetadata, finalMetadata, instance, database, changeType, statement)
+ adviceStatus, sqlReviewAdvices, err := s.runSQLReviewCheckForFile(ctx, originMetadata, finalMetadata, instance, database, false /* enableSDL */, statement)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to check SQL review"))
}
@@ -631,7 +627,7 @@ func (s *ReleaseService) runSQLReviewCheckForFile(
finalMetadata *model.DatabaseMetadata,
instance *store.InstanceMessage,
database *store.DatabaseMessage,
- changeType storepb.PlanCheckRunConfig_ChangeDatabaseType,
+ enableSDL bool,
statement string,
) (storepb.Advice_Status, []*v1pb.Advice, error) {
dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
@@ -672,7 +668,7 @@ func (s *ReleaseService) runSQLReviewCheckForFile(
context := advisor.Context{
Charset: dbMetadataProto.CharacterSet,
Collation: dbMetadataProto.Collation,
- ChangeType: changeType,
+ EnableSDL: enableSDL,
DBSchema: dbMetadataProto,
DBType: instance.Metadata.GetEngine(),
OriginalMetadata: originMetadata,
diff --git a/backend/generated-go/store/plan_check_run.pb.go b/backend/generated-go/store/plan_check_run.pb.go
index fbca490685..a6187fd6d8 100644
--- a/backend/generated-go/store/plan_check_run.pb.go
+++ b/backend/generated-go/store/plan_check_run.pb.go
@@ -21,74 +21,18 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// ChangeDatabaseType extends MigrationType with additional execution contexts.
-// Note: DDL, DML, and DDL_GHOST values align with MigrationType enum values.
-type PlanCheckRunConfig_ChangeDatabaseType int32
-
-const (
- PlanCheckRunConfig_CHANGE_DATABASE_TYPE_UNSPECIFIED PlanCheckRunConfig_ChangeDatabaseType = 0
- PlanCheckRunConfig_DDL PlanCheckRunConfig_ChangeDatabaseType = 1
- PlanCheckRunConfig_DML PlanCheckRunConfig_ChangeDatabaseType = 2
- PlanCheckRunConfig_SDL PlanCheckRunConfig_ChangeDatabaseType = 3
- PlanCheckRunConfig_DDL_GHOST PlanCheckRunConfig_ChangeDatabaseType = 4
-)
-
-// Enum value maps for PlanCheckRunConfig_ChangeDatabaseType.
-var (
- PlanCheckRunConfig_ChangeDatabaseType_name = map[int32]string{
- 0: "CHANGE_DATABASE_TYPE_UNSPECIFIED",
- 1: "DDL",
- 2: "DML",
- 3: "SDL",
- 4: "DDL_GHOST",
- }
- PlanCheckRunConfig_ChangeDatabaseType_value = map[string]int32{
- "CHANGE_DATABASE_TYPE_UNSPECIFIED": 0,
- "DDL": 1,
- "DML": 2,
- "SDL": 3,
- "DDL_GHOST": 4,
- }
-)
-
-func (x PlanCheckRunConfig_ChangeDatabaseType) Enum() *PlanCheckRunConfig_ChangeDatabaseType {
- p := new(PlanCheckRunConfig_ChangeDatabaseType)
- *p = x
- return p
-}
-
-func (x PlanCheckRunConfig_ChangeDatabaseType) String() string {
- return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (PlanCheckRunConfig_ChangeDatabaseType) Descriptor() protoreflect.EnumDescriptor {
- return file_store_plan_check_run_proto_enumTypes[0].Descriptor()
-}
-
-func (PlanCheckRunConfig_ChangeDatabaseType) Type() protoreflect.EnumType {
- return &file_store_plan_check_run_proto_enumTypes[0]
-}
-
-func (x PlanCheckRunConfig_ChangeDatabaseType) Number() protoreflect.EnumNumber {
- return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use PlanCheckRunConfig_ChangeDatabaseType.Descriptor instead.
-func (PlanCheckRunConfig_ChangeDatabaseType) EnumDescriptor() ([]byte, []int) {
- return file_store_plan_check_run_proto_rawDescGZIP(), []int{0, 0}
-}
-
type PlanCheckRunConfig struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- SheetUid int32 `protobuf:"varint,1,opt,name=sheet_uid,json=sheetUid,proto3" json:"sheet_uid,omitempty"`
- ChangeDatabaseType PlanCheckRunConfig_ChangeDatabaseType `protobuf:"varint,2,opt,name=change_database_type,json=changeDatabaseType,proto3,enum=bytebase.store.PlanCheckRunConfig_ChangeDatabaseType" json:"change_database_type,omitempty"`
- InstanceId string `protobuf:"bytes,3,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"`
- DatabaseName string `protobuf:"bytes,4,opt,name=database_name,json=databaseName,proto3" json:"database_name,omitempty"`
- GhostFlags map[string]string `protobuf:"bytes,6,rep,name=ghost_flags,json=ghostFlags,proto3" json:"ghost_flags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+ state protoimpl.MessageState `protogen:"open.v1"`
+ SheetUid int32 `protobuf:"varint,1,opt,name=sheet_uid,json=sheetUid,proto3" json:"sheet_uid,omitempty"`
+ InstanceId string `protobuf:"bytes,3,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"`
+ DatabaseName string `protobuf:"bytes,4,opt,name=database_name,json=databaseName,proto3" json:"database_name,omitempty"`
+ GhostFlags map[string]string `protobuf:"bytes,6,rep,name=ghost_flags,json=ghostFlags,proto3" json:"ghost_flags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
// If set, a backup of the modified data will be created automatically before any changes are applied.
EnablePriorBackup bool `protobuf:"varint,7,opt,name=enable_prior_backup,json=enablePriorBackup,proto3" json:"enable_prior_backup,omitempty"`
// Whether to use gh-ost for online schema migration.
- EnableGhost bool `protobuf:"varint,8,opt,name=enable_ghost,json=enableGhost,proto3" json:"enable_ghost,omitempty"`
+ EnableGhost bool `protobuf:"varint,8,opt,name=enable_ghost,json=enableGhost,proto3" json:"enable_ghost,omitempty"`
+ // Whether this is a Schema Definition Language (SDL) change.
+ EnableSdl bool `protobuf:"varint,9,opt,name=enable_sdl,json=enableSdl,proto3" json:"enable_sdl,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -130,13 +74,6 @@ func (x *PlanCheckRunConfig) GetSheetUid() int32 {
return 0
}
-func (x *PlanCheckRunConfig) GetChangeDatabaseType() PlanCheckRunConfig_ChangeDatabaseType {
- if x != nil {
- return x.ChangeDatabaseType
- }
- return PlanCheckRunConfig_CHANGE_DATABASE_TYPE_UNSPECIFIED
-}
-
func (x *PlanCheckRunConfig) GetInstanceId() string {
if x != nil {
return x.InstanceId
@@ -172,6 +109,13 @@ func (x *PlanCheckRunConfig) GetEnableGhost() bool {
return false
}
+func (x *PlanCheckRunConfig) GetEnableSdl() bool {
+ if x != nil {
+ return x.EnableSdl
+ }
+ return false
+}
+
type PlanCheckRunResult struct {
state protoimpl.MessageState `protogen:"open.v1"`
Results []*PlanCheckRunResult_Result `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
@@ -456,26 +400,21 @@ var File_store_plan_check_run_proto protoreflect.FileDescriptor
const file_store_plan_check_run_proto_rawDesc = "" +
"\n" +
- "\x1astore/plan_check_run.proto\x12\x0ebytebase.store\x1a\x12store/advice.proto\x1a\x15store/changelog.proto\x1a\x12store/common.proto\"\xad\x04\n" +
+ "\x1astore/plan_check_run.proto\x12\x0ebytebase.store\x1a\x12store/advice.proto\x1a\x15store/changelog.proto\x1a\x12store/common.proto\"\x83\x03\n" +
"\x12PlanCheckRunConfig\x12\x1b\n" +
- "\tsheet_uid\x18\x01 \x01(\x05R\bsheetUid\x12g\n" +
- "\x14change_database_type\x18\x02 \x01(\x0e25.bytebase.store.PlanCheckRunConfig.ChangeDatabaseTypeR\x12changeDatabaseType\x12\x1f\n" +
+ "\tsheet_uid\x18\x01 \x01(\x05R\bsheetUid\x12\x1f\n" +
"\vinstance_id\x18\x03 \x01(\tR\n" +
"instanceId\x12#\n" +
"\rdatabase_name\x18\x04 \x01(\tR\fdatabaseName\x12S\n" +
"\vghost_flags\x18\x06 \x03(\v22.bytebase.store.PlanCheckRunConfig.GhostFlagsEntryR\n" +
"ghostFlags\x12.\n" +
"\x13enable_prior_backup\x18\a \x01(\bR\x11enablePriorBackup\x12!\n" +
- "\fenable_ghost\x18\b \x01(\bR\venableGhost\x1a=\n" +
+ "\fenable_ghost\x18\b \x01(\bR\venableGhost\x12\x1d\n" +
+ "\n" +
+ "enable_sdl\x18\t \x01(\bR\tenableSdl\x1a=\n" +
"\x0fGhostFlagsEntry\x12\x10\n" +
"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
- "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"d\n" +
- "\x12ChangeDatabaseType\x12$\n" +
- " CHANGE_DATABASE_TYPE_UNSPECIFIED\x10\x00\x12\a\n" +
- "\x03DDL\x10\x01\x12\a\n" +
- "\x03DML\x10\x02\x12\a\n" +
- "\x03SDL\x10\x03\x12\r\n" +
- "\tDDL_GHOST\x10\x04\"\xb6\x06\n" +
+ "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01J\x04\b\x02\x10\x03\"\xb6\x06\n" +
"\x12PlanCheckRunResult\x12C\n" +
"\aresults\x18\x01 \x03(\v2).bytebase.store.PlanCheckRunResult.ResultR\aresults\x12\x14\n" +
"\x05error\x18\x02 \x01(\tR\x05error\x1a\xc4\x05\n" +
@@ -508,35 +447,32 @@ func file_store_plan_check_run_proto_rawDescGZIP() []byte {
return file_store_plan_check_run_proto_rawDescData
}
-var file_store_plan_check_run_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_store_plan_check_run_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_store_plan_check_run_proto_goTypes = []any{
- (PlanCheckRunConfig_ChangeDatabaseType)(0), // 0: bytebase.store.PlanCheckRunConfig.ChangeDatabaseType
- (*PlanCheckRunConfig)(nil), // 1: bytebase.store.PlanCheckRunConfig
- (*PlanCheckRunResult)(nil), // 2: bytebase.store.PlanCheckRunResult
- nil, // 3: bytebase.store.PlanCheckRunConfig.GhostFlagsEntry
- (*PlanCheckRunResult_Result)(nil), // 4: bytebase.store.PlanCheckRunResult.Result
- (*PlanCheckRunResult_Result_SqlSummaryReport)(nil), // 5: bytebase.store.PlanCheckRunResult.Result.SqlSummaryReport
- (*PlanCheckRunResult_Result_SqlReviewReport)(nil), // 6: bytebase.store.PlanCheckRunResult.Result.SqlReviewReport
- (Advice_Status)(0), // 7: bytebase.store.Advice.Status
- (*ChangedResources)(nil), // 8: bytebase.store.ChangedResources
- (*Position)(nil), // 9: bytebase.store.Position
+ (*PlanCheckRunConfig)(nil), // 0: bytebase.store.PlanCheckRunConfig
+ (*PlanCheckRunResult)(nil), // 1: bytebase.store.PlanCheckRunResult
+ nil, // 2: bytebase.store.PlanCheckRunConfig.GhostFlagsEntry
+ (*PlanCheckRunResult_Result)(nil), // 3: bytebase.store.PlanCheckRunResult.Result
+ (*PlanCheckRunResult_Result_SqlSummaryReport)(nil), // 4: bytebase.store.PlanCheckRunResult.Result.SqlSummaryReport
+ (*PlanCheckRunResult_Result_SqlReviewReport)(nil), // 5: bytebase.store.PlanCheckRunResult.Result.SqlReviewReport
+ (Advice_Status)(0), // 6: bytebase.store.Advice.Status
+ (*ChangedResources)(nil), // 7: bytebase.store.ChangedResources
+ (*Position)(nil), // 8: bytebase.store.Position
}
var file_store_plan_check_run_proto_depIdxs = []int32{
- 0, // 0: bytebase.store.PlanCheckRunConfig.change_database_type:type_name -> bytebase.store.PlanCheckRunConfig.ChangeDatabaseType
- 3, // 1: bytebase.store.PlanCheckRunConfig.ghost_flags:type_name -> bytebase.store.PlanCheckRunConfig.GhostFlagsEntry
- 4, // 2: bytebase.store.PlanCheckRunResult.results:type_name -> bytebase.store.PlanCheckRunResult.Result
- 7, // 3: bytebase.store.PlanCheckRunResult.Result.status:type_name -> bytebase.store.Advice.Status
- 5, // 4: bytebase.store.PlanCheckRunResult.Result.sql_summary_report:type_name -> bytebase.store.PlanCheckRunResult.Result.SqlSummaryReport
- 6, // 5: bytebase.store.PlanCheckRunResult.Result.sql_review_report:type_name -> bytebase.store.PlanCheckRunResult.Result.SqlReviewReport
- 8, // 6: bytebase.store.PlanCheckRunResult.Result.SqlSummaryReport.changed_resources:type_name -> bytebase.store.ChangedResources
- 9, // 7: bytebase.store.PlanCheckRunResult.Result.SqlReviewReport.start_position:type_name -> bytebase.store.Position
- 9, // 8: bytebase.store.PlanCheckRunResult.Result.SqlReviewReport.end_position:type_name -> bytebase.store.Position
- 9, // [9:9] is the sub-list for method output_type
- 9, // [9:9] is the sub-list for method input_type
- 9, // [9:9] is the sub-list for extension type_name
- 9, // [9:9] is the sub-list for extension extendee
- 0, // [0:9] is the sub-list for field type_name
+ 2, // 0: bytebase.store.PlanCheckRunConfig.ghost_flags:type_name -> bytebase.store.PlanCheckRunConfig.GhostFlagsEntry
+ 3, // 1: bytebase.store.PlanCheckRunResult.results:type_name -> bytebase.store.PlanCheckRunResult.Result
+ 6, // 2: bytebase.store.PlanCheckRunResult.Result.status:type_name -> bytebase.store.Advice.Status
+ 4, // 3: bytebase.store.PlanCheckRunResult.Result.sql_summary_report:type_name -> bytebase.store.PlanCheckRunResult.Result.SqlSummaryReport
+ 5, // 4: bytebase.store.PlanCheckRunResult.Result.sql_review_report:type_name -> bytebase.store.PlanCheckRunResult.Result.SqlReviewReport
+ 7, // 5: bytebase.store.PlanCheckRunResult.Result.SqlSummaryReport.changed_resources:type_name -> bytebase.store.ChangedResources
+ 8, // 6: bytebase.store.PlanCheckRunResult.Result.SqlReviewReport.start_position:type_name -> bytebase.store.Position
+ 8, // 7: bytebase.store.PlanCheckRunResult.Result.SqlReviewReport.end_position:type_name -> bytebase.store.Position
+ 8, // [8:8] is the sub-list for method output_type
+ 8, // [8:8] is the sub-list for method input_type
+ 8, // [8:8] is the sub-list for extension type_name
+ 8, // [8:8] is the sub-list for extension extendee
+ 0, // [0:8] is the sub-list for field type_name
}
func init() { file_store_plan_check_run_proto_init() }
@@ -556,14 +492,13 @@ func file_store_plan_check_run_proto_init() {
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_store_plan_check_run_proto_rawDesc), len(file_store_plan_check_run_proto_rawDesc)),
- NumEnums: 1,
+ NumEnums: 0,
NumMessages: 6,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_store_plan_check_run_proto_goTypes,
DependencyIndexes: file_store_plan_check_run_proto_depIdxs,
- EnumInfos: file_store_plan_check_run_proto_enumTypes,
MessageInfos: file_store_plan_check_run_proto_msgTypes,
}.Build()
File_store_plan_check_run_proto = out.File
diff --git a/backend/generated-go/store/plan_check_run_equal.pb.go b/backend/generated-go/store/plan_check_run_equal.pb.go
index 708c92a652..e6d5ea9694 100644
--- a/backend/generated-go/store/plan_check_run_equal.pb.go
+++ b/backend/generated-go/store/plan_check_run_equal.pb.go
@@ -13,9 +13,6 @@ func (x *PlanCheckRunConfig) Equal(y *PlanCheckRunConfig) bool {
if x.SheetUid != y.SheetUid {
return false
}
- if x.ChangeDatabaseType != y.ChangeDatabaseType {
- return false
- }
if x.InstanceId != y.InstanceId {
return false
}
@@ -40,6 +37,9 @@ func (x *PlanCheckRunConfig) Equal(y *PlanCheckRunConfig) bool {
if x.EnableGhost != y.EnableGhost {
return false
}
+ if x.EnableSdl != y.EnableSdl {
+ return false
+ }
return true
}
diff --git a/backend/migrator/migration/3.13/0007##plan_check_ddl_dml_consolidation.sql b/backend/migrator/migration/3.13/0007##plan_check_ddl_dml_consolidation.sql
new file mode 100644
index 0000000000..fda23df686
--- /dev/null
+++ b/backend/migrator/migration/3.13/0007##plan_check_ddl_dml_consolidation.sql
@@ -0,0 +1,31 @@
+-- Consolidate ChangeDatabaseType enum to EnableSDL boolean in plan_check_run configs.
+-- DDL(1), DML(2), DDL_GHOST(4) -> enableSdl: false (or absent)
+-- SDL(3) -> enableSdl: true
+
+-- Set enableSdl = true for SDL configs
+UPDATE plan_check_run
+SET config = jsonb_set(config, '{enableSdl}', 'true')
+WHERE config->>'changeDatabaseType' = 'SDL';
+
+-- Remove the deprecated changeDatabaseType field from all configs
+UPDATE plan_check_run
+SET config = config - 'changeDatabaseType'
+WHERE config ? 'changeDatabaseType';
+
+-- Remove disallow-mix rules from review_config if they exist
+UPDATE review_config
+SET payload = jsonb_set(
+ payload,
+ '{rules}',
+ COALESCE(
+ (SELECT jsonb_agg(r)
+ FROM jsonb_array_elements(payload->'rules') r
+ WHERE r->>'type' NOT IN (
+ 'statement.disallow-mix-in-ddl',
+ 'statement.disallow-mix-in-dml'
+ )),
+ '[]'::jsonb
+ )
+)
+WHERE payload->'rules' IS NOT NULL
+ AND jsonb_array_length(payload->'rules') > 0;
diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.go
index 44c0e525fa..52e015ee09 100644
--- a/backend/migrator/migrator_test.go
+++ b/backend/migrator/migrator_test.go
@@ -12,7 +12,7 @@ import (
func TestLatestVersion(t *testing.T) {
files, err := getSortedVersionedFiles()
require.NoError(t, err)
- require.Equal(t, semver.MustParse("3.13.6"), *files[len(files)-1].version)
+ require.Equal(t, semver.MustParse("3.13.7"), *files[len(files)-1].version)
}
func TestVersionUnique(t *testing.T) {
diff --git a/backend/plugin/advisor/advisor.go b/backend/plugin/advisor/advisor.go
index c03b3ed176..fd17f01a84 100644
--- a/backend/plugin/advisor/advisor.go
+++ b/backend/plugin/advisor/advisor.go
@@ -37,8 +37,9 @@ func NewStatusBySQLReviewRuleLevel(level storepb.SQLReviewRuleLevel) (storepb.Ad
// Context is the context for advisor.
type Context struct {
DBSchema *storepb.DatabaseSchemaMetadata
- ChangeType storepb.PlanCheckRunConfig_ChangeDatabaseType
+ EnableSDL bool
EnablePriorBackup bool
+ EnableGhost bool
ListDatabaseNamesFunc base.ListDatabaseNamesFunc
InstanceID string
IsObjectCaseSensitive bool
diff --git a/backend/plugin/advisor/mssql/mssql_rules_test.go b/backend/plugin/advisor/mssql/mssql_rules_test.go
index 9423cd20ed..5eb4f97caf 100644
--- a/backend/plugin/advisor/mssql/mssql_rules_test.go
+++ b/backend/plugin/advisor/mssql/mssql_rules_test.go
@@ -31,8 +31,6 @@ func TestMSSQLRules(t *testing.T) {
advisor.SchemaRuleStatementDisallowCrossDBQueries,
advisor.SchemaRuleStatementWhereDisallowFunctionsAndCalculations,
advisor.SchemaRuleIndexNotRedundant,
- advisor.SchemaRuleStatementDisallowMixInDDL,
- advisor.SchemaRuleStatementDisallowMixInDML,
}
for _, rule := range mssqlRules {
diff --git a/backend/plugin/advisor/mssql/rule_builtin_prior_backup_check.go b/backend/plugin/advisor/mssql/rule_builtin_prior_backup_check.go
index 681a7707e0..3cc8f7f7eb 100644
--- a/backend/plugin/advisor/mssql/rule_builtin_prior_backup_check.go
+++ b/backend/plugin/advisor/mssql/rule_builtin_prior_backup_check.go
@@ -34,7 +34,7 @@ type StatementPriorBackupCheckAdvisor struct {
}
func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- if !checkCtx.EnablePriorBackup || checkCtx.ChangeType != storepb.PlanCheckRunConfig_DML {
+ if !checkCtx.EnablePriorBackup {
return nil, nil
}
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
deleted file mode 100644
index 9d463b1f99..0000000000
--- a/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_ddl.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package mssql
-
-import (
- "context"
-
- "github.com/antlr4-go/antlr/v4"
-
- parser "github.com/bytebase/parser/tsql"
-
- "github.com/bytebase/bytebase/backend/common"
- storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- "github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/advisor/code"
- tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
-)
-
-var (
- _ advisor.Advisor = (*StatementDisallowMixInDDLAdvisor)(nil)
-)
-
-func init() {
- advisor.Register(storepb.Engine_MSSQL, advisor.SchemaRuleStatementDisallowMixInDDL, &StatementDisallowMixInDDLAdvisor{})
-}
-
-type StatementDisallowMixInDDLAdvisor struct {
-}
-
-func (*StatementDisallowMixInDDLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- switch checkCtx.ChangeType {
- case storepb.PlanCheckRunConfig_DDL, storepb.PlanCheckRunConfig_SDL, storepb.PlanCheckRunConfig_DDL_GHOST:
- default:
- return nil, nil
- }
- parseResults, err := getANTLRTree(checkCtx)
-
- if err != nil {
- return nil, err
- }
-
- level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)
- if err != nil {
- return nil, err
- }
- title := string(checkCtx.Rule.Type)
-
- // Create the rule
- rule := NewStatementDisallowMixInDDLRule(level, title, checkCtx.ChangeType)
-
- // Create the generic checker with the rule
- checker := NewGenericChecker([]Rule{rule})
-
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
- }
-
- return checker.GetAdviceList(), nil
-}
-
-// StatementDisallowMixInDDLRule is the rule checking for disallow mix in DDL.
-type StatementDisallowMixInDDLRule struct {
- BaseRule
- changeType storepb.PlanCheckRunConfig_ChangeDatabaseType
-}
-
-// NewStatementDisallowMixInDDLRule creates a new StatementDisallowMixInDDLRule.
-func NewStatementDisallowMixInDDLRule(level storepb.Advice_Status, title string, changeType storepb.PlanCheckRunConfig_ChangeDatabaseType) *StatementDisallowMixInDDLRule {
- return &StatementDisallowMixInDDLRule{
- BaseRule: BaseRule{
- level: level,
- title: title,
- },
- changeType: changeType,
- }
-}
-
-// Name returns the rule name.
-func (*StatementDisallowMixInDDLRule) Name() string {
- return "StatementDisallowMixInDDLRule"
-}
-
-// OnEnter is called when entering a parse tree node.
-func (r *StatementDisallowMixInDDLRule) OnEnter(ctx antlr.ParserRuleContext, nodeType string) error {
- if nodeType == "Sql_clauses" {
- r.enterSQLClauses(ctx.(*parser.Sql_clausesContext))
- }
- return nil
-}
-
-// OnExit is called when exiting a parse tree node.
-func (*StatementDisallowMixInDDLRule) OnExit(_ antlr.ParserRuleContext, _ string) error {
- // This rule doesn't need exit processing
- return nil
-}
-
-func (r *StatementDisallowMixInDDLRule) enterSQLClauses(ctx *parser.Sql_clausesContext) {
- if !tsqlparser.IsTopLevel(ctx.GetParent()) {
- return
- }
- var isDML bool
- if ctx.Dml_clause() != nil {
- isDML = true
- }
-
- if isDML {
- r.AddAdvice(&storepb.Advice{
- Status: r.level,
- Title: r.title,
- Content: "Alter schema can only run DDL",
- Code: code.StatementDisallowMixDDLDML.Int32(),
- StartPosition: common.ConvertANTLRLineToPosition(ctx.GetStart().GetLine()),
- })
- }
-}
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
deleted file mode 100644
index 6271231f20..0000000000
--- a/backend/plugin/advisor/mssql/rule_statement_disallow_mix_in_dml.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package mssql
-
-import (
- "context"
-
- "github.com/antlr4-go/antlr/v4"
-
- parser "github.com/bytebase/parser/tsql"
-
- "github.com/bytebase/bytebase/backend/common"
- storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- "github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/advisor/code"
- tsqlparser "github.com/bytebase/bytebase/backend/plugin/parser/tsql"
-)
-
-var (
- _ advisor.Advisor = (*StatementDisallowMixInDMLAdvisor)(nil)
-)
-
-func init() {
- advisor.Register(storepb.Engine_MSSQL, advisor.SchemaRuleStatementDisallowMixInDML, &StatementDisallowMixInDMLAdvisor{})
-}
-
-type StatementDisallowMixInDMLAdvisor struct {
-}
-
-func (*StatementDisallowMixInDMLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- switch checkCtx.ChangeType {
- case storepb.PlanCheckRunConfig_DML:
- default:
- return nil, nil
- }
- parseResults, err := getANTLRTree(checkCtx)
-
- if err != nil {
- return nil, err
- }
-
- level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)
- if err != nil {
- return nil, err
- }
- title := string(checkCtx.Rule.Type)
-
- // Create the rule
- rule := NewStatementDisallowMixInDMLRule(level, title, checkCtx.ChangeType)
-
- // Create the generic checker with the rule
- checker := NewGenericChecker([]Rule{rule})
-
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
- }
-
- return checker.GetAdviceList(), nil
-}
-
-// StatementDisallowMixInDMLRule is the rule checking for disallow mix in DML.
-type StatementDisallowMixInDMLRule struct {
- BaseRule
- changeType storepb.PlanCheckRunConfig_ChangeDatabaseType
-}
-
-// NewStatementDisallowMixInDMLRule creates a new StatementDisallowMixInDMLRule.
-func NewStatementDisallowMixInDMLRule(level storepb.Advice_Status, title string, changeType storepb.PlanCheckRunConfig_ChangeDatabaseType) *StatementDisallowMixInDMLRule {
- return &StatementDisallowMixInDMLRule{
- BaseRule: BaseRule{
- level: level,
- title: title,
- },
- changeType: changeType,
- }
-}
-
-// Name returns the rule name.
-func (*StatementDisallowMixInDMLRule) Name() string {
- return "StatementDisallowMixInDMLRule"
-}
-
-// OnEnter is called when entering a parse tree node.
-func (r *StatementDisallowMixInDMLRule) OnEnter(ctx antlr.ParserRuleContext, nodeType string) error {
- if nodeType == "Sql_clauses" {
- r.enterSQLClauses(ctx.(*parser.Sql_clausesContext))
- }
- return nil
-}
-
-// OnExit is called when exiting a parse tree node.
-func (*StatementDisallowMixInDMLRule) OnExit(_ antlr.ParserRuleContext, _ string) error {
- // This rule doesn't need exit processing
- return nil
-}
-
-func (r *StatementDisallowMixInDMLRule) enterSQLClauses(ctx *parser.Sql_clausesContext) {
- if !tsqlparser.IsTopLevel(ctx.GetParent()) {
- return
- }
- var isDML bool
- if ctx.Dml_clause() != nil {
- isDML = true
- }
-
- if !isDML {
- r.AddAdvice(&storepb.Advice{
- Status: r.level,
- Title: r.title,
- Content: "Data change can only run DML",
- Code: code.StatementDisallowMixDDLDML.Int32(),
- StartPosition: common.ConvertANTLRLineToPosition(ctx.GetStart().GetLine()),
- })
- }
-}
diff --git a/backend/plugin/advisor/mysql/mysql_rules_test.go b/backend/plugin/advisor/mysql/mysql_rules_test.go
index b6b90c1d0d..0b5f33a700 100644
--- a/backend/plugin/advisor/mysql/mysql_rules_test.go
+++ b/backend/plugin/advisor/mysql/mysql_rules_test.go
@@ -163,8 +163,6 @@ func TestMySQLRules(t *testing.T) {
advisor.SchemaRuleFunctionDisallowCreate,
// advisor.SchemaRuleFunctionDisallowList enforce the function disallow list.
advisor.SchemaRuleFunctionDisallowList,
- advisor.SchemaRuleStatementDisallowMixInDDL,
- advisor.SchemaRuleStatementDisallowMixInDML,
}
for _, rule := range mysqlRules {
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 eec659e75c..b2cb443ba4 100644
--- a/backend/plugin/advisor/mysql/rule_builtin_prior_backup_check.go
+++ b/backend/plugin/advisor/mysql/rule_builtin_prior_backup_check.go
@@ -27,7 +27,7 @@ type StatementPriorBackupCheckAdvisor struct {
}
func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- if !checkCtx.EnablePriorBackup || checkCtx.ChangeType != storepb.PlanCheckRunConfig_DML {
+ if !checkCtx.EnablePriorBackup {
return nil, nil
}
diff --git a/backend/plugin/advisor/mysql/rule_online_migration.go b/backend/plugin/advisor/mysql/rule_online_migration.go
index a11a3a244c..55095f7c72 100644
--- a/backend/plugin/advisor/mysql/rule_online_migration.go
+++ b/backend/plugin/advisor/mysql/rule_online_migration.go
@@ -53,8 +53,8 @@ func (*OnlineMigrationAdvisor) Check(ctx context.Context, checkCtx advisor.Conte
dbMetadata := model.NewDatabaseMetadata(checkCtx.DBSchema, nil, nil, storepb.Engine_MYSQL, checkCtx.IsObjectCaseSensitive)
title := string(checkCtx.Rule.Type)
- // Check gh-ost database existence first if the change type is gh-ost.
- if checkCtx.ChangeType == storepb.PlanCheckRunConfig_DDL_GHOST {
+ // Check gh-ost database existence first if gh-ost is enabled.
+ if checkCtx.EnableGhost {
ghostDatabaseName := common.BackupDatabaseNameOfEngine(storepb.Engine_MYSQL)
if !advisor.DatabaseExists(ctx, checkCtx, ghostDatabaseName) {
return []*storepb.Advice{
@@ -98,7 +98,7 @@ func (*OnlineMigrationAdvisor) Check(ctx context.Context, checkCtx advisor.Conte
// needs online migration.
// Advise to enable online migration for the issue, or return OK if it's already enabled.
if len(adviceList) == 1 && len(stmtList) == 1 {
- if checkCtx.ChangeType == storepb.PlanCheckRunConfig_DDL_GHOST {
+ if checkCtx.EnableGhost {
return nil, nil
}
@@ -109,7 +109,7 @@ func (*OnlineMigrationAdvisor) Check(ctx context.Context, checkCtx advisor.Conte
// No statement needs online migration.
// Advise to disable online migration if it's enabled.
if len(adviceList) == 0 {
- if checkCtx.ChangeType == storepb.PlanCheckRunConfig_DDL_GHOST {
+ if checkCtx.EnableGhost {
return []*storepb.Advice{{
Status: level,
Code: code.AdviseNoOnlineMigration.Int32(),
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
deleted file mode 100644
index 95f4585aea..0000000000
--- a/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_ddl.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package mysql
-
-import (
- "context"
- "fmt"
-
- "github.com/antlr4-go/antlr/v4"
-
- "github.com/bytebase/bytebase/backend/common"
- storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- "github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/advisor/code"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
-)
-
-var (
- _ advisor.Advisor = (*StatementDisallowMixInDDLAdvisor)(nil)
-)
-
-func init() {
- advisor.Register(storepb.Engine_MYSQL, advisor.SchemaRuleStatementDisallowMixInDDL, &StatementDisallowMixInDDLAdvisor{})
-}
-
-type StatementDisallowMixInDDLAdvisor struct {
-}
-
-func (*StatementDisallowMixInDDLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- switch checkCtx.ChangeType {
- case storepb.PlanCheckRunConfig_DDL, storepb.PlanCheckRunConfig_SDL, storepb.PlanCheckRunConfig_DDL_GHOST:
- default:
- return nil, nil
- }
-
- stmtList, err := getANTLRTree(checkCtx)
-
- if err != nil {
- return nil, err
- }
-
- level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)
- if err != nil {
- return nil, err
- }
- title := string(checkCtx.Rule.Type)
-
- var adviceList []*storepb.Advice
- for _, stmt := range stmtList {
- checker := &mysqlparser.StatementTypeChecker{}
- antlr.ParseTreeWalkerDefault.Walk(checker, stmt.Tree)
-
- if checker.IsDML {
- adviceList = append(adviceList, &storepb.Advice{
- Status: level,
- Title: title,
- Content: fmt.Sprintf("Alter schema can only run DDL, \"%s\" is not DDL", checker.Text),
- Code: code.StatementDisallowMixDDLDML.Int32(),
- StartPosition: common.ConvertANTLRLineToPosition(stmt.BaseLine),
- })
- }
- }
-
- return adviceList, nil
-}
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
deleted file mode 100644
index 44c97316cb..0000000000
--- a/backend/plugin/advisor/mysql/rule_statement_disallow_mix_in_dml.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package mysql
-
-import (
- "context"
- "fmt"
-
- "github.com/antlr4-go/antlr/v4"
-
- "github.com/bytebase/bytebase/backend/common"
- storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- "github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/advisor/code"
- mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
-)
-
-var (
- _ advisor.Advisor = (*StatementDisallowMixInDMLAdvisor)(nil)
-)
-
-func init() {
- advisor.Register(storepb.Engine_MYSQL, advisor.SchemaRuleStatementDisallowMixInDML, &StatementDisallowMixInDMLAdvisor{})
-}
-
-type StatementDisallowMixInDMLAdvisor struct {
-}
-
-func (*StatementDisallowMixInDMLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- switch checkCtx.ChangeType {
- case storepb.PlanCheckRunConfig_DML:
- default:
- return nil, nil
- }
-
- stmtList, err := getANTLRTree(checkCtx)
-
- if err != nil {
- return nil, err
- }
-
- level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)
- if err != nil {
- return nil, err
- }
- title := string(checkCtx.Rule.Type)
-
- var adviceList []*storepb.Advice
- for _, stmt := range stmtList {
- checker := &mysqlparser.StatementTypeChecker{}
- antlr.ParseTreeWalkerDefault.Walk(checker, stmt.Tree)
-
- if checker.IsDDL {
- adviceList = append(adviceList, &storepb.Advice{
- Status: level,
- Title: title,
- Content: fmt.Sprintf("Data change can only run DML, \"%s\" is not DML", checker.Text),
- Code: code.StatementDisallowMixDDLDML.Int32(),
- StartPosition: common.ConvertANTLRLineToPosition(stmt.BaseLine),
- })
- }
- }
-
- return adviceList, nil
-}
diff --git a/backend/plugin/advisor/oracle/oracle_rules_test.go b/backend/plugin/advisor/oracle/oracle_rules_test.go
index 143930cb7c..0750a1f5a9 100644
--- a/backend/plugin/advisor/oracle/oracle_rules_test.go
+++ b/backend/plugin/advisor/oracle/oracle_rules_test.go
@@ -29,8 +29,6 @@ func TestOracleRules(t *testing.T) {
advisor.SchemaRuleTableNameNoKeyword,
advisor.SchemaRuleIdentifierNoKeyword,
advisor.SchemaRuleIdentifierCase,
- advisor.SchemaRuleStatementDisallowMixInDDL,
- advisor.SchemaRuleStatementDisallowMixInDML,
advisor.SchemaRuleTableCommentConvention,
advisor.SchemaRuleColumnCommentConvention,
}
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 9d0cc4da0d..bb8860aa86 100644
--- a/backend/plugin/advisor/oracle/rule_builtin_prior_backup_check.go
+++ b/backend/plugin/advisor/oracle/rule_builtin_prior_backup_check.go
@@ -28,7 +28,7 @@ type StatementPriorBackupCheckAdvisor struct {
}
func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- if !checkCtx.EnablePriorBackup || checkCtx.ChangeType != storepb.PlanCheckRunConfig_DML {
+ if !checkCtx.EnablePriorBackup {
return nil, nil
}
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
deleted file mode 100644
index 082359c32c..0000000000
--- a/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_ddl.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package oracle
-
-import (
- "context"
-
- "github.com/antlr4-go/antlr/v4"
-
- parser "github.com/bytebase/parser/plsql"
-
- "github.com/bytebase/bytebase/backend/common"
- storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- "github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/advisor/code"
-)
-
-var (
- _ advisor.Advisor = (*StatementDisallowMixInDDLAdvisor)(nil)
-)
-
-func init() {
- advisor.Register(storepb.Engine_ORACLE, advisor.SchemaRuleStatementDisallowMixInDDL, &StatementDisallowMixInDDLAdvisor{})
-}
-
-type StatementDisallowMixInDDLAdvisor struct {
-}
-
-func (*StatementDisallowMixInDDLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- switch checkCtx.ChangeType {
- case storepb.PlanCheckRunConfig_DDL, storepb.PlanCheckRunConfig_SDL, storepb.PlanCheckRunConfig_DDL_GHOST:
- default:
- return nil, nil
- }
- stmtList, err := getANTLRTree(checkCtx)
-
- if err != nil {
- return nil, err
- }
-
- level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)
- if err != nil {
- return nil, err
- }
-
- rule := NewStatementDisallowMixInDDLRule(level, string(checkCtx.Rule.Type))
- checker := NewGenericChecker([]Rule{rule})
-
- for _, stmtNode := range stmtList {
- rule.SetBaseLine(stmtNode.BaseLine)
- checker.SetBaseLine(stmtNode.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)
- }
-
- return checker.GetAdviceList()
-}
-
-// StatementDisallowMixInDDLRule is the rule implementation for disallowing mix in DDL.
-type StatementDisallowMixInDDLRule struct {
- BaseRule
-}
-
-// NewStatementDisallowMixInDDLRule creates a new StatementDisallowMixInDDLRule.
-func NewStatementDisallowMixInDDLRule(level storepb.Advice_Status, title string) *StatementDisallowMixInDDLRule {
- return &StatementDisallowMixInDDLRule{
- BaseRule: NewBaseRule(level, title, 0),
- }
-}
-
-// Name returns the rule name.
-func (*StatementDisallowMixInDDLRule) Name() string {
- return "statement.disallow-mix-in-ddl"
-}
-
-// OnEnter is called when the parser enters a rule context.
-func (r *StatementDisallowMixInDDLRule) OnEnter(ctx antlr.ParserRuleContext, nodeType string) error {
- if nodeType == "Unit_statement" {
- r.handleUnitStatement(ctx.(*parser.Unit_statementContext))
- }
- return nil
-}
-
-// OnExit is called when the parser exits a rule context.
-func (*StatementDisallowMixInDDLRule) OnExit(_ antlr.ParserRuleContext, _ string) error {
- return nil
-}
-
-func (r *StatementDisallowMixInDDLRule) handleUnitStatement(ctx *parser.Unit_statementContext) {
- if ctx.Data_manipulation_language_statements() != nil {
- r.AddAdvice(
- r.level,
- code.StatementDisallowMixDDLDML.Int32(),
- "Alter schema can only run DDL",
- common.ConvertANTLRLineToPosition(r.baseLine+ctx.GetStart().GetLine()),
- )
- }
-}
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
deleted file mode 100644
index 1354b220a0..0000000000
--- a/backend/plugin/advisor/oracle/rule_statement_disallow_mix_in_dml.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package oracle
-
-import (
- "context"
-
- "github.com/antlr4-go/antlr/v4"
-
- parser "github.com/bytebase/parser/plsql"
-
- "github.com/bytebase/bytebase/backend/common"
- storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- "github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/advisor/code"
-)
-
-var (
- _ advisor.Advisor = (*StatementDisallowMixInDMLAdvisor)(nil)
-)
-
-func init() {
- advisor.Register(storepb.Engine_ORACLE, advisor.SchemaRuleStatementDisallowMixInDML, &StatementDisallowMixInDMLAdvisor{})
-}
-
-type StatementDisallowMixInDMLAdvisor struct {
-}
-
-func (*StatementDisallowMixInDMLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- switch checkCtx.ChangeType {
- case storepb.PlanCheckRunConfig_DML:
- default:
- return nil, nil
- }
-
- stmtList, err := getANTLRTree(checkCtx)
-
- if err != nil {
- return nil, err
- }
-
- level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)
- if err != nil {
- return nil, err
- }
-
- rule := NewStatementDisallowMixInDMLRule(level, string(checkCtx.Rule.Type))
- checker := NewGenericChecker([]Rule{rule})
-
- for _, stmtNode := range stmtList {
- rule.SetBaseLine(stmtNode.BaseLine)
- checker.SetBaseLine(stmtNode.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, stmtNode.Tree)
- }
-
- return checker.GetAdviceList()
-}
-
-// StatementDisallowMixInDMLRule is the rule implementation for disallowing mix in DML.
-type StatementDisallowMixInDMLRule struct {
- BaseRule
-}
-
-// NewStatementDisallowMixInDMLRule creates a new StatementDisallowMixInDMLRule.
-func NewStatementDisallowMixInDMLRule(level storepb.Advice_Status, title string) *StatementDisallowMixInDMLRule {
- return &StatementDisallowMixInDMLRule{
- BaseRule: NewBaseRule(level, title, 0),
- }
-}
-
-// Name returns the rule name.
-func (*StatementDisallowMixInDMLRule) Name() string {
- return "statement.disallow-mix-in-dml"
-}
-
-// OnEnter is called when the parser enters a rule context.
-func (r *StatementDisallowMixInDMLRule) OnEnter(ctx antlr.ParserRuleContext, nodeType string) error {
- if nodeType == "Unit_statement" {
- r.handleUnitStatement(ctx.(*parser.Unit_statementContext))
- }
- return nil
-}
-
-// OnExit is called when the parser exits a rule context.
-func (*StatementDisallowMixInDMLRule) OnExit(_ antlr.ParserRuleContext, _ string) error {
- return nil
-}
-
-func (r *StatementDisallowMixInDMLRule) handleUnitStatement(ctx *parser.Unit_statementContext) {
- if ctx.Data_manipulation_language_statements() == nil {
- r.AddAdvice(
- r.level,
- code.StatementDisallowMixDDLDML.Int32(),
- "Data change can only run DML",
- common.ConvertANTLRLineToPosition(r.baseLine+ctx.GetStart().GetLine()),
- )
- }
-}
diff --git a/backend/plugin/advisor/pg/advisor_builtin_prior_backup_check.go b/backend/plugin/advisor/pg/advisor_builtin_prior_backup_check.go
index 68c52407c4..919414807d 100644
--- a/backend/plugin/advisor/pg/advisor_builtin_prior_backup_check.go
+++ b/backend/plugin/advisor/pg/advisor_builtin_prior_backup_check.go
@@ -36,7 +36,7 @@ type BuiltinPriorBackupCheckAdvisor struct {
// Check checks for disallow mix DDL and DML.
func (*BuiltinPriorBackupCheckAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- if !checkCtx.EnablePriorBackup || checkCtx.ChangeType != storepb.PlanCheckRunConfig_DML {
+ if !checkCtx.EnablePriorBackup {
return nil, nil
}
diff --git a/backend/plugin/advisor/pg/advisor_statement_disallow_mix_in_ddl.go b/backend/plugin/advisor/pg/advisor_statement_disallow_mix_in_ddl.go
deleted file mode 100644
index 4cd643cf5a..0000000000
--- a/backend/plugin/advisor/pg/advisor_statement_disallow_mix_in_ddl.go
+++ /dev/null
@@ -1,161 +0,0 @@
-package pg
-
-import (
- "context"
- "fmt"
-
- "github.com/antlr4-go/antlr/v4"
-
- storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- "github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/advisor/code"
-)
-
-var (
- _ advisor.Advisor = (*StatementDisallowMixInDDLAdvisor)(nil)
-)
-
-func init() {
- advisor.Register(storepb.Engine_POSTGRES, advisor.SchemaRuleStatementDisallowMixInDDL, &StatementDisallowMixInDDLAdvisor{})
-}
-
-// StatementDisallowMixInDDLAdvisor is the advisor checking for disallow mix DDL and DML.
-type StatementDisallowMixInDDLAdvisor struct {
-}
-
-// Check checks for disallow mix DDL and DML.
-func (*StatementDisallowMixInDDLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- // Only check when change type is DDL
- switch checkCtx.ChangeType {
- case storepb.PlanCheckRunConfig_DDL, storepb.PlanCheckRunConfig_SDL, storepb.PlanCheckRunConfig_DDL_GHOST:
- default:
- return nil, nil
- }
-
- parseResults, err := getANTLRTree(checkCtx)
- if err != nil {
- return nil, err
- }
-
- level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)
- if err != nil {
- return nil, err
- }
-
- rule := &statementDisallowMixInDDLRule{
- BaseRule: BaseRule{level: level, title: string(checkCtx.Rule.Type)},
- statementsText: checkCtx.Statements,
- }
-
- checker := NewGenericChecker([]Rule{rule})
-
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
- }
-
- return checker.GetAdviceList(), nil
-}
-
-type statementDisallowMixInDDLRule struct {
- BaseRule
- statementsText string
-}
-
-// Name returns the rule name for logging/debugging
-func (*statementDisallowMixInDDLRule) Name() string {
- return "statement_disallow_mix_in_ddl"
-}
-
-// OnEnter is called when entering a parse tree node
-func (r *statementDisallowMixInDDLRule) OnEnter(ctx antlr.ParserRuleContext, nodeType string) error {
- switch nodeType {
- case "Selectstmt":
- r.handleSelectstmt(ctx)
- case "Insertstmt":
- r.handleInsertstmt(ctx)
- case "Updatestmt":
- r.handleUpdatestmt(ctx)
- case "Deletestmt":
- r.handleDeletestmt(ctx)
- default:
- // Do nothing for other node types
- }
- return nil
-}
-
-// OnExit is called when exiting a parse tree node
-func (*statementDisallowMixInDDLRule) OnExit(_ antlr.ParserRuleContext, _ string) error {
- return nil
-}
-
-// handleSelectstmt handles SELECT statements (DML)
-func (r *statementDisallowMixInDDLRule) handleSelectstmt(ctx antlr.ParserRuleContext) {
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDMLAdvice(ctx)
-}
-
-// handleInsertstmt handles INSERT statements (DML)
-func (r *statementDisallowMixInDDLRule) handleInsertstmt(ctx antlr.ParserRuleContext) {
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDMLAdvice(ctx)
-}
-
-// handleUpdatestmt handles UPDATE statements (DML)
-func (r *statementDisallowMixInDDLRule) handleUpdatestmt(ctx antlr.ParserRuleContext) {
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDMLAdvice(ctx)
-}
-
-// handleDeletestmt handles DELETE statements (DML)
-func (r *statementDisallowMixInDDLRule) handleDeletestmt(ctx antlr.ParserRuleContext) {
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDMLAdvice(ctx)
-}
-
-func (r *statementDisallowMixInDDLRule) addDMLAdvice(ctx antlr.ParserRuleContext) {
- // Extract the statement text including semicolon using character positions
- startPos := ctx.GetStart().GetStart()
- stopPos := ctx.GetStop().GetStop()
-
- // Find the semicolon after this statement
- stmtText := ""
- if stopPos+1 < len(r.statementsText) {
- // Look for semicolon
- endPos := stopPos + 1
- for endPos < len(r.statementsText) && r.statementsText[endPos] != ';' {
- endPos++
- }
- if endPos < len(r.statementsText) {
- stmtText = r.statementsText[startPos : endPos+1]
- } else {
- stmtText = r.statementsText[startPos:stopPos+1] + ";"
- }
- } else {
- stmtText = r.statementsText[startPos:stopPos+1] + ";"
- }
-
- r.AddAdvice(&storepb.Advice{
- Status: r.level,
- Code: code.StatementDisallowMixDDLDML.Int32(),
- Title: r.title,
- Content: fmt.Sprintf("Alter schema can only run DDL, %q is not DDL", stmtText),
- StartPosition: &storepb.Position{
- Line: int32(ctx.GetStart().GetLine()),
- Column: 0,
- },
- })
-}
diff --git a/backend/plugin/advisor/pg/advisor_statement_disallow_mix_in_dml.go b/backend/plugin/advisor/pg/advisor_statement_disallow_mix_in_dml.go
deleted file mode 100644
index 44a3b42f1b..0000000000
--- a/backend/plugin/advisor/pg/advisor_statement_disallow_mix_in_dml.go
+++ /dev/null
@@ -1,358 +0,0 @@
-package pg
-
-import (
- "context"
- "fmt"
-
- "github.com/antlr4-go/antlr/v4"
-
- parser "github.com/bytebase/parser/postgresql"
-
- storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- "github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/advisor/code"
-)
-
-var (
- _ advisor.Advisor = (*StatementDisallowMixInDMLAdvisor)(nil)
-)
-
-func init() {
- advisor.Register(storepb.Engine_POSTGRES, advisor.SchemaRuleStatementDisallowMixInDML, &StatementDisallowMixInDMLAdvisor{})
-}
-
-// StatementDisallowMixInDMLAdvisor is the advisor checking for disallow mix DDL and DML.
-type StatementDisallowMixInDMLAdvisor struct {
-}
-
-// Check checks for disallow mix DDL and DML.
-func (*StatementDisallowMixInDMLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- // Only check when change type is DML
- switch checkCtx.ChangeType {
- case storepb.PlanCheckRunConfig_DML:
- default:
- return nil, nil
- }
-
- parseResults, err := getANTLRTree(checkCtx)
- if err != nil {
- return nil, err
- }
-
- level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)
- if err != nil {
- return nil, err
- }
-
- rule := &statementDisallowMixInDMLRule{
- BaseRule: BaseRule{
- level: level,
- title: string(checkCtx.Rule.Type),
- },
- statementsText: checkCtx.Statements,
- }
-
- checker := NewGenericChecker([]Rule{rule})
-
- for _, parseResult := range parseResults {
- rule.SetBaseLine(parseResult.BaseLine)
- checker.SetBaseLine(parseResult.BaseLine)
- antlr.ParseTreeWalkerDefault.Walk(checker, parseResult.Tree)
- }
-
- return checker.GetAdviceList(), nil
-}
-
-type statementDisallowMixInDMLRule struct {
- BaseRule
-
- statementsText string
-}
-
-func (*statementDisallowMixInDMLRule) Name() string {
- return "statement_disallow_mix_in_dml"
-}
-
-func (r *statementDisallowMixInDMLRule) OnEnter(ctx antlr.ParserRuleContext, nodeType string) error {
- switch nodeType {
- case "Createstmt":
- r.handleCreatestmt(ctx)
- case "Indexstmt":
- r.handleIndexstmt(ctx)
- case "Altertablestmt":
- r.handleAltertablestmt(ctx)
- case "Dropstmt":
- r.handleDropstmt(ctx)
- case "Createschemastmt":
- r.handleCreateschemastmt(ctx)
- case "Createseqstmt":
- r.handleCreateseqstmt(ctx)
- case "Alterseqstmt":
- r.handleAlterseqstmt(ctx)
- case "Viewstmt":
- r.handleViewstmt(ctx)
- case "Createfunctionstmt":
- r.handleCreatefunctionstmt(ctx)
- case "Createtrigstmt":
- r.handleCreatetrigstmt(ctx)
- case "Renamestmt":
- r.handleRenamestmt(ctx)
- case "Alterobjectschemastmt":
- r.handleAlterobjectschemastmt(ctx)
- case "Alterenumstmt":
- r.handleAlterenumstmt(ctx)
- case "Altercompositetypestmt":
- r.handleAltercompositetypestmt(ctx)
- case "Createextensionstmt":
- r.handleCreateextensionstmt(ctx)
- case "Createdbstmt":
- r.handleCreatedbstmt(ctx)
- case "Creatematviewstmt":
- r.handleCreatematviewstmt(ctx)
- default:
- // Do nothing for other node types
- }
- return nil
-}
-
-func (*statementDisallowMixInDMLRule) OnExit(_ antlr.ParserRuleContext, _ string) error {
- return nil
-}
-
-func (r *statementDisallowMixInDMLRule) handleCreatestmt(ctx antlr.ParserRuleContext) {
- createCtx, ok := ctx.(*parser.CreatestmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(createCtx, "CREATE TABLE")
-}
-
-func (r *statementDisallowMixInDMLRule) handleIndexstmt(ctx antlr.ParserRuleContext) {
- indexCtx, ok := ctx.(*parser.IndexstmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(indexCtx, "CREATE INDEX")
-}
-
-func (r *statementDisallowMixInDMLRule) handleAltertablestmt(ctx antlr.ParserRuleContext) {
- alterCtx, ok := ctx.(*parser.AltertablestmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(alterCtx, "ALTER TABLE")
-}
-
-func (r *statementDisallowMixInDMLRule) handleDropstmt(ctx antlr.ParserRuleContext) {
- dropCtx, ok := ctx.(*parser.DropstmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(dropCtx, "DROP")
-}
-
-func (r *statementDisallowMixInDMLRule) handleCreateschemastmt(ctx antlr.ParserRuleContext) {
- createCtx, ok := ctx.(*parser.CreateschemastmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(createCtx, "CREATE SCHEMA")
-}
-
-func (r *statementDisallowMixInDMLRule) handleCreateseqstmt(ctx antlr.ParserRuleContext) {
- createCtx, ok := ctx.(*parser.CreateseqstmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(createCtx, "CREATE SEQUENCE")
-}
-
-func (r *statementDisallowMixInDMLRule) handleAlterseqstmt(ctx antlr.ParserRuleContext) {
- alterCtx, ok := ctx.(*parser.AlterseqstmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(alterCtx, "ALTER SEQUENCE")
-}
-
-func (r *statementDisallowMixInDMLRule) handleViewstmt(ctx antlr.ParserRuleContext) {
- viewCtx, ok := ctx.(*parser.ViewstmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(viewCtx, "CREATE VIEW")
-}
-
-func (r *statementDisallowMixInDMLRule) handleCreatefunctionstmt(ctx antlr.ParserRuleContext) {
- createCtx, ok := ctx.(*parser.CreatefunctionstmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(createCtx, "CREATE FUNCTION")
-}
-
-func (r *statementDisallowMixInDMLRule) handleCreatetrigstmt(ctx antlr.ParserRuleContext) {
- createCtx, ok := ctx.(*parser.CreatetrigstmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(createCtx, "CREATE TRIGGER")
-}
-
-func (r *statementDisallowMixInDMLRule) handleRenamestmt(ctx antlr.ParserRuleContext) {
- renameCtx, ok := ctx.(*parser.RenamestmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(renameCtx, "RENAME")
-}
-
-func (r *statementDisallowMixInDMLRule) handleAlterobjectschemastmt(ctx antlr.ParserRuleContext) {
- alterCtx, ok := ctx.(*parser.AlterobjectschemastmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(alterCtx, "ALTER SET SCHEMA")
-}
-
-func (r *statementDisallowMixInDMLRule) handleAlterenumstmt(ctx antlr.ParserRuleContext) {
- alterCtx, ok := ctx.(*parser.AlterenumstmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(alterCtx, "ALTER TYPE")
-}
-
-func (r *statementDisallowMixInDMLRule) handleAltercompositetypestmt(ctx antlr.ParserRuleContext) {
- alterCtx, ok := ctx.(*parser.AltercompositetypestmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(alterCtx, "ALTER TYPE")
-}
-
-func (r *statementDisallowMixInDMLRule) handleCreateextensionstmt(ctx antlr.ParserRuleContext) {
- createCtx, ok := ctx.(*parser.CreateextensionstmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(createCtx, "CREATE EXTENSION")
-}
-
-func (r *statementDisallowMixInDMLRule) handleCreatedbstmt(ctx antlr.ParserRuleContext) {
- createCtx, ok := ctx.(*parser.CreatedbstmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(createCtx, "CREATE DATABASE")
-}
-
-func (r *statementDisallowMixInDMLRule) handleCreatematviewstmt(ctx antlr.ParserRuleContext) {
- createCtx, ok := ctx.(*parser.CreatematviewstmtContext)
- if !ok {
- return
- }
- if !isTopLevel(ctx.GetParent()) {
- return
- }
-
- r.addDDLAdvice(createCtx, "CREATE MATERIALIZED VIEW")
-}
-
-func (r *statementDisallowMixInDMLRule) addDDLAdvice(ctx antlr.ParserRuleContext, _ string) {
- // Extract the statement text including semicolon using character positions
- startPos := ctx.GetStart().GetStart()
- stopPos := ctx.GetStop().GetStop()
-
- // Find the semicolon after this statement
- stmtText := ""
- if stopPos+1 < len(r.statementsText) {
- // Look for semicolon
- endPos := stopPos + 1
- for endPos < len(r.statementsText) && r.statementsText[endPos] != ';' {
- endPos++
- }
- if endPos < len(r.statementsText) {
- stmtText = r.statementsText[startPos : endPos+1]
- } else {
- stmtText = r.statementsText[startPos:stopPos+1] + ";"
- }
- } else {
- stmtText = r.statementsText[startPos:stopPos+1] + ";"
- }
-
- r.AddAdvice(&storepb.Advice{
- Status: r.level,
- Code: code.StatementDisallowMixDDLDML.Int32(),
- Title: r.title,
- Content: fmt.Sprintf("Data change can only run DML, %q is not DML", stmtText),
- StartPosition: &storepb.Position{
- Line: int32(ctx.GetStart().GetLine()),
- Column: 0,
- },
- })
-}
diff --git a/backend/plugin/advisor/pg/pgantlr_test.go b/backend/plugin/advisor/pg/pgantlr_test.go
index 758ee57930..d175c19863 100644
--- a/backend/plugin/advisor/pg/pgantlr_test.go
+++ b/backend/plugin/advisor/pg/pgantlr_test.go
@@ -50,8 +50,6 @@ func TestPostgreSQLANTLRRules(t *testing.T) {
advisor.SchemaRuleStatementDisallowAddColumnWithDefault,
advisor.SchemaRuleStatementDisallowAddNotNull,
advisor.SchemaRuleStatementDisallowCommit,
- advisor.SchemaRuleStatementDisallowMixInDDL,
- advisor.SchemaRuleStatementDisallowMixInDML,
advisor.SchemaRuleStatementDisallowOnDelCascade,
advisor.SchemaRuleStatementDisallowRemoveTblCascade,
advisor.SchemaRuleStatementDMLDryRun,
diff --git a/backend/plugin/advisor/pg/test_helper.go b/backend/plugin/advisor/pg/test_helper.go
index c85dd7da94..c29d9636be 100644
--- a/backend/plugin/advisor/pg/test_helper.go
+++ b/backend/plugin/advisor/pg/test_helper.go
@@ -25,9 +25,9 @@ import (
// TestCase is the data struct for test.
type TestCase struct {
- Statement string `yaml:"statement"`
- ChangeType storepb.PlanCheckRunConfig_ChangeDatabaseType `yaml:"changeType"`
- Want []*storepb.Advice `yaml:"want,omitempty"`
+ Statement string `yaml:"statement"`
+ EnableSDL bool `yaml:"enableSDL"`
+ Want []*storepb.Advice `yaml:"want,omitempty"`
}
// RunANTLRAdvisorRuleTest helps to test ANTLR-based SQL review rules.
@@ -115,7 +115,7 @@ func RunANTLRAdvisorRuleTest(t *testing.T, rule advisor.SQLReviewRuleType, dbTyp
rule,
advisor.Context{
DBSchema: schemaMetadata,
- ChangeType: tc.ChangeType,
+ EnableSDL: tc.EnableSDL,
EnablePriorBackup: true,
AST: unifiedASTs, // Pass AST list
Statements: tc.Statement,
diff --git a/backend/plugin/advisor/sql_review.go b/backend/plugin/advisor/sql_review.go
index d0578cc319..e73e74615b 100644
--- a/backend/plugin/advisor/sql_review.go
+++ b/backend/plugin/advisor/sql_review.go
@@ -117,10 +117,6 @@ const (
SchemaRuleStatementMaximumStatementsInTransaction SQLReviewRuleType = "statement.maximum-statements-in-transaction"
// SchemaRuleStatementJoinStrictColumnAttrs enforce the join strict column attributes.
SchemaRuleStatementJoinStrictColumnAttrs SQLReviewRuleType = "statement.join-strict-column-attrs"
- // SchemaRuleStatementDisallowMixInDDL disallows DML statements in DDL statements.
- SchemaRuleStatementDisallowMixInDDL SQLReviewRuleType = "statement.disallow-mix-in-ddl"
- // SchemaRuleStatementDisallowMixInDML disallows DDL statements in DML statements.
- SchemaRuleStatementDisallowMixInDML SQLReviewRuleType = "statement.disallow-mix-in-dml"
// SchemaRuleStatementPriorBackupCheck checks for prior backup.
SchemaRuleStatementPriorBackupCheck SQLReviewRuleType = "statement.prior-backup-check"
// SchemaRuleStatementNonTransactional checks for non-transactional statements.
diff --git a/backend/plugin/advisor/template_test.go b/backend/plugin/advisor/template_test.go
index 168c367496..e89513890a 100644
--- a/backend/plugin/advisor/template_test.go
+++ b/backend/plugin/advisor/template_test.go
@@ -306,8 +306,6 @@ func buildRuleTypeMapping() map[string]string {
string(advisor.SchemaRuleStatementMaximumJoinTableCount): "SchemaRuleStatementMaximumJoinTableCount",
string(advisor.SchemaRuleStatementMaximumStatementsInTransaction): "SchemaRuleStatementMaximumStatementsInTransaction",
string(advisor.SchemaRuleStatementJoinStrictColumnAttrs): "SchemaRuleStatementJoinStrictColumnAttrs",
- string(advisor.SchemaRuleStatementDisallowMixInDDL): "SchemaRuleStatementDisallowMixInDDL",
- string(advisor.SchemaRuleStatementDisallowMixInDML): "SchemaRuleStatementDisallowMixInDML",
string(advisor.SchemaRuleStatementPriorBackupCheck): "SchemaRuleStatementPriorBackupCheck",
string(advisor.SchemaRuleStatementNonTransactional): "SchemaRuleStatementNonTransactional",
string(advisor.SchemaRuleStatementAddColumnWithoutPosition): "SchemaRuleStatementAddColumnWithoutPosition",
diff --git a/backend/plugin/advisor/tidb/advisor_builtin_prior_backup_check.go b/backend/plugin/advisor/tidb/advisor_builtin_prior_backup_check.go
index a9889eecb0..10a1cc88dd 100644
--- a/backend/plugin/advisor/tidb/advisor_builtin_prior_backup_check.go
+++ b/backend/plugin/advisor/tidb/advisor_builtin_prior_backup_check.go
@@ -35,7 +35,7 @@ type StatementPriorBackupCheckAdvisor struct {
// Check checks for no mixed DDL and DML.
func (*StatementPriorBackupCheckAdvisor) Check(ctx context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- if !checkCtx.EnablePriorBackup || checkCtx.ChangeType != storepb.PlanCheckRunConfig_DML {
+ if !checkCtx.EnablePriorBackup {
return nil, nil
}
diff --git a/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_ddl.go b/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_ddl.go
deleted file mode 100644
index 5752d4d5f1..0000000000
--- a/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_ddl.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package tidb
-
-import (
- "context"
- "fmt"
-
- "github.com/pingcap/tidb/pkg/parser/ast"
-
- "github.com/bytebase/bytebase/backend/common"
- storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- "github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/advisor/code"
-)
-
-var (
- _ advisor.Advisor = (*StatementDisallowMixInDDLAdvisor)(nil)
-)
-
-func init() {
- advisor.Register(storepb.Engine_TIDB, advisor.SchemaRuleStatementDisallowMixInDDL, &StatementDisallowMixInDDLAdvisor{})
-}
-
-// StatementDisallowMixInDDLAdvisor is the advisor checking for no mixed DDL and DML.
-type StatementDisallowMixInDDLAdvisor struct {
-}
-
-// Check checks for no mixed DDL and DML.
-func (*StatementDisallowMixInDDLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- switch checkCtx.ChangeType {
- case storepb.PlanCheckRunConfig_DDL, storepb.PlanCheckRunConfig_SDL, storepb.PlanCheckRunConfig_DDL_GHOST:
- default:
- return nil, nil
- }
- root, err := getTiDBNodes(checkCtx)
-
- if err != nil {
- return nil, err
- }
-
- level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)
- if err != nil {
- return nil, err
- }
- title := string(checkCtx.Rule.Type)
-
- var adviceList []*storepb.Advice
- for _, stmtNode := range root {
- if _, ok := stmtNode.(ast.DMLNode); ok {
- adviceList = append(adviceList, &storepb.Advice{
- Status: level,
- Title: title,
- Content: fmt.Sprintf("Alter schema can only run DDL, \"%s\" is not DDL", stmtNode.Text()),
- Code: code.StatementDisallowMixDDLDML.Int32(),
- StartPosition: common.ConvertANTLRLineToPosition(stmtNode.OriginTextPosition()),
- })
- }
- }
-
- return adviceList, nil
-}
diff --git a/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_dml.go b/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_dml.go
deleted file mode 100644
index 34dc8c7b23..0000000000
--- a/backend/plugin/advisor/tidb/advisor_statement_disallow_mix_in_dml.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package tidb
-
-import (
- "context"
- "fmt"
-
- "github.com/pingcap/tidb/pkg/parser/ast"
-
- "github.com/bytebase/bytebase/backend/common"
- storepb "github.com/bytebase/bytebase/backend/generated-go/store"
- "github.com/bytebase/bytebase/backend/plugin/advisor"
- "github.com/bytebase/bytebase/backend/plugin/advisor/code"
-)
-
-var (
- _ advisor.Advisor = (*StatementDisallowMixInDMLAdvisor)(nil)
-)
-
-func init() {
- advisor.Register(storepb.Engine_TIDB, advisor.SchemaRuleStatementDisallowMixInDML, &StatementDisallowMixInDMLAdvisor{})
-}
-
-// StatementDisallowMixInDMLAdvisor is the advisor checking for no mixed DDL and DML.
-type StatementDisallowMixInDMLAdvisor struct {
-}
-
-// Check checks for no mixed DDL and DML.
-func (*StatementDisallowMixInDMLAdvisor) Check(_ context.Context, checkCtx advisor.Context) ([]*storepb.Advice, error) {
- switch checkCtx.ChangeType {
- case storepb.PlanCheckRunConfig_DML:
- default:
- return nil, nil
- }
- root, err := getTiDBNodes(checkCtx)
-
- if err != nil {
- return nil, err
- }
-
- level, err := advisor.NewStatusBySQLReviewRuleLevel(checkCtx.Rule.Level)
- if err != nil {
- return nil, err
- }
- title := string(checkCtx.Rule.Type)
-
- var adviceList []*storepb.Advice
- for _, stmtNode := range root {
- if _, ok := stmtNode.(ast.DDLNode); ok {
- adviceList = append(adviceList, &storepb.Advice{
- Status: level,
- Title: title,
- Content: fmt.Sprintf("Data change can only run DML, \"%s\" is not DML", stmtNode.Text()),
- Code: code.StatementDisallowMixDDLDML.Int32(),
- StartPosition: common.ConvertANTLRLineToPosition(stmtNode.OriginTextPosition()),
- })
- }
- }
-
- return adviceList, nil
-}
diff --git a/backend/plugin/advisor/tidb/tidb_rules_test.go b/backend/plugin/advisor/tidb/tidb_rules_test.go
index 810277cd2c..472e6f6639 100644
--- a/backend/plugin/advisor/tidb/tidb_rules_test.go
+++ b/backend/plugin/advisor/tidb/tidb_rules_test.go
@@ -113,9 +113,6 @@ func TestTiDBRules(t *testing.T) {
// advisor.SchemaRuleCollationAllowlist enforce the collation allowlist.
advisor.SchemaRuleCollationAllowlist,
-
- advisor.SchemaRuleStatementDisallowMixInDDL,
- advisor.SchemaRuleStatementDisallowMixInDML,
}
for _, rule := range tidbRules {
diff --git a/backend/plugin/advisor/utils_for_tests.go b/backend/plugin/advisor/utils_for_tests.go
index e2d3555ed7..2165d56171 100644
--- a/backend/plugin/advisor/utils_for_tests.go
+++ b/backend/plugin/advisor/utils_for_tests.go
@@ -151,9 +151,9 @@ var (
// TestCase is the data struct for test.
type TestCase struct {
- Statement string `yaml:"statement"`
- ChangeType storepb.PlanCheckRunConfig_ChangeDatabaseType `yaml:"changeType"`
- Want []*storepb.Advice `yaml:"want,omitempty"`
+ Statement string `yaml:"statement"`
+ EnableSDL bool `yaml:"enableSDL"`
+ Want []*storepb.Advice `yaml:"want,omitempty"`
}
// RunSQLReviewRuleTest helps to test the SQL review rule.
@@ -244,7 +244,7 @@ func RunSQLReviewRuleTest(t *testing.T, rule SQLReviewRuleType, dbType storepb.E
Driver: nil,
CurrentDatabase: curDB,
DBSchema: schemaMetadata,
- ChangeType: tc.ChangeType,
+ EnableSDL: tc.EnableSDL,
EnablePriorBackup: true, // Enable backup for testing
NoAppendBuiltin: true,
UsePostgresDatabaseOwner: true,
@@ -404,8 +404,6 @@ func SetDefaultSQLReviewRulePayload(ruleTp SQLReviewRuleType, dbType storepb.Eng
SchemaRuleStatementCreateSpecifySchema,
SchemaRuleStatementCheckSetRoleVariable,
SchemaRuleStatementWhereDisallowFunctionsAndCalculations,
- SchemaRuleStatementDisallowMixInDDL,
- SchemaRuleStatementDisallowMixInDML,
SchemaRuleStatementPriorBackupCheck,
SchemaRuleStatementJoinStrictColumnAttrs,
SchemaRuleStatementMaxExecutionTime,
diff --git a/backend/runner/plancheck/statement_advise_executor.go b/backend/runner/plancheck/statement_advise_executor.go
index 6cb69d0a46..1a9c15cf82 100644
--- a/backend/runner/plancheck/statement_advise_executor.go
+++ b/backend/runner/plancheck/statement_advise_executor.go
@@ -45,8 +45,6 @@ type StatementAdviseExecutor struct {
// Run will run the plan check statement advise executor once, and run its sub-advisors one-by-one.
func (e *StatementAdviseExecutor) Run(ctx context.Context, config *storepb.PlanCheckRunConfig) ([]*storepb.PlanCheckRunResult_Result, error) {
- changeType := config.ChangeDatabaseType
-
sheetUID := int(config.SheetUid)
sheet, err := e.store.GetSheet(ctx, &store.FindSheetMessage{UID: &sheetUID})
if err != nil {
@@ -70,6 +68,8 @@ func (e *StatementAdviseExecutor) Run(ctx context.Context, config *storepb.PlanC
return nil, err
}
enablePriorBackup := config.EnablePriorBackup
+ enableGhost := config.EnableGhost
+ enableSDL := config.EnableSdl
instance, err := e.store.GetInstanceV2(ctx, &store.FindInstanceMessage{ResourceID: &config.InstanceId})
if err != nil {
@@ -97,7 +97,7 @@ func (e *StatementAdviseExecutor) Run(ctx context.Context, config *storepb.PlanC
return nil, errors.Errorf("database not found %q", config.DatabaseName)
}
- results, err := e.runReview(ctx, instance, database, changeType, statement, enablePriorBackup)
+ results, err := e.runReview(ctx, instance, database, statement, enablePriorBackup, enableGhost, enableSDL)
if err != nil {
return nil, err
}
@@ -120,9 +120,10 @@ func (e *StatementAdviseExecutor) runReview(
ctx context.Context,
instance *store.InstanceMessage,
database *store.DatabaseMessage,
- changeType storepb.PlanCheckRunConfig_ChangeDatabaseType,
statement string,
enablePriorBackup bool,
+ enableGhost bool,
+ enableSDL bool,
) ([]*storepb.PlanCheckRunResult_Result, error) {
dbMetadata, err := e.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{
InstanceID: database.InstanceID,
@@ -173,12 +174,13 @@ func (e *StatementAdviseExecutor) runReview(
Charset: dbMetadata.GetProto().CharacterSet,
Collation: dbMetadata.GetProto().Collation,
DBSchema: dbMetadata.GetProto(),
- ChangeType: changeType,
+ EnableSDL: enableSDL,
DBType: instance.Metadata.GetEngine(),
OriginalMetadata: originMetadata,
FinalMetadata: finalMetadata,
Driver: connection,
EnablePriorBackup: enablePriorBackup,
+ EnableGhost: enableGhost,
UsePostgresDatabaseOwner: useDatabaseOwner,
ListDatabaseNamesFunc: e.buildListDatabaseNamesFunc(),
InstanceID: instance.ResourceID,
diff --git a/frontend/src/types/sql-review-schema.yaml b/frontend/src/types/sql-review-schema.yaml
index cc327b646d..e906ee59a8 100644
--- a/frontend/src/types/sql-review-schema.yaml
+++ b/frontend/src/types/sql-review-schema.yaml
@@ -653,36 +653,6 @@
- type: statement.join-strict-column-attrs
category: STATEMENT
engine: MYSQL
-- type: statement.disallow-mix-in-ddl
- category: STATEMENT
- engine: MYSQL
-- type: statement.disallow-mix-in-ddl
- category: STATEMENT
- engine: TIDB
-- type: statement.disallow-mix-in-ddl
- category: STATEMENT
- engine: POSTGRES
-- type: statement.disallow-mix-in-ddl
- category: STATEMENT
- engine: ORACLE
-- type: statement.disallow-mix-in-ddl
- category: STATEMENT
- engine: MSSQL
-- type: statement.disallow-mix-in-dml
- category: STATEMENT
- engine: MYSQL
-- type: statement.disallow-mix-in-dml
- category: STATEMENT
- engine: TIDB
-- type: statement.disallow-mix-in-dml
- category: STATEMENT
- engine: POSTGRES
-- type: statement.disallow-mix-in-dml
- category: STATEMENT
- engine: ORACLE
-- type: statement.disallow-mix-in-dml
- category: STATEMENT
- engine: MSSQL
- type: statement.add-column-without-position
category: STATEMENT
engine: OCEANBASE
diff --git a/frontend/src/types/sql-review.dev.yaml b/frontend/src/types/sql-review.dev.yaml
index a1d83dea74..643d405b0c 100644
--- a/frontend/src/types/sql-review.dev.yaml
+++ b/frontend/src/types/sql-review.dev.yaml
@@ -465,36 +465,6 @@ ruleList:
- type: statement.join-strict-column-attrs
level: WARNING
engine: MYSQL
- - type: statement.disallow-mix-in-ddl
- level: WARNING
- engine: MYSQL
- - type: statement.disallow-mix-in-ddl
- level: WARNING
- engine: TIDB
- - type: statement.disallow-mix-in-ddl
- level: WARNING
- engine: POSTGRES
- - type: statement.disallow-mix-in-ddl
- level: WARNING
- engine: ORACLE
- - type: statement.disallow-mix-in-ddl
- level: WARNING
- engine: MSSQL
- - type: statement.disallow-mix-in-dml
- level: WARNING
- engine: MYSQL
- - type: statement.disallow-mix-in-dml
- level: WARNING
- engine: TIDB
- - type: statement.disallow-mix-in-dml
- level: WARNING
- engine: POSTGRES
- - type: statement.disallow-mix-in-dml
- level: WARNING
- engine: ORACLE
- - type: statement.disallow-mix-in-dml
- level: WARNING
- engine: MSSQL
- type: statement.disallow-cross-db-queries
level: WARNING
engine: MSSQL
diff --git a/frontend/src/types/sql-review.prod.yaml b/frontend/src/types/sql-review.prod.yaml
index 6506e8c71d..f80ebc8f4b 100644
--- a/frontend/src/types/sql-review.prod.yaml
+++ b/frontend/src/types/sql-review.prod.yaml
@@ -506,36 +506,6 @@ ruleList:
- type: statement.join-strict-column-attrs
level: WARNING
engine: MYSQL
- - type: statement.disallow-mix-in-ddl
- level: WARNING
- engine: MYSQL
- - type: statement.disallow-mix-in-ddl
- level: WARNING
- engine: TIDB
- - type: statement.disallow-mix-in-ddl
- level: WARNING
- engine: POSTGRES
- - type: statement.disallow-mix-in-ddl
- level: WARNING
- engine: ORACLE
- - type: statement.disallow-mix-in-ddl
- level: WARNING
- engine: MSSQL
- - type: statement.disallow-mix-in-dml
- level: WARNING
- engine: MYSQL
- - type: statement.disallow-mix-in-dml
- level: WARNING
- engine: TIDB
- - type: statement.disallow-mix-in-dml
- level: WARNING
- engine: POSTGRES
- - type: statement.disallow-mix-in-dml
- level: WARNING
- engine: ORACLE
- - type: statement.disallow-mix-in-dml
- level: WARNING
- engine: MSSQL
- type: statement.add-column-without-position
level: WARNING
engine: OCEANBASE
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index ccf3c31af0..1857599e00 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -196,8 +196,6 @@
- [PlanCheckRunResult.Result.SqlReviewReport](#bytebase-store-PlanCheckRunResult-Result-SqlReviewReport)
- [PlanCheckRunResult.Result.SqlSummaryReport](#bytebase-store-PlanCheckRunResult-Result-SqlSummaryReport)
- - [PlanCheckRunConfig.ChangeDatabaseType](#bytebase-store-PlanCheckRunConfig-ChangeDatabaseType)
-
- [store/policy.proto](#store_policy-proto)
- [Binding](#bytebase-store-Binding)
- [DataSourceQueryPolicy](#bytebase-store-DataSourceQueryPolicy)
@@ -3252,12 +3250,12 @@ Type is the database change type.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| sheet_uid | [int32](#int32) | | |
-| change_database_type | [PlanCheckRunConfig.ChangeDatabaseType](#bytebase-store-PlanCheckRunConfig-ChangeDatabaseType) | | |
| instance_id | [string](#string) | | |
| database_name | [string](#string) | | |
| ghost_flags | [PlanCheckRunConfig.GhostFlagsEntry](#bytebase-store-PlanCheckRunConfig-GhostFlagsEntry) | repeated | |
| enable_prior_backup | [bool](#bool) | | If set, a backup of the modified data will be created automatically before any changes are applied. |
| enable_ghost | [bool](#bool) | | Whether to use gh-ost for online schema migration. |
+| enable_sdl | [bool](#bool) | | Whether this is a Schema Definition Language (SDL) change. |
@@ -3350,22 +3348,6 @@ Type is the database change type.
-
-<a name="bytebase-store-PlanCheckRunConfig-ChangeDatabaseType"></a>
-
-### PlanCheckRunConfig.ChangeDatabaseType
-ChangeDatabaseType extends MigrationType with additional execution contexts.
-Note: DDL, DML, and DDL_GHOST values align with MigrationType enum values.
-
-| Name | Number | Description |
-| ---- | ------ | ----------- |
-| CHANGE_DATABASE_TYPE_UNSPECIFIED | 0 | |
-| DDL | 1 | |
-| DML | 2 | |
-| SDL | 3 | |
-| DDL_GHOST | 4 | |
-
-
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index 983f67037a..4fbc575070 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -940,10 +940,6 @@
</li>
- <li>
- <a href="#bytebase.store.PlanCheckRunConfig.ChangeDatabaseType"><span class="badge">E</span>PlanCheckRunConfig.ChangeDatabaseType</a>
- </li>
-
</ul>
@@ -9198,13 +9194,6 @@ Leave it empty if there is no need to encrypt the zip file. </p></td>
<td><p> </p></td>
</tr>
- <tr>
- <td>change_database_type</td>
- <td><a href="#bytebase.store.PlanCheckRunConfig.ChangeDatabaseType">PlanCheckRunConfig.ChangeDatabaseType</a></td>
- <td></td>
- <td><p> </p></td>
- </tr>
-
<tr>
<td>instance_id</td>
<td><a href="#string">string</a></td>
@@ -9240,6 +9229,13 @@ Leave it empty if there is no need to encrypt the zip file. </p></td>
<td><p>Whether to use gh-ost for online schema migration. </p></td>
</tr>
+ <tr>
+ <td>enable_sdl</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Whether this is a Schema Definition Language (SDL) change. </p></td>
+ </tr>
+
</tbody>
</table>
@@ -9439,47 +9435,6 @@ Leave it empty if there is no need to encrypt the zip file. </p></td>
- <h3 id="bytebase.store.PlanCheckRunConfig.ChangeDatabaseType">PlanCheckRunConfig.ChangeDatabaseType</h3>
- <p>ChangeDatabaseType extends MigrationType with additional execution contexts.</p><p>Note: DDL, DML, and DDL_GHOST values align with MigrationType enum values.</p>
- <table class="enum-table">
- <thead>
- <tr><td>Name</td><td>Number</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>CHANGE_DATABASE_TYPE_UNSPECIFIED</td>
- <td>0</td>
- <td><p></p></td>
- </tr>
-
- <tr>
- <td>DDL</td>
- <td>1</td>
- <td><p></p></td>
- </tr>
-
- <tr>
- <td>DML</td>
- <td>2</td>
- <td><p></p></td>
- </tr>
-
- <tr>
- <td>SDL</td>
- <td>3</td>
- <td><p></p></td>
- </tr>
-
- <tr>
- <td>DDL_GHOST</td>
- <td>4</td>
- <td><p></p></td>
- </tr>
-
- </tbody>
- </table>
-
diff --git a/proto/store/store/plan_check_run.proto b/proto/store/store/plan_check_run.proto
index e648a5bb63..68f00c6f2a 100644
--- a/proto/store/store/plan_check_run.proto
+++ b/proto/store/store/plan_check_run.proto
@@ -10,7 +10,7 @@ option go_package = "generated-go/store";
message PlanCheckRunConfig {
int32 sheet_uid = 1;
- ChangeDatabaseType change_database_type = 2;
+ reserved 2; // Was change_database_type enum
string instance_id = 3;
string database_name = 4;
@@ -22,15 +22,8 @@ message PlanCheckRunConfig {
// Whether to use gh-ost for online schema migration.
bool enable_ghost = 8;
- // ChangeDatabaseType extends MigrationType with additional execution contexts.
- // Note: DDL, DML, and DDL_GHOST values align with MigrationType enum values.
- enum ChangeDatabaseType {
- CHANGE_DATABASE_TYPE_UNSPECIFIED = 0;
- DDL = 1;
- DML = 2;
- SDL = 3;
- DDL_GHOST = 4;
- }
+ // Whether this is a Schema Definition Language (SDL) change.
+ bool enable_sdl = 9;
}
message PlanCheckRunResult {