diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-09 10:16:14 -0700 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-10-09 13:16:14 -0400 |
| commit | 0f66b6e72621842467d0e368b95ee58f485d4ace (patch) | |
| tree | 444f9210a151cb735fe0502d4bb47c324592c0e6 /store/sqlstore/channel_store.go | |
| parent | 70e5f00241473c27a3008959ce08832c75e76ba8 (diff) | |
| download | chat-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/channel_store.go')
| -rw-r--r-- | store/sqlstore/channel_store.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go index 1ddc887bd..f9042b0a6 100644 --- a/store/sqlstore/channel_store.go +++ b/store/sqlstore/channel_store.go @@ -1042,7 +1042,7 @@ func (s SqlChannelStore) UpdateLastViewedAt(channelIds []string, userId string) var updateQuery string - if *utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_POSTGRES { + if s.DriverName() == model.DATABASE_DRIVER_POSTGRES { updateQuery = `UPDATE ChannelMembers SET @@ -1053,7 +1053,7 @@ func (s SqlChannelStore) UpdateLastViewedAt(channelIds []string, userId string) WHERE UserId = :UserId AND (` + updateIdQuery + `)` - } else if *utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_MYSQL { + } else if s.DriverName() == model.DATABASE_DRIVER_MYSQL { updateQuery = `UPDATE ChannelMembers SET @@ -1253,7 +1253,7 @@ func (s SqlChannelStore) performSearch(searchQuery string, term string, paramete if term == "" { searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", "", 1) - } else if *utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_POSTGRES { + } else if s.DriverName() == model.DATABASE_DRIVER_POSTGRES { splitTerm := strings.Fields(term) for i, t := range strings.Fields(term) { if i == len(splitTerm)-1 { @@ -1267,7 +1267,7 @@ func (s SqlChannelStore) performSearch(searchQuery string, term string, paramete searchClause := fmt.Sprintf("AND (%s) @@ to_tsquery('simple', :Term)", "Name || ' ' || DisplayName") searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", searchClause, 1) - } else if *utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_MYSQL { + } else if s.DriverName() == model.DATABASE_DRIVER_MYSQL { splitTerm := strings.Fields(term) for i, t := range strings.Fields(term) { splitTerm[i] = "+" + t + "*" |