From 5b0d2dd8f9e7719215d6cfb878738221585a5e3f Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Thu, 23 Jul 2015 10:15:53 -0800 Subject: Fixing merges for latest postgres --- store/sql_channel_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'store/sql_channel_store.go') 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 { -- cgit v1.2.3-1-g7c22