summaryrefslogtreecommitdiffstats
path: root/store/sqlstore/command_store.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-10-09 10:16:14 -0700
committerJoram Wilander <jwawilander@gmail.com>2017-10-09 13:16:14 -0400
commit0f66b6e72621842467d0e368b95ee58f485d4ace (patch)
tree444f9210a151cb735fe0502d4bb47c324592c0e6 /store/sqlstore/command_store.go
parent70e5f00241473c27a3008959ce08832c75e76ba8 (diff)
downloadchat-0f66b6e72621842467d0e368b95ee58f485d4ace.tar.gz
chat-0f66b6e72621842467d0e368b95ee58f485d4ace.tar.bz2
chat-0f66b6e72621842467d0e368b95ee58f485d4ace.zip
store/sqlstore cleanup and postgres tests (#7595)
* sqlstore cleanup / postgres tests * remove stopped containers * cmd/platform compile fix * remove test-postgres target from makefile
Diffstat (limited to 'store/sqlstore/command_store.go')
-rw-r--r--store/sqlstore/command_store.go9
1 files changed, 8 insertions, 1 deletions
diff --git a/store/sqlstore/command_store.go b/store/sqlstore/command_store.go
index d7c53e7e2..0ab09d61c 100644
--- a/store/sqlstore/command_store.go
+++ b/store/sqlstore/command_store.go
@@ -92,7 +92,14 @@ func (s SqlCommandStore) GetByTrigger(teamId string, trigger string) store.Store
return store.Do(func(result *store.StoreResult) {
var command model.Command
- if err := s.GetReplica().SelectOne(&command, "SELECT * FROM Commands WHERE TeamId = :TeamId AND `Trigger` = :Trigger AND DeleteAt = 0", map[string]interface{}{"TeamId": teamId, "Trigger": trigger}); err != nil {
+ var query string
+ if s.DriverName() == "mysql" {
+ query = "SELECT * FROM Commands WHERE TeamId = :TeamId AND `Trigger` = :Trigger AND DeleteAt = 0"
+ } else {
+ query = "SELECT * FROM Commands WHERE TeamId = :TeamId AND \"trigger\" = :Trigger AND DeleteAt = 0"
+ }
+
+ if err := s.GetReplica().SelectOne(&command, query, map[string]interface{}{"TeamId": teamId, "Trigger": trigger}); err != nil {
result.Err = model.NewAppError("SqlCommandStore.GetByTrigger", "store.sql_command.get_by_trigger.app_error", nil, "teamId="+teamId+", trigger="+trigger+", err="+err.Error(), http.StatusInternalServerError)
}