Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-05 14:26:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move SQL errors into their own module

Browse Source
This commit is contained in:
Alexander Krotov
2019-11-29 23:06:13 +01:00
committed by Floris Bruynooghe
parent ea8adf39c2
commit 612600278a
9 changed files with 102 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/contact.rs
View File

@@ -141,7 +141,7 @@ pub enum VerifiedStatus {
}
impl Contact {
pub fn load_from_db(context: &Context, contact_id: u32) -> Result<Self> {
pub fn load_from_db(context: &Context, contact_id: u32) -> crate::sql::Result<Self> {
if contact_id == DC_CONTACT_ID_SELF {
let contact = Contact {
id: contact_id,
@@ -691,7 +691,7 @@ impl Contact {
}
Err(err) => {
error!(context, "delete_contact {} failed ({})", contact_id, err);
return Err(err);
return Err(err.into());
}
}
}
@@ -709,7 +709,7 @@ impl Contact {
/// like "Me" in the selected language and the email address
/// defined by dc_set_config().
pub fn get_by_id(context: &Context, contact_id: u32) -> Result<Contact> {
Contact::load_from_db(context, contact_id)
Ok(Contact::load_from_db(context, contact_id)?)
}
/// Get the ID of the contact.