summaryrefslogtreecommitdiffstats
path: root/store/sql_team_store.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-09-06 14:00:56 -0400
committerGitHub <noreply@github.com>2017-09-06 14:00:56 -0400
commit66a4d0112587608533aa744578d2db18bd88db56 (patch)
treecf1b5410162e156d5336a5c1666e7a66a405d083 /store/sql_team_store.go
parentf968c56890bd84295672ee0d46cc846cac2dbd47 (diff)
downloadchat-66a4d0112587608533aa744578d2db18bd88db56.tar.gz
chat-66a4d0112587608533aa744578d2db18bd88db56.tar.bz2
chat-66a4d0112587608533aa744578d2db18bd88db56.zip
Update IsUniqueConstraint to check error codes instead of message text (#7385)
Diffstat (limited to 'store/sql_team_store.go')
-rw-r--r--store/sql_team_store.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/store/sql_team_store.go b/store/sql_team_store.go
index d08242bc4..747bc0568 100644
--- a/store/sql_team_store.go
+++ b/store/sql_team_store.go
@@ -79,7 +79,7 @@ func (s SqlTeamStore) Save(team *model.Team) StoreChannel {
}
if err := s.GetMaster().Insert(team); err != nil {
- if IsUniqueConstraintError(err.Error(), []string{"Name", "teams_name_key"}) {
+ if IsUniqueConstraintError(err, []string{"Name", "teams_name_key"}) {
result.Err = model.NewAppError("SqlTeamStore.Save", "store.sql_team.save.domain_exists.app_error", nil, "id="+team.Id+", "+err.Error(), http.StatusBadRequest)
} else {
result.Err = model.NewLocAppError("SqlTeamStore.Save", "store.sql_team.save.app_error", nil, "id="+team.Id+", "+err.Error())
@@ -514,7 +514,7 @@ func (s SqlTeamStore) SaveMember(member *model.TeamMember) StoreChannel {
}
if err := s.GetMaster().Insert(member); err != nil {
- if IsUniqueConstraintError(err.Error(), []string{"TeamId", "teammembers_pkey", "PRIMARY"}) {
+ if IsUniqueConstraintError(err, []string{"TeamId", "teammembers_pkey", "PRIMARY"}) {
result.Err = model.NewLocAppError("SqlTeamStore.SaveMember", TEAM_MEMBER_EXISTS_ERROR, nil, "team_id="+member.TeamId+", user_id="+member.UserId+", "+err.Error())
} else {
result.Err = model.NewLocAppError("SqlTeamStore.SaveMember", "store.sql_team.save_member.save.app_error", nil, "team_id="+member.TeamId+", user_id="+member.UserId+", "+err.Error())