diff --git a/deltachat-repl/src/cmdline.rs b/deltachat-repl/src/cmdline.rs index 60f6dc750..e659ea7e8 100644 --- a/deltachat-repl/src/cmdline.rs +++ b/deltachat-repl/src/cmdline.rs @@ -35,7 +35,7 @@ async fn reset_tables(context: &Context, bits: i32) { if 0 != bits & 1 { context .sql() - .execute("DELETE FROM jobs;", paramsv![]) + .execute("DELETE FROM jobs;", ()) .await .unwrap(); println!("(1) Jobs reset."); @@ -43,7 +43,7 @@ async fn reset_tables(context: &Context, bits: i32) { if 0 != bits & 2 { context .sql() - .execute("DELETE FROM acpeerstates;", paramsv![]) + .execute("DELETE FROM acpeerstates;", ()) .await .unwrap(); println!("(2) Peerstates reset."); @@ -51,7 +51,7 @@ async fn reset_tables(context: &Context, bits: i32) { if 0 != bits & 4 { context .sql() - .execute("DELETE FROM keypairs;", paramsv![]) + .execute("DELETE FROM keypairs;", ()) .await .unwrap(); println!("(4) Private keypairs reset."); @@ -59,36 +59,36 @@ async fn reset_tables(context: &Context, bits: i32) { if 0 != bits & 8 { context .sql() - .execute("DELETE FROM contacts WHERE id>9;", paramsv![]) + .execute("DELETE FROM contacts WHERE id>9;", ()) .await .unwrap(); context .sql() - .execute("DELETE FROM chats WHERE id>9;", paramsv![]) + .execute("DELETE FROM chats WHERE id>9;", ()) .await .unwrap(); context .sql() - .execute("DELETE FROM chats_contacts;", paramsv![]) + .execute("DELETE FROM chats_contacts;", ()) .await .unwrap(); context .sql() - .execute("DELETE FROM msgs WHERE id>9;", paramsv![]) + .execute("DELETE FROM msgs WHERE id>9;", ()) .await .unwrap(); context .sql() .execute( "DELETE FROM config WHERE keyname LIKE 'imap.%' OR keyname LIKE 'configured%';", - paramsv![], + (), ) .await .unwrap(); context.sql().config_cache().write().await.clear(); context .sql() - .execute("DELETE FROM leftgrps;", paramsv![]) + .execute("DELETE FROM leftgrps;", ()) .await .unwrap(); println!("(8) Rest but server config reset."); diff --git a/src/authres.rs b/src/authres.rs index eb267ddc9..41e45e8cd 100644 --- a/src/authres.rs +++ b/src/authres.rs @@ -334,7 +334,7 @@ async fn set_dkim_works_timestamp( async fn clear_dkim_works(context: &Context) -> Result<()> { context .sql - .execute("DELETE FROM sending_domains", paramsv![]) + .execute("DELETE FROM sending_domains", ()) .await?; Ok(()) } diff --git a/src/chat.rs b/src/chat.rs index edffef4ba..0442dea3c 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -853,7 +853,7 @@ impl ChatId { AND c.blocked=0 AND c.archived=1 ", - paramsv![], + (), ) .await? } else { @@ -2578,7 +2578,7 @@ pub async fn marknoticed_chat(context: &Context, chat_id: ChatId) -> Result<()> "SELECT DISTINCT(m.chat_id) FROM msgs m LEFT JOIN chats c ON m.chat_id=c.id WHERE m.state=10 AND m.hidden=0 AND m.chat_id>9 AND c.blocked=0 AND c.archived=1", - paramsv![], + (), |row| row.get::<_, ChatId>(0), |ids| ids.collect::, _>>().map_err(Into::into) ) @@ -3500,10 +3500,7 @@ pub(crate) async fn get_chat_cnt(context: &Context) -> Result { // no database, no chats - this is no error (needed eg. for information) let count = context .sql - .count( - "SELECT COUNT(*) FROM chats WHERE id>9 AND blocked=0;", - paramsv![], - ) + .count("SELECT COUNT(*) FROM chats WHERE id>9 AND blocked=0;", ()) .await?; Ok(count) } else { @@ -3676,17 +3673,14 @@ pub(crate) async fn delete_and_reset_all_device_msgs(context: &Context) -> Resul paramsv![ContactId::DEVICE], ) .await?; - context - .sql - .execute("DELETE FROM devmsglabels;", paramsv![]) - .await?; + context.sql.execute("DELETE FROM devmsglabels;", ()).await?; // Insert labels for welcome messages to avoid them being readded on reconfiguration. context .sql .execute( r#"INSERT INTO devmsglabels (label) VALUES ("core-welcome-image"), ("core-welcome")"#, - paramsv![], + (), ) .await?; context.set_config(Config::QuotaExceeding, None).await?; diff --git a/src/config.rs b/src/config.rs index 39cd00877..76dca83a2 100644 --- a/src/config.rs +++ b/src/config.rs @@ -424,7 +424,7 @@ impl Context { match key { Config::Selfavatar => { self.sql - .execute("UPDATE contacts SET selfavatar_sent=0;", paramsv![]) + .execute("UPDATE contacts SET selfavatar_sent=0;", ()) .await?; match value { Some(value) => { diff --git a/src/context.rs b/src/context.rs index 667f41d8e..13479a7ea 100644 --- a/src/context.rs +++ b/src/context.rs @@ -590,7 +590,7 @@ impl Context { .unwrap_or_default(); let journal_mode = self .sql - .query_get_value("PRAGMA journal_mode;", paramsv![]) + .query_get_value("PRAGMA journal_mode;", ()) .await? .unwrap_or_else(|| "unknown".to_string()); let e2ee_enabled = self.get_config_int(Config::E2eeEnabled).await?; @@ -598,14 +598,11 @@ impl Context { let bcc_self = self.get_config_int(Config::BccSelf).await?; let send_sync_msgs = self.get_config_int(Config::SendSyncMsgs).await?; - let prv_key_cnt = self - .sql - .count("SELECT COUNT(*) FROM keypairs;", paramsv![]) - .await?; + let prv_key_cnt = self.sql.count("SELECT COUNT(*) FROM keypairs;", ()).await?; let pub_key_cnt = self .sql - .count("SELECT COUNT(*) FROM acpeerstates;", paramsv![]) + .count("SELECT COUNT(*) FROM acpeerstates;", ()) .await?; let fingerprint_str = match SignedPublicKey::load_self(self).await { Ok(key) => key.fingerprint().hex(), diff --git a/src/ephemeral.rs b/src/ephemeral.rs index 306f3d7c5..f7dadf5d8 100644 --- a/src/ephemeral.rs +++ b/src/ephemeral.rs @@ -1173,7 +1173,7 @@ mod tests { // No other messages are marked for deletion. assert_eq!( t.sql - .count("SELECT COUNT(*) FROM imap WHERE target=''", paramsv![],) + .count("SELECT COUNT(*) FROM imap WHERE target=''", ()) .await?, 0 ); @@ -1187,10 +1187,7 @@ mod tests { .update_download_state(&t, DownloadState::Available) .await?; t.sql - .execute( - "UPDATE imap SET target=folder WHERE rfc724_mid='1000'", - paramsv![], - ) + .execute("UPDATE imap SET target=folder WHERE rfc724_mid='1000'", ()) .await?; delete_expired_imap_messages(&t).await?; test_marked_for_deletion(&t, 1000).await?; // Delete downloadable anyway. @@ -1201,10 +1198,7 @@ mod tests { delete_expired_imap_messages(&t).await?; test_marked_for_deletion(&t, 1010).await?; t.sql - .execute( - "UPDATE imap SET target=folder WHERE rfc724_mid='1010'", - paramsv![], - ) + .execute("UPDATE imap SET target=folder WHERE rfc724_mid='1010'", ()) .await?; MsgId::new(1010) @@ -1214,7 +1208,7 @@ mod tests { // Keep downloadable for now. assert_eq!( t.sql - .count("SELECT COUNT(*) FROM imap WHERE target=''", paramsv![],) + .count("SELECT COUNT(*) FROM imap WHERE target=''", ()) .await?, 0 ); diff --git a/src/imex.rs b/src/imex.rs index bd7091800..7ca3bb15c 100644 --- a/src/imex.rs +++ b/src/imex.rs @@ -697,7 +697,7 @@ async fn export_self_keys(context: &Context, dir: &Path) -> Result<()> { .sql .query_map( "SELECT id, public_key, private_key, is_default FROM keypairs;", - paramsv![], + (), |row| { let id = row.get(0)?; let public_key_blob: Vec = row.get(1)?; diff --git a/src/key.rs b/src/key.rs index 3b48fe19e..74fb997cf 100644 --- a/src/key.rs +++ b/src/key.rs @@ -148,7 +148,7 @@ impl DcKey for SignedSecretKey { WHERE addr=(SELECT value FROM config WHERE keyname="configured_addr") AND is_default=1; "#, - paramsv![], + (), |row| { let bytes: Vec = row.get(0)?; Ok(bytes) @@ -302,7 +302,7 @@ pub async fn store_self_keypair( .context("failed to remove old use of key")?; if default == KeyPairUse::Default { transaction - .execute("UPDATE keypairs SET is_default=0;", paramsv![]) + .execute("UPDATE keypairs SET is_default=0;", ()) .context("failed to clear default")?; } let is_default = match default { @@ -592,7 +592,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD let nrows = || async { ctx.sql - .count("SELECT COUNT(*) FROM keypairs;", paramsv![]) + .count("SELECT COUNT(*) FROM keypairs;", ()) .await .unwrap() }; diff --git a/src/location.rs b/src/location.rs index 7bb381497..52315585b 100644 --- a/src/location.rs +++ b/src/location.rs @@ -434,10 +434,7 @@ fn is_marker(txt: &str) -> bool { /// Deletes all locations from the database. pub async fn delete_all(context: &Context) -> Result<()> { - context - .sql - .execute("DELETE FROM locations;", paramsv![]) - .await?; + context.sql.execute("DELETE FROM locations;", ()).await?; context.emit_event(EventType::LocationChanged(None)); Ok(()) } diff --git a/src/message.rs b/src/message.rs index 258a8624a..b287e6c57 100644 --- a/src/message.rs +++ b/src/message.rs @@ -1794,7 +1794,7 @@ pub async fn get_unblocked_msg_cnt(context: &Context) -> usize { "SELECT COUNT(*) \ FROM msgs m LEFT JOIN chats c ON c.id=m.chat_id \ WHERE m.id>9 AND m.chat_id>9 AND c.blocked=0;", - paramsv![], + (), ) .await { @@ -1814,7 +1814,7 @@ pub async fn get_request_msg_cnt(context: &Context) -> usize { "SELECT COUNT(*) \ FROM msgs m LEFT JOIN chats c ON c.id=m.chat_id \ WHERE c.blocked=2;", - paramsv![], + (), ) .await { diff --git a/src/peerstate.rs b/src/peerstate.rs index 2913326fe..16378c918 100644 --- a/src/peerstate.rs +++ b/src/peerstate.rs @@ -718,7 +718,7 @@ pub(crate) async fn deduplicate_peerstates(sql: &Sql) -> Result<()> { FROM acpeerstates GROUP BY addr )", - paramsv![], + (), ) .await?; diff --git a/src/securejoin/bobstate.rs b/src/securejoin/bobstate.rs index 9640e5d1c..b6584f6e1 100644 --- a/src/securejoin/bobstate.rs +++ b/src/securejoin/bobstate.rs @@ -163,7 +163,7 @@ impl BobState { // guaranteed to only have one row. sql.query_row_optional( "SELECT id, invite, next_step, chat_id FROM bobstate;", - paramsv![], + (), |row| { let s = BobState { id: row.get(0)?, diff --git a/src/sql.rs b/src/sql.rs index 86f3bb4fa..eff04a157 100644 --- a/src/sql.rs +++ b/src/sql.rs @@ -220,7 +220,7 @@ impl Sql { let addrs = self .query_map( "SELECT addr FROM acpeerstates;", - paramsv![], + (), |row| row.get::<_, String>(0), |addrs| { addrs @@ -742,7 +742,7 @@ pub async fn housekeeping(context: &Context) -> Result<()> { .sql .execute( "DELETE FROM msgs_mdns WHERE msg_id NOT IN (SELECT id FROM msgs)", - paramsv![], + (), ) .await .ok_or_log_msg(context, "failed to remove old MDNs"); @@ -790,7 +790,7 @@ pub async fn remove_unused_files(context: &Context) -> Result<()> { .sql .query_map( "SELECT value FROM config;", - paramsv![], + (), |row| row.get::<_, String>(0), |rows| { for row in rows { @@ -925,7 +925,7 @@ async fn maybe_add_from_param( ) -> Result<()> { sql.query_map( query, - paramsv![], + (), |row| row.get::<_, String>(0), |rows| { for row in rows { diff --git a/src/sql/migrations.rs b/src/sql/migrations.rs index 0cdae4c44..d23261862 100644 --- a/src/sql/migrations.rs +++ b/src/sql/migrations.rs @@ -391,7 +391,7 @@ UPDATE chats SET protected=1, type=120 WHERE type=130;"#, sql.execute( r#" CREATE TABLE imap_sync (folder TEXT PRIMARY KEY, uidvalidity INTEGER DEFAULT 0, uid_next INTEGER DEFAULT 0);"#, -paramsv![] +() ) .await?; for c in &[ diff --git a/src/sync.rs b/src/sync.rs index a977d1c57..2976a07fc 100644 --- a/src/sync.rs +++ b/src/sync.rs @@ -155,7 +155,7 @@ impl Context { .sql .query_map( "SELECT id, item FROM multi_device_sync ORDER BY id;", - paramsv![], + (), |row| Ok((row.get::<_, u32>(0)?, row.get::<_, String>(1)?)), |rows| { let mut ids = vec![]; @@ -201,7 +201,7 @@ impl Context { self.sql .execute( &format!("DELETE FROM multi_device_sync WHERE id IN ({ids});"), - paramsv![], + (), ) .await?; Ok(()) diff --git a/src/test_utils.rs b/src/test_utils.rs index 3b57724be..5006f31c6 100644 --- a/src/test_utils.rs +++ b/src/test_utils.rs @@ -398,7 +398,7 @@ impl TestContext { SELECT id, msg_id, mime, recipients FROM smtp ORDER BY id DESC"#, - paramsv![], + (), |row| { let rowid: i64 = row.get(0)?; let msg_id: MsgId = row.get(1)?; diff --git a/src/webxdc.rs b/src/webxdc.rs index 1c9a8095b..bfaaa8741 100644 --- a/src/webxdc.rs +++ b/src/webxdc.rs @@ -438,7 +438,7 @@ impl Context { "DELETE FROM smtp_status_updates WHERE msg_id IN (SELECT msg_id FROM smtp_status_updates LIMIT 1) RETURNING msg_id, first_serial, last_serial, descr", - paramsv![], + (), |row| { let instance_id: MsgId = row.get(0)?; let first_serial: StatusUpdateSerial = row.get(1)?; @@ -1195,7 +1195,7 @@ mod tests { ); assert_eq!( t.sql - .count("SELECT COUNT(*) FROM msgs_status_updates;", paramsv![],) + .count("SELECT COUNT(*) FROM msgs_status_updates;", ()) .await?, 0 ); @@ -1543,14 +1543,14 @@ mod tests { assert_eq!( t.sql - .count("SELECT COUNT(*) FROM smtp_status_updates", paramsv![],) + .count("SELECT COUNT(*) FROM smtp_status_updates", ()) .await?, 1 ); t.flush_status_updates().await?; assert_eq!( t.sql - .count("SELECT COUNT(*) FROM smtp_status_updates", paramsv![],) + .count("SELECT COUNT(*) FROM smtp_status_updates", ()) .await?, 0 ); @@ -1580,7 +1580,7 @@ mod tests { .await?; assert_eq!( t.sql - .count("SELECT COUNT(*) FROM smtp_status_updates", paramsv![],) + .count("SELECT COUNT(*) FROM smtp_status_updates", ()) .await?, 3 ); @@ -1606,7 +1606,7 @@ mod tests { } assert_eq!( t.sql - .count("SELECT COUNT(*) FROM smtp_status_updates", paramsv![],) + .count("SELECT COUNT(*) FROM smtp_status_updates", ()) .await?, 2 - i ); @@ -1648,7 +1648,7 @@ mod tests { assert_eq!( alice .sql - .count("SELECT COUNT(*) FROM smtp_status_updates", paramsv![],) + .count("SELECT COUNT(*) FROM smtp_status_updates", ()) .await?, 0 ); @@ -2438,7 +2438,7 @@ sth_for_the = "future""# assert_eq!( alice .sql - .count("SELECT COUNT(*) FROM msgs_status_updates;", paramsv![],) + .count("SELECT COUNT(*) FROM msgs_status_updates;", ()) .await?, 0 ); @@ -2461,7 +2461,7 @@ sth_for_the = "future""# assert!( alice .sql - .count("SELECT COUNT(*) FROM msgs_status_updates;", paramsv![],) + .count("SELECT COUNT(*) FROM msgs_status_updates;", ()) .await? > 0 );