From 00791157e2d383dabb8e6b60bdd1530f4c2cca0c Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Thu, 9 Mar 2023 11:31:34 +0000
Subject: [PATCH] Drop unused columns

We are currently using libsqlite3-sys 0.25.2,
corresponding to SQLcipher 4.5.2
and SQLite 3.39.2.

SQLite supports ALTER TABLE DROP COLUMN since version 3.35.0,
and it has received critical database corruption bugfixes in 3.35.5.
There have been no fixes to it between SQLite 3.36.0 and 3.41.0,
so it appears stable now.
---
 CHANGELOG.md          |  1 +
 src/sql/migrations.rs | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e80e3874..46de6640d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Run `cargo-deny` in CI. #4101
 - Check provider database with CI. #4099 
 - Switch to DEFERRED transactions #4100
+- Drop unused SQL columns #4141
 
 ### Fixes
 - Do not block async task executor while decrypting the messages. #4079
diff --git a/src/sql/migrations.rs b/src/sql/migrations.rs
index 02f13ecf3..0cdae4c44 100644
--- a/src/sql/migrations.rs
+++ b/src/sql/migrations.rs
@@ -690,6 +690,17 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
         }
         sql.set_db_version(98).await?;
     }
+    if dbversion < 99 {
+        sql.execute_migration(
+            "ALTER TABLE msgs DROP COLUMN server_folder;
+             ALTER TABLE msgs DROP COLUMN server_uid;
+             ALTER TABLE msgs DROP COLUMN move_state;
+             ALTER TABLE chats DROP COLUMN draft_timestamp;
+             ALTER TABLE chats DROP COLUMN draft_txt",
+            99,
+        )
+        .await?;
+    }
 
     let new_version = sql
         .get_raw_config_int(VERSION_CFG)