diff options
author | Chris <ccbrown112@gmail.com> | 2017-10-30 11:57:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-30 11:57:24 -0500 |
commit | c5e8cb25caa39ed018ede5270e1566e8f7448396 (patch) | |
tree | 80f9f8957d4ff8458ecf9631135c916df25544bd /store/sqlstore | |
parent | 63df41b91110bac06baffef87fe0c1952b47ac93 (diff) | |
download | chat-c5e8cb25caa39ed018ede5270e1566e8f7448396.tar.gz chat-c5e8cb25caa39ed018ede5270e1566e8f7448396.tar.bz2 chat-c5e8cb25caa39ed018ede5270e1566e8f7448396.zip |
simplify things (#7735)
Diffstat (limited to 'store/sqlstore')
-rw-r--r-- | store/sqlstore/post_store.go | 2 | ||||
-rw-r--r-- | store/sqlstore/session_store.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go index 6faf51c3d..2fa8f2403 100644 --- a/store/sqlstore/post_store.go +++ b/store/sqlstore/post_store.go @@ -831,7 +831,7 @@ func (s SqlPostStore) Search(teamId string, userId string, params *model.SearchP searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", "", 1) } else if s.DriverName() == model.DATABASE_DRIVER_POSTGRES { // Parse text for wildcards - if wildcard, err := regexp.Compile("\\*($| )"); err == nil { + if wildcard, err := regexp.Compile(`\*($| )`); err == nil { terms = wildcard.ReplaceAllLiteralString(terms, ":* ") } diff --git a/store/sqlstore/session_store.go b/store/sqlstore/session_store.go index 1f8799cdf..57b7bbffe 100644 --- a/store/sqlstore/session_store.go +++ b/store/sqlstore/session_store.go @@ -84,7 +84,7 @@ func (me SqlSessionStore) Get(sessionIdOrToken string) store.StoreChannel { if _, err := me.GetReplica().Select(&sessions, "SELECT * FROM Sessions WHERE Token = :Token OR Id = :Id LIMIT 1", map[string]interface{}{"Token": sessionIdOrToken, "Id": sessionIdOrToken}); err != nil { result.Err = model.NewAppError("SqlSessionStore.Get", "store.sql_session.get.app_error", nil, "sessionIdOrToken="+sessionIdOrToken+", "+err.Error(), http.StatusInternalServerError) - } else if sessions == nil || len(sessions) == 0 { + } else if len(sessions) == 0 { result.Err = model.NewAppError("SqlSessionStore.Get", "store.sql_session.get.app_error", nil, "sessionIdOrToken="+sessionIdOrToken, http.StatusNotFound) } else { result.Data = sessions[0] |