Migrate from gorp to sqlx in store/sqlstore/audit_store.go (#18409)
Этот коммит содержится в:
@@ -39,7 +39,10 @@ func (s SqlAuditStore) Save(audit *model.Audit) error {
|
|||||||
audit.Id = model.NewId()
|
audit.Id = model.NewId()
|
||||||
audit.CreateAt = model.GetMillis()
|
audit.CreateAt = model.GetMillis()
|
||||||
|
|
||||||
if err := s.GetMaster().Insert(audit); err != nil {
|
if _, err := s.GetMasterX().NamedExec(`INSERT INTO Audits
|
||||||
|
(Id, CreateAt, UserId, Action, ExtraInfo, IpAddress, SessionId)
|
||||||
|
VALUES
|
||||||
|
(:Id, :CreateAt, :UserId, :Action, :ExtraInfo, :IpAddress, :SessionId)`, audit); err != nil {
|
||||||
return errors.Wrapf(err, "failed to save Audit with userId=%s and action=%s", audit.UserId, audit.Action)
|
return errors.Wrapf(err, "failed to save Audit with userId=%s and action=%s", audit.UserId, audit.Action)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@@ -67,15 +70,14 @@ func (s SqlAuditStore) Get(userId string, offset int, limit int) (model.Audits,
|
|||||||
}
|
}
|
||||||
|
|
||||||
var audits model.Audits
|
var audits model.Audits
|
||||||
if _, err := s.GetReplica().Select(&audits, queryString, args...); err != nil {
|
if err := s.GetReplicaX().Select(&audits, queryString, args...); err != nil {
|
||||||
return nil, errors.Wrapf(err, "failed to get Audit list for userId=%s", userId)
|
return nil, errors.Wrapf(err, "failed to get Audit list for userId=%s", userId)
|
||||||
}
|
}
|
||||||
return audits, nil
|
return audits, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s SqlAuditStore) PermanentDeleteByUser(userId string) error {
|
func (s SqlAuditStore) PermanentDeleteByUser(userId string) error {
|
||||||
if _, err := s.GetMaster().Exec("DELETE FROM Audits WHERE UserId = :userId",
|
if _, err := s.GetMasterX().Exec("DELETE FROM Audits WHERE UserId = ?", userId); err != nil {
|
||||||
map[string]interface{}{"userId": userId}); err != nil {
|
|
||||||
return errors.Wrapf(err, "failed to delete Audit with userId=%s", userId)
|
return errors.Wrapf(err, "failed to delete Audit with userId=%s", userId)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user