Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-28 02:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: try executing migration stepwise

Browse Source
This commit is contained in:
dignifiedquire
2023-03-17 13:49:54 +01:00
parent f8d3baa2ee
commit 03ebe86297
1 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/sql/migrations.rs
View File

@@ -691,18 +691,20 @@ 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?;
sql.execute_migration_parts(
[
"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?;
// Reverted above, as it requires to load the whole DB in memory.
sql.set_db_version(99).await?;
// sql.set_db_version(99).await?;
}
let new_version = sql
@@ -756,4 +758,37 @@ impl Sql {
Ok(())
}
async fn execute_migration_parts(
&self,
queries: impl IntoIterator<Item = &'static str>,
version: i32,
) -> Result<()> {
for query in queries {
self.transaction(move |transaction| {
transaction.execute_batch(query)?;
Ok(())
})
.await
.with_context(|| format!("execute_migration failed for version {version}"))?;
}
self.transaction(move |transaction| {
// set raw config inside the transaction
transaction.execute(
"UPDATE config SET value=? WHERE keyname=?;",
paramsv![format!("{version}"), VERSION_CFG],
)?;
Ok(())
})
.await
.context("failed to set version")?;
let mut lock = self.config_cache.write().await;
lock.insert(VERSION_CFG.to_string(), Some(format!("{version}")));
drop(lock);
Ok(())
}
}