diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-30 01:06:50 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-30 01:06:50 -0800 |
| commit | d93bf60248f066542d0851a7b6847f925975d77f (patch) | |
| tree | bb2c8a931855c3a9da6cdd7d906a8f1b99b7fd46 /store | |
| parent | b4877c5d36569dae486a1e53f39c35d346e3d3d2 (diff) | |
| parent | deb4fac1f64fde5d5f435129a79eada44cb6994c (diff) | |
| download | chat-d93bf60248f066542d0851a7b6847f925975d77f.tar.gz chat-d93bf60248f066542d0851a7b6847f925975d77f.tar.bz2 chat-d93bf60248f066542d0851a7b6847f925975d77f.zip | |
Merge branch 'master' into mm-1355
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_channel_store.go | 8 | ||||
| -rw-r--r-- | store/sql_post_store_test.go | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index f64558a92..ce1a8c6fa 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -84,9 +84,9 @@ func (s SqlChannelStore) Save(channel *model.Channel) StoreChannel { dupChannel := model.Channel{} 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()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle was previously created", "id="+channel.Id+", "+err.Error()) } else { - result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that name already exists", "id="+channel.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle already exists", "id="+channel.Id+", "+err.Error()) } } else { result.Err = model.NewAppError("SqlChannelStore.Save", "We couldn't save the channel", "id="+channel.Id+", "+err.Error()) @@ -122,9 +122,9 @@ func (s SqlChannelStore) Update(channel *model.Channel) StoreChannel { dupChannel := model.Channel{} 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()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle was previously created", "id="+channel.Id+", "+err.Error()) } else { - result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that name already exists", "id="+channel.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlChannelStore.Update", "A channel with that handle already exists", "id="+channel.Id+", "+err.Error()) } } else { result.Err = model.NewAppError("SqlChannelStore.Update", "We encounted an error updating the channel", "id="+channel.Id+", "+err.Error()) diff --git a/store/sql_post_store_test.go b/store/sql_post_store_test.go index bad6408b8..d1639aa03 100644 --- a/store/sql_post_store_test.go +++ b/store/sql_post_store_test.go @@ -445,12 +445,12 @@ func TestPostStoreSearch(t *testing.T) { t.Fatal("returned wrong serach result") } - if utils.Cfg.SqlSettings.DriverName == "mysql" { - r2 := (<-store.Post().Search(teamId, userId, "new york", false)).Data.(*model.PostList) - if len(r2.Order) >= 1 && r2.Order[0] != o2.Id { - t.Fatal("returned wrong serach result") - } - } + // if utils.Cfg.SqlSettings.DriverName == "mysql" { + // r2 := (<-store.Post().Search(teamId, userId, "new york", false)).Data.(*model.PostList) + // if len(r2.Order) >= 1 && r2.Order[0] != o2.Id { + // t.Fatal("returned wrong serach result") + // } + // } r3 := (<-store.Post().Search(teamId, userId, "new", false)).Data.(*model.PostList) if len(r3.Order) != 2 && r3.Order[0] != o1.Id { |