diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-23 10:15:53 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-23 10:15:53 -0800 |
| commit | 5b0d2dd8f9e7719215d6cfb878738221585a5e3f (patch) | |
| tree | 865a61442818860a2f451b2a001ea6a8d7274e68 /store/sql_channel_store.go | |
| parent | 8d9449c068902f51a97e7a6605cd226bf4a26f2e (diff) | |
| download | chat-5b0d2dd8f9e7719215d6cfb878738221585a5e3f.tar.gz chat-5b0d2dd8f9e7719215d6cfb878738221585a5e3f.tar.bz2 chat-5b0d2dd8f9e7719215d6cfb878738221585a5e3f.zip | |
Fixing merges for latest postgres
Diffstat (limited to 'store/sql_channel_store.go')
| -rw-r--r-- | store/sql_channel_store.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index dbdfc16b1..9427e9219 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -82,7 +82,7 @@ func (s SqlChannelStore) Save(channel *model.Channel) StoreChannel { if err := s.GetMaster().Insert(channel); err != nil { if IsUniqueConstraintError(err.Error(), "Name", "channels_name_teamid_key") { dupChannel := model.Channel{} - s.GetReplica().SelectOne(&dupChannel, "SELECT * FROM Channels WHERE TeamId=? AND Name=? AND DeleteAt > 0", channel.TeamId, channel.Name) + s.GetReplica().SelectOne(&dupChannel, "SELECT * FROM Channels WHERE TeamId = :TeamId AND Name = :Name AND DeleteAt > 0", map[string]interface{}{"TeamId": channel.TeamId, "Name": channel.Name}) if dupChannel.DeleteAt > 0 { result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that name was previously created", "id="+channel.Id+", "+err.Error()) } else { |