status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: don't return an error on empty rows

This commit is contained in:
Richard Ramos 2023-01-24 08:54:22 -04:00 committed by RichΛrd
parent b5964348a1
commit bfe9307f1f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
multiaccounts/settings_notifications/database.go
View File

@ -257,7 +257,7 @@ func (ns *NotificationsSettings) SetMessagePreview(value int) error {
func (ns *NotificationsSettings) GetExMuteAllMessages(id string) (result bool, err error) { func (ns *NotificationsSettings) GetExMuteAllMessages(id string) (result bool, err error) {
err = ns.db.QueryRow(ns.buildSelectQuery(columnExMuteAllMessages), id).Scan(&result) err = ns.db.QueryRow(ns.buildSelectQuery(columnExMuteAllMessages), id).Scan(&result)
if err != nil && err == sql.ErrNoRows { if err != nil && err == sql.ErrNoRows {
return defaultExMuteAllMessagesValue, err return defaultExMuteAllMessagesValue, nil
} }
return result, err return result, err
} }
@ -265,7 +265,7 @@ func (ns *NotificationsSettings) GetExMuteAllMessages(id string) (result bool, e
func (ns *NotificationsSettings) GetExPersonalMentions(id string) (result string, err error) { func (ns *NotificationsSettings) GetExPersonalMentions(id string) (result string, err error) {
err = ns.db.QueryRow(ns.buildSelectQuery(columnExPersonalMentions), id).Scan(&result) err = ns.db.QueryRow(ns.buildSelectQuery(columnExPersonalMentions), id).Scan(&result)
if err != nil && err == sql.ErrNoRows { if err != nil && err == sql.ErrNoRows {
return defaultExPersonalMentionsValue, err return defaultExPersonalMentionsValue, nil
} }
return result, err return result, err
} }
@ -273,7 +273,7 @@ func (ns *NotificationsSettings) GetExPersonalMentions(id string) (result string
func (ns *NotificationsSettings) GetExGlobalMentions(id string) (result string, err error) { func (ns *NotificationsSettings) GetExGlobalMentions(id string) (result string, err error) {
err = ns.db.QueryRow(ns.buildSelectQuery(columnExGlobalMentions), id).Scan(&result) err = ns.db.QueryRow(ns.buildSelectQuery(columnExGlobalMentions), id).Scan(&result)
if err != nil && err == sql.ErrNoRows { if err != nil && err == sql.ErrNoRows {
return defaultExGlobalMentionsValue, err return defaultExGlobalMentionsValue, nil
} }
return result, err return result, err
} }
@ -281,7 +281,7 @@ func (ns *NotificationsSettings) GetExGlobalMentions(id string) (result string,
func (ns *NotificationsSettings) GetExOtherMessages(id string) (result string, err error) { func (ns *NotificationsSettings) GetExOtherMessages(id string) (result string, err error) {
err = ns.db.QueryRow(ns.buildSelectQuery(columnExOtherMessages), id).Scan(&result) err = ns.db.QueryRow(ns.buildSelectQuery(columnExOtherMessages), id).Scan(&result)
if err != nil && err == sql.ErrNoRows { if err != nil && err == sql.ErrNoRows {
return defaultExOtherMessagesValue, err return defaultExOtherMessagesValue, nil
} }
return result, err return result, err
} }