From ad902f601fa7570564df386bf1b03179b55242b5 Mon Sep 17 00:00:00 2001 From: Alan Mooiman Date: Thu, 24 Mar 2016 22:42:03 -0400 Subject: msg command --- store/sql_channel_store.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'store') diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 35322e061..c7ffddd56 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -4,11 +4,16 @@ package store import ( + "database/sql" "github.com/go-gorp/gorp" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" ) +const ( + MISSING_CHANNEL_ERROR = "store.sql_channel.get_by_name.missing.app_error" +) + type SqlChannelStore struct { *SqlStore } @@ -437,7 +442,11 @@ func (s SqlChannelStore) GetByName(teamId string, name string) StoreChannel { channel := model.Channel{} if err := s.GetReplica().SelectOne(&channel, "SELECT * FROM Channels WHERE TeamId = :TeamId AND Name= :Name AND DeleteAt = 0", map[string]interface{}{"TeamId": teamId, "Name": name}); err != nil { - result.Err = model.NewLocAppError("SqlChannelStore.GetByName", "store.sql_channel.get_by_name.existing.app_error", nil, "teamId="+teamId+", "+"name="+name+", "+err.Error()) + if err == sql.ErrNoRows { + result.Err = model.NewLocAppError("SqlChannelStore.GetByName", MISSING_CHANNEL_ERROR, nil, "teamId="+teamId+", "+"name="+name+", "+err.Error()) + } else { + result.Err = model.NewLocAppError("SqlChannelStore.GetByName", "store.sql_channel.get_by_name.existing.app_error", nil, "teamId="+teamId+", "+"name="+name+", "+err.Error()) + } } else { result.Data = &channel } -- cgit v1.2.3-1-g7c22