From 5992a729c50989b7a39e42a0aaed42bc3914fb13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Fri, 1 Jun 2018 15:11:22 +0200 Subject: MM-10760: Using master for any Exec call (#8895) --- store/sqlstore/scheme_supplier.go | 4 ++-- store/sqlstore/system_store.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'store') diff --git a/store/sqlstore/scheme_supplier.go b/store/sqlstore/scheme_supplier.go index 326fb45e6..29370f9ae 100644 --- a/store/sqlstore/scheme_supplier.go +++ b/store/sqlstore/scheme_supplier.go @@ -216,12 +216,12 @@ func (s *SqlSupplier) SchemeDelete(ctx context.Context, schemeId string, hints . // Update any teams or channels using this scheme to the default scheme. if scheme.Scope == model.SCHEME_SCOPE_TEAM { - if _, err := s.GetReplica().Exec("UPDATE Teams SET SchemeId = '' WHERE SchemeId = :SchemeId", map[string]interface{}{"SchemeId": schemeId}); err != nil { + if _, err := s.GetMaster().Exec("UPDATE Teams SET SchemeId = '' WHERE SchemeId = :SchemeId", map[string]interface{}{"SchemeId": schemeId}); err != nil { result.Err = model.NewAppError("SqlSchemeStore.Delete", "store.sql_scheme.reset_teams.app_error", nil, "Id="+schemeId+", "+err.Error(), http.StatusInternalServerError) return result } } else if scheme.Scope == model.SCHEME_SCOPE_CHANNEL { - if _, err := s.GetReplica().Exec("UPDATE Channels SET SchemeId = '' WHERE SchemeId = :SchemeId", map[string]interface{}{"SchemeId": schemeId}); err != nil { + if _, err := s.GetMaster().Exec("UPDATE Channels SET SchemeId = '' WHERE SchemeId = :SchemeId", map[string]interface{}{"SchemeId": schemeId}); err != nil { result.Err = model.NewAppError("SqlSchemeStore.Delete", "store.sql_scheme.reset_channels.app_error", nil, "Id="+schemeId+", "+err.Error(), http.StatusInternalServerError) return result } diff --git a/store/sqlstore/system_store.go b/store/sqlstore/system_store.go index 4065bb955..4d5afad3f 100644 --- a/store/sqlstore/system_store.go +++ b/store/sqlstore/system_store.go @@ -89,7 +89,7 @@ func (s SqlSystemStore) GetByName(name string) store.StoreChannel { func (s SqlSystemStore) PermanentDeleteByName(name string) store.StoreChannel { return store.Do(func(result *store.StoreResult) { var system model.System - if _, err := s.GetReplica().Exec("DELETE FROM Systems WHERE Name = :Name", map[string]interface{}{"Name": name}); err != nil { + if _, err := s.GetMaster().Exec("DELETE FROM Systems WHERE Name = :Name", map[string]interface{}{"Name": name}); err != nil { result.Err = model.NewAppError("SqlSystemStore.PermanentDeleteByName", "store.sql_system.permanent_delete_by_name.app_error", nil, "", http.StatusInternalServerError) } -- cgit v1.2.3-1-g7c22