fixup some sqlcipher issues

Cargo.toml

@@ -174,10 +174,9 @@ chrono = { version = "0.4.38", default-features=false, features = ["alloc", "clo
 [features]
 default = ["vendored", "sqlcipher"]
 internals = []
-sqlcipher = ["rusqlite/sqlcipher"]
+sqlcipher = ["rusqlite/bundled-sqlcipher-vendored-openssl"]
 vendored = [
   "async-native-tls/vendored",
-  "rusqlite/bundled-sqlcipher-vendored-openssl",
   "reqwest/native-tls-vendored"
 ]
 

src/context.rs

@@ -1410,10 +1410,13 @@ mod tests {
         let tmp = tempfile::tempdir()?;
         let dbfile = tmp.path().join("db.sqlite");
         tokio::fs::write(&dbfile, b"123").await?;
-        let res = Context::new(&dbfile, 1, Events::new(), StockStrings::new()).await?;
+        let res = Context::new(&dbfile, 1, Events::new(), StockStrings::new()).await;
 
         // Broken database is indistinguishable from encrypted one.
-        assert_eq!(res.is_open().await, false);
+        #[cfg(feature = "sqlcipher")]
+        assert_eq!(res?.is_open().await, false);
+        #[cfg(not(feature = "sqlcipher"))]
+        assert!(res.is_err());
         Ok(())
     }
 

src/sql.rs

@@ -162,13 +162,16 @@ impl Sql {
                     .context("failed to vacuum the database")?;
                 conn.set_db_config(DbConfig::SQLITE_DBCONFIG_RESET_DATABASE, false)
                     .context("failed to unset SQLITE_DBCONFIG_RESET_DATABASE")?;
+
+                #[cfg(feature = "sqlcipher")]
                 let res = conn
                     .query_row("SELECT sqlcipher_export('main', 'backup')", [], |_row| {
                         Ok(())
                     })
                     .context("failed to import from attached backup database");
                 conn.execute("DETACH DATABASE backup", [])
                     .context("failed to detach backup database")?;
+                #[cfg(feature = "sqlcipher")]
                 res?;
                 Ok(())
             })