mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

[MM-39644] - Migrate from gorp to sqlx in store/sqlstore/upload_session_store.go (#18892)

Просмотр исходного кода 
* migrate from gorp to sqlx

Signed-off-by: Penthaa Patel <penthaapatel@gmail.com>

* fix insert query

Signed-off-by: Penthaa Patel <penthaapatel@gmail.com>

* replace NamedExec() with Exec()

Signed-off-by: Penthaa Patel <penthaapatel@gmail.com>

* fix typo

Signed-off-by: Penthaa Patel <penthaapatel@gmail.com>

* remove string()

Signed-off-by: Penthaa Patel <penthaapatel@gmail.com>
Этот коммит содержится в:
Penthaa Patel
2021-11-15 19:40:54 +05:30
коммит произвёл GitHub
родитель ae897bc59a
Коммит bde2b540d6
1 изменённых файлов: 40 добавлений и 15 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

55
store/sqlstore/upload_session_store.go
Просмотреть файл

@@ -49,7 +49,15 @@ func (us SqlUploadSessionStore) Save(session *model.UploadSession) (*model.Uploa
if err := session.IsValid(); err != nil { if err := session.IsValid(); err != nil {
return nil, errors.Wrap(err, "SqlUploadSessionStore.Save: validation failed") return nil, errors.Wrap(err, "SqlUploadSessionStore.Save: validation failed")
} }
if err := us.GetMaster().Insert(session); err != nil { query, args, err := us.getQueryBuilder().
Insert("UploadSessions").
Columns("Id", "Type", "CreateAt", "UserId", "ChannelId", "Filename", "Path", "FileSize", "FileOffset", "RemoteId", "ReqFileId").
Values(session.Id, session.Type, session.CreateAt, session.UserId, session.ChannelId, session.Filename, session.Path, session.FileSize, session.FileOffset, session.RemoteId, session.ReqFileId).
ToSql()
if err != nil {
return nil, errors.Wrap(err, "SqlUploadSessionStore.Save: failed to build query")
}
if _, err := us.GetMasterX().Exec(query, args...); err != nil {
return nil, errors.Wrap(err, "SqlUploadSessionStore.Save: failed to insert") return nil, errors.Wrap(err, "SqlUploadSessionStore.Save: failed to insert")
} }
return session, nil return session, nil
@@ -62,7 +70,24 @@ func (us SqlUploadSessionStore) Update(session *model.UploadSession) error {
if err := session.IsValid(); err != nil { if err := session.IsValid(); err != nil {
return errors.Wrap(err, "SqlUploadSessionStore.Update: validation failed") return errors.Wrap(err, "SqlUploadSessionStore.Update: validation failed")
} }
if _, err := us.GetMaster().Update(session); err != nil { query, args, err := us.getQueryBuilder().
Update("UploadSessions").
Set("Type", session.Type).
Set("CreateAt", session.CreateAt).
Set("UserId", session.UserId).
Set("ChannelId", session.ChannelId).
Set("Filename", session.Filename).
Set("Path", session.Path).
Set("FileSize", session.FileSize).
Set("FileOffset", session.FileOffset).
Set("RemoteId", session.RemoteId).
Set("ReqFileId", session.ReqFileId).
Where(sq.Eq{"Id": session.Id}).
ToSql()
if err != nil {
return errors.Wrap(err, "SqlUploadSessionStore.Update: failed to build query")
}
if _, err := us.GetMasterX().Exec(query, args...); err != nil {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return store.NewErrNotFound("UploadSession", session.Id) return store.NewErrNotFound("UploadSession", session.Id)
} }
@@ -75,16 +100,16 @@ func (us SqlUploadSessionStore) Get(id string) (*model.UploadSession, error) {
if !model.IsValidId(id) { if !model.IsValidId(id) {
return nil, errors.New("SqlUploadSessionStore.Get: id is not valid") return nil, errors.New("SqlUploadSessionStore.Get: id is not valid")
} }
query := us.getQueryBuilder(). query, args, err := us.getQueryBuilder().
Select("*"). Select("*").
From("UploadSessions"). From("UploadSessions").
Where(sq.Eq{"Id": id}) Where(sq.Eq{"Id": id}).
queryString, args, err := query.ToSql() ToSql()
if err != nil { if err != nil {
return nil, errors.Wrap(err, "SqlUploadSessionStore.Get: failed to build query") return nil, errors.Wrap(err, "SqlUploadSessionStore.Get: failed to build query")
} }
var session model.UploadSession var session model.UploadSession
if err := us.GetReplica().SelectOne(&session, queryString, args...); err != nil { if err := us.GetReplicaX().Get(&session, query, args...); err != nil {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return nil, store.NewErrNotFound("UploadSession", id) return nil, store.NewErrNotFound("UploadSession", id)
} }
@@ -94,17 +119,17 @@ func (us SqlUploadSessionStore) Get(id string) (*model.UploadSession, error) {
} }
func (us SqlUploadSessionStore) GetForUser(userId string) ([]*model.UploadSession, error) { func (us SqlUploadSessionStore) GetForUser(userId string) ([]*model.UploadSession, error) {
query := us.getQueryBuilder(). query, args, err := us.getQueryBuilder().
Select("*"). Select("*").
From("UploadSessions"). From("UploadSessions").
Where(sq.Eq{"UserId": userId}). Where(sq.Eq{"UserId": userId}).
OrderBy("CreateAt ASC") OrderBy("CreateAt ASC").
queryString, args, err := query.ToSql() ToSql()
if err != nil { if err != nil {
return nil, errors.Wrap(err, "SqlUploadSessionStore.GetForUser: failed to build query") return nil, errors.Wrap(err, "SqlUploadSessionStore.GetForUser: failed to build query")
} }
var sessions []*model.UploadSession sessions := []*model.UploadSession{}
if _, err := us.GetReplica().Select(&sessions, queryString, args...); err != nil { if err := us.GetReplicaX().Select(&sessions, query, args...); err != nil {
return nil, errors.Wrap(err, "SqlUploadSessionStore.GetForUser: failed to select") return nil, errors.Wrap(err, "SqlUploadSessionStore.GetForUser: failed to select")
} }
return sessions, nil return sessions, nil
@@ -115,15 +140,15 @@ func (us SqlUploadSessionStore) Delete(id string) error {
return errors.New("SqlUploadSessionStore.Delete: id is not valid") return errors.New("SqlUploadSessionStore.Delete: id is not valid")
} }
query := us.getQueryBuilder(). query, args, err := us.getQueryBuilder().
Delete("UploadSessions"). Delete("UploadSessions").
Where(sq.Eq{"Id": id}) Where(sq.Eq{"Id": id}).
queryString, args, err := query.ToSql() ToSql()
if err != nil { if err != nil {
return errors.Wrap(err, "SqlUploadSessionStore.Delete: failed to build query") return errors.Wrap(err, "SqlUploadSessionStore.Delete: failed to build query")
} }
if _, err := us.GetMaster().Exec(queryString, args...); err != nil { if _, err := us.GetMasterX().Exec(query, args...); err != nil {
return errors.Wrap(err, "SqlUploadSessionStore.Delete: failed to delete") return errors.Wrap(err, "SqlUploadSessionStore.Delete: failed to delete")
} }