From b645bd3211c41db43dcf9360aedb1630be451741 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Thu, 13 Jul 2017 15:12:28 -0400 Subject: Postgres fix --- store/sql_oauth_store.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'store') diff --git a/store/sql_oauth_store.go b/store/sql_oauth_store.go index 8e23a8cb2..2e6fe2655 100644 --- a/store/sql_oauth_store.go +++ b/store/sql_oauth_store.go @@ -9,6 +9,7 @@ import ( "github.com/mattermost/gorp" "github.com/mattermost/platform/model" + "github.com/mattermost/platform/utils" ) type SqlOAuthStore struct { @@ -527,7 +528,14 @@ func (as SqlOAuthStore) deleteApp(transaction *gorp.Transaction, clientId string func (as SqlOAuthStore) deleteOAuthAppSessions(transaction *gorp.Transaction, clientId string) StoreResult { result := StoreResult{} - if _, err := transaction.Exec("DELETE s.* FROM Sessions s INNER JOIN OAuthAccessData o ON o.Token = s.Token WHERE o.ClientId = :Id", map[string]interface{}{"Id": clientId}); err != nil { + query := "" + if utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_POSTGRES { + query = "DELETE FROM Sessions s USING OAuthAccessData o WHERE o.Token = s.Token AND o.ClientId = :Id" + } else if utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_MYSQL { + query = "DELETE s.* FROM Sessions s INNER JOIN OAuthAccessData o ON o.Token = s.Token WHERE o.ClientId = :Id" + } + + if _, err := transaction.Exec(query, map[string]interface{}{"Id": clientId}); err != nil { result.Err = model.NewLocAppError("SqlOAuthStore.DeleteApp", "store.sql_oauth.delete_app.app_error", nil, "id="+clientId+", err="+err.Error()) return result } -- cgit v1.2.3-1-g7c22