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/audit_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/audit_store.go')
| -rw-r--r-- | store/sqlstore/audit_store.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/store/sqlstore/audit_store.go b/store/sqlstore/audit_store.go index 3cc0758cc..eb30058c7 100644 --- a/store/sqlstore/audit_store.go +++ b/store/sqlstore/audit_store.go @@ -8,7 +8,6 @@ import ( "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" ) type SqlAuditStore struct { @@ -83,7 +82,7 @@ func (s SqlAuditStore) PermanentDeleteByUser(userId string) store.StoreChannel { func (s SqlAuditStore) PermanentDeleteBatch(endTime int64, limit int64) store.StoreChannel { return store.Do(func(result *store.StoreResult) { var query string - if *utils.Cfg.SqlSettings.DriverName == "postgres" { + if s.DriverName() == "postgres" { query = "DELETE from Audits WHERE Id = any (array (SELECT Id FROM Audits WHERE CreateAt < :EndTime LIMIT :Limit))" } else { query = "DELETE from Audits WHERE CreateAt < :EndTime LIMIT :Limit" |