contact: do not ignore SQL errors in add_or_lookup

This commit is contained in:
link2xt
2022-10-11 16:42:17 +00:00
parent 045472deac
commit b85f6ea6c3

View File

@@ -506,9 +506,9 @@ impl Contact {
let mut update_addr = false; let mut update_addr = false;
let mut row_id = 0; let mut row_id = 0;
if let Ok((id, row_name, row_addr, row_origin, row_authname)) = context if let Some((id, row_name, row_addr, row_origin, row_authname)) = context
.sql .sql
.query_row( .query_row_optional(
"SELECT id, name, addr, origin, authname \ "SELECT id, name, addr, origin, authname \
FROM contacts WHERE addr=? COLLATE NOCASE;", FROM contacts WHERE addr=? COLLATE NOCASE;",
paramsv![addr.to_string()], paramsv![addr.to_string()],
@@ -522,7 +522,7 @@ impl Contact {
Ok((row_id, row_name, row_addr, row_origin, row_authname)) Ok((row_id, row_name, row_addr, row_origin, row_authname))
}, },
) )
.await .await?
{ {
let update_name = manual && name != row_name; let update_name = manual && name != row_name;
let update_authname = !manual let update_authname = !manual