Skip to content

Commit fd056fb

Browse files
authored
Merge pull request #2492 from actiontech/fix_audit_plan_ce
Fix audit plan ce
2 parents 4d361ae + 6b7017f commit fd056fb

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

sqle/api/controller/v1/instance_audit_plan.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,14 @@ func CreateInstanceAuditPlan(c echo.Context) error {
9191
}
9292
instanceID = inst.ID
9393
instanceType = inst.DbType
94+
// check instance audit plan exist
95+
_, exist, err = model.GetStorage().GetInstanceAuditPlanByInstanceID(int64(inst.ID))
96+
if err != nil {
97+
return controller.JSONBaseErrorReq(c, err)
98+
}
99+
if exist {
100+
return controller.JSONBaseErrorReq(c, fmt.Errorf("current instance has audit plan"))
101+
}
94102
// check operation
95103
user, err := controller.GetCurrentUser(c, dms.GetUser)
96104
if err != nil {
@@ -103,6 +111,7 @@ func CreateInstanceAuditPlan(c echo.Context) error {
103111
if !canCreateAuditPlan {
104112
return controller.JSONBaseErrorReq(c, errors.NewUserNotPermissionError(model.GetOperationCodeDesc(uint(model.OP_AUDIT_PLAN_SAVE))))
105113
}
114+
106115
} else {
107116
instanceType = req.InstanceType
108117
}

sqle/server/auditplan/task_type_mysql_schema_meta.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (at *BaseSchemaMetaTaskV2) extractSQL(logger *logrus.Entry, ap *AuditPlan,
8484
return nil, fmt.Errorf("use schema fail, error: %v", err)
8585
}
8686
for _, table := range tables {
87-
sql, err := db.ShowCreateTable(utils.SupplementalQuotationMarks(ap.InstanceDatabase), utils.SupplementalQuotationMarks(table))
87+
sql, err := db.ShowCreateTable(utils.SupplementalQuotationMarks(schema), utils.SupplementalQuotationMarks(table))
8888
if err != nil {
8989
return nil, fmt.Errorf("show create table fail, error: %v", err)
9090
}

0 commit comments

Comments
 (0)