diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-05-17 17:51:42 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-17 17:51:42 -0400 |
| commit | edd453c6cd6daf1b4c6e1ea7ce2721db16e25214 (patch) | |
| tree | b5d616a061d949fc894fe07f03c06d2b20338476 /store/sql_preference_store.go | |
| parent | 0fe75cb7826944a3352705d5e78eba1d12cc213a (diff) | |
| parent | ac509b114df1c1b4b841eded74fb797805e0162d (diff) | |
| download | chat-edd453c6cd6daf1b4c6e1ea7ce2721db16e25214.tar.gz chat-edd453c6cd6daf1b4c6e1ea7ce2721db16e25214.tar.bz2 chat-edd453c6cd6daf1b4c6e1ea7ce2721db16e25214.zip | |
Merge branch 'release-3.0'
Diffstat (limited to 'store/sql_preference_store.go')
| -rw-r--r-- | store/sql_preference_store.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/store/sql_preference_store.go b/store/sql_preference_store.go index bb3fca3e3..83bf92ead 100644 --- a/store/sql_preference_store.go +++ b/store/sql_preference_store.go @@ -155,7 +155,7 @@ func (s SqlPreferenceStore) insert(transaction *gorp.Transaction, preference *mo result := StoreResult{} if err := transaction.Insert(preference); err != nil { - if IsUniqueConstraintError(err.Error(), "UserId", "preferences_pkey") { + if IsUniqueConstraintError(err.Error(), []string{"UserId", "preferences_pkey"}) { result.Err = model.NewLocAppError("SqlPreferenceStore.insert", "store.sql_preference.insert.exists.app_error", nil, "user_id="+preference.UserId+", category="+preference.Category+", name="+preference.Name+", "+err.Error()) } else { |