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

ignore expected errors

Browse Source
This commit is contained in:
dignifiedquire
2019-07-12 08:51:05 +02:00
parent ecbd6fb154
commit ef31412d9e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@@ -39,7 +39,6 @@ rusqlite = { version = "0.19", features = ["bundled"] }
addr = "0.2.0" addr = "0.2.0"
r2d2_sqlite = "0.11.0" r2d2_sqlite = "0.11.0"
r2d2 = "0.8.5" r2d2 = "0.8.5"
backtrace = "0.3.32"
[dev-dependencies] [dev-dependencies]
tempfile = "3.0" tempfile = "3.0"

8
src/dc_sqlite3.rs
View File

@@ -691,12 +691,12 @@ pub fn dc_sqlite3_set_config(
key: impl AsRef<str>, key: impl AsRef<str>,
value: Option<&str>, value: Option<&str>,
) -> libc::c_int { ) -> libc::c_int {
let key = key.as_ref();
if !sql.is_open() { if !sql.is_open() {
error!(context, 0, "dc_sqlite3_set_config(): Database not ready."); error!(context, 0, "dc_sqlite3_set_config(): Database not ready.");
return 0; return 0;
} }
let key = key.as_ref();
let good; let good;
if let Some(ref value) = value { if let Some(ref value) = value {
@@ -767,7 +767,7 @@ where
match sql.execute(querystr.as_ref(), params) { match sql.execute(querystr.as_ref(), params) {
Ok(_) => true, Ok(_) => true,
Err(err) => { Err(err) => {
error!(context, 0, "dc_sqlite_exectue failed: {:?}", err); error!(context, 0, "dc_sqlite3_execute failed: {:?}", err);
false false
} }
} }
@@ -788,6 +788,10 @@ where
{ {
match sql.query_row(query, params, |row| row.get::<_, T>(column)) { match sql.query_row(query, params, |row| row.get::<_, T>(column)) {
Ok(res) => Some(res), Ok(res) => Some(res),
Err(Error::Sql(rusqlite::Error::QueryReturnedNoRows)) => None,
Err(Error::Sql(rusqlite::Error::InvalidColumnType(_, _, rusqlite::types::Type::Null))) => {
None
}
Err(err) => { Err(err) => {
error!(context, 0, "sql: Failed query_row: {}", err); error!(context, 0, "sql: Failed query_row: {}", err);
None None