Migrate Emoji.Search to Sync by default (#11308)

* Migrate Emoji.Search to Sync by default

* Fix indentation
Этот коммит содержится в:
Shobhit Gupta
2019-06-22 00:41:48 -07:00
коммит произвёл Jesús Espino
родитель 9e9b008f3d
Коммит c4b9b3cfd3
5 изменённых файлов: 42 добавлений и 40 удалений

Просмотреть файл

@@ -183,30 +183,27 @@ func (es SqlEmojiStore) Delete(id string, time int64) *model.AppError {
return nil
}
func (es SqlEmojiStore) Search(name string, prefixOnly bool, limit int) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
var emojis []*model.Emoji
func (es SqlEmojiStore) Search(name string, prefixOnly bool, limit int) ([]*model.Emoji, *model.AppError) {
var emojis []*model.Emoji
term := ""
if !prefixOnly {
term = "%"
}
term := ""
if !prefixOnly {
term = "%"
}
term += name + "%"
term += name + "%"
if _, err := es.GetReplica().Select(&emojis,
`SELECT
*
FROM
Emoji
WHERE
Name LIKE :Name
AND DeleteAt = 0
ORDER BY Name
LIMIT :Limit`, map[string]interface{}{"Name": term, "Limit": limit}); err != nil {
result.Err = model.NewAppError("SqlEmojiStore.Search", "store.sql_emoji.get_by_name.app_error", nil, "name="+name+", "+err.Error(), http.StatusInternalServerError)
} else {
result.Data = emojis
}
})
if _, err := es.GetReplica().Select(&emojis,
`SELECT
*
FROM
Emoji
WHERE
Name LIKE :Name
AND DeleteAt = 0
ORDER BY Name
LIMIT :Limit`, map[string]interface{}{"Name": term, "Limit": limit}); err != nil {
return nil, model.NewAppError("SqlEmojiStore.Search", "store.sql_emoji.get_by_name.app_error", nil, "name="+name+", "+err.Error(), http.StatusInternalServerError)
}
return emojis, nil
}