The big sqlite refactor

* refactor: safe sql access

* Clean up the worst rebase mistakes

* Some more progress on the rebase fallout and this branch

* upgrade and compile again

* cleanup from rebase

* example of how to prepare now

* rebase fixes

* add sql.query_map

* less preparation

* more improvements in sql code

* fix string truncation

* more prepare conversions

* most prep done

* fix tests

* fix ffi

* fix last prepares

* fix segfaults and some queries

* use r2d2 pool

* fix dc_job sql call, to reduce contention

* try newer rust

* No more vararg printing (drop dc_log_)

* ignore expected errors

* fix: uses exists instead of execute where needed

* fix: get_contacts logic was broken

* fix: contact creation

* test on 32bit linux

* ci: try running 32bit without cross

* undo 32bit tests

* refactor: rename dc_sqlite3 to sql

* fix: safer string conversions

* more string fixes

* try fixing appveyor build to 64bit

* chore(ci): hardcode target

* chore(ci): appveyor

* some cleanup work

* try fix darwin

* fix and improve sql escaping

* fix various bugs

* fix chat deletion

* refactor: cleanup config values and move to their own file

* refactor: move more methods onto the sql struct

* dont panic on failed state loading

* first round of cr

* one more cr fix

* stop using strange defaults

* remove unused escapes

src/keyring.rs

@@ -2,9 +2,8 @@ use std::borrow::Cow;
 
 use crate::constants::*;
 use crate::context::Context;
-use crate::dc_sqlite3::*;
 use crate::key::*;
-use crate::types::*;
+use crate::sql::Sql;
 
 #[derive(Default, Clone, Debug)]
 pub struct Keyring<'a> {
@@ -31,29 +30,17 @@ impl<'a> Keyring<'a> {
     pub fn load_self_private_for_decrypting(
         &mut self,
         context: &Context,
-        self_addr: *const libc::c_char,
-        sql: &SQLite,
+        self_addr: impl AsRef<str>,
+        sql: &Sql,
     ) -> bool {
-        // Can we prevent keyring and self_addr to be null?
-        if self_addr.is_null() {
-            return false;
-        }
-        let stmt = unsafe {
-            dc_sqlite3_prepare(
-                context,
-                sql,
-                b"SELECT private_key FROM keypairs ORDER BY addr=? DESC, is_default DESC;\x00"
-                    as *const u8 as *const libc::c_char,
-            )
-        };
-        unsafe { sqlite3_bind_text(stmt, 1, self_addr, -1, None) };
-        while unsafe { sqlite3_step(stmt) == 100 } {
-            if let Some(key) = Key::from_stmt(stmt, 0, KeyType::Private) {
-                self.add_owned(key);
-            }
-        }
-        unsafe { sqlite3_finalize(stmt) };
-
-        true
+        sql.query_row_col(
+            context,
+            "SELECT private_key FROM keypairs ORDER BY addr=? DESC, is_default DESC;",
+            &[self_addr.as_ref()],
+            0,
+        )
+        .and_then(|blob: Vec<u8>| Key::from_slice(&blob, KeyType::Private))
+        .map(|key| self.add_owned(key))
+        .is_some()
     }
 }