From fd597d325aad6d86c062ac50c68e79487ba2deaa Mon Sep 17 00:00:00 2001 From: dave Date: Mon, 20 Sep 2021 21:25:36 +0800 Subject: [PATCH] Migrate from gorp to sqlx in store/sqlstore/audit_store.go (#18409) --- store/sqlstore/audit_store.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/store/sqlstore/audit_store.go b/store/sqlstore/audit_store.go index 265749491e..0e486ca4ff 100644 --- a/store/sqlstore/audit_store.go +++ b/store/sqlstore/audit_store.go @@ -39,7 +39,10 @@ func (s SqlAuditStore) Save(audit *model.Audit) error { audit.Id = model.NewId() 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 nil @@ -67,15 +70,14 @@ func (s SqlAuditStore) Get(userId string, offset int, limit int) (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 audits, nil } func (s SqlAuditStore) PermanentDeleteByUser(userId string) error { - if _, err := s.GetMaster().Exec("DELETE FROM Audits WHERE UserId = :userId", - map[string]interface{}{"userId": userId}); err != nil { + if _, err := s.GetMasterX().Exec("DELETE FROM Audits WHERE UserId = ?", userId); err != nil { return errors.Wrapf(err, "failed to delete Audit with userId=%s", userId) } return nil