IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Migrate from gorp to sqlx in store/sqlstore/command_webhook_store.go (#18517)

Browse Source 
* Migrate from gorp to sqlx in store/sqlstore/command_webhook_store.go

* fixing small things

change `CreatedAt` to `CreateAt` and change GetReplicaX().Select to GetReplicaX().Get

Co-authored-by: Saul Pinales <saul021002@gmai.com>
This commit is contained in:
Saul Pinales
2021-10-05 11:52:50 -04:00
committed by GitHub
parent 5045152acc
commit 7b9aeca7ff
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
store/sqlstore/command_webhook_store.go
View File

@@ -47,7 +47,10 @@ func (s SqlCommandWebhookStore) Save(webhook *model.CommandWebhook) (*model.Comm
return nil, err
}
if err := s.GetMaster().Insert(webhook); err != nil {
if _, err := s.GetMasterX().NamedExec(`INSERT INTO CommandWebhooks
(Id,CreateAt,CommandId,UserId,ChannelId,RootId,UseCount)
Values
(:Id, :CreateAt, :CommandId, :UserId, :ChannelId, :RootId, :UseCount)`, webhook); err != nil {
return nil, errors.Wrapf(err, "save: id=%s", webhook.Id)
}
@@ -70,7 +73,7 @@ func (s SqlCommandWebhookStore) Get(id string) (*model.CommandWebhook, error) {
return nil, errors.Wrap(err, "get_tosql")
}
if err := s.GetReplica().SelectOne(&webhook, queryString, args...); err != nil {
if err := s.GetReplicaX().Get(&webhook, queryString, args...); err != nil {
if err == sql.ErrNoRows {
return nil, store.NewErrNotFound("CommandWebhook", id)
}
@@ -92,7 +95,7 @@ func (s SqlCommandWebhookStore) TryUse(id string, limit int) error {
return errors.Wrap(err, "tryuse_tosql")
}
if sqlResult, err := s.GetMaster().Exec(queryString, args...); err != nil {
if sqlResult, err := s.GetMasterX().Exec(queryString, args...); err != nil {
return errors.Wrapf(err, "tryuse: id=%s limit=%d", id, limit)
} else if rows, _ := sqlResult.RowsAffected(); rows == 0 {
return store.NewErrInvalidInput("CommandWebhook", "id", id)
@@ -115,7 +118,7 @@ func (s SqlCommandWebhookStore) Cleanup() {
return
}
if _, err := s.GetMaster().Exec(queryString, args...); err != nil {
if _, err := s.GetMasterX().Exec(queryString, args...); err != nil {
mlog.Error("Unable to cleanup command webhook store.")
}
}