From 9d342671d550ee4c4b11de7c8ab91a71b85f6192 Mon Sep 17 00:00:00 2001 From: Hocuri Date: Sat, 26 Jul 2025 22:41:11 +0200 Subject: [PATCH] fix: Do not fail to upgrade if the verifier of a contact doesn't exist anymore (#7044) Fix https://github.com/chatmail/core/issues/7043 --- src/sql/migrations.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/sql/migrations.rs b/src/sql/migrations.rs index a78ad0f2a..3db54183b 100644 --- a/src/sql/migrations.rs +++ b/src/sql/migrations.rs @@ -1480,9 +1480,11 @@ fn migrate_key_contacts( } else if addr.is_empty() { Ok(default) } else { - original_contact_id_from_addr_stmt + Ok(original_contact_id_from_addr_stmt .query_row((addr,), |row| row.get(0)) - .with_context(|| format!("Original contact '{addr}' not found")) + .optional() + .with_context(|| format!("Original contact '{addr}' not found"))? + .unwrap_or(default)) } };