Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-18 22:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'add_hop_info2' of https://github.com/deltachat/deltachat-core-rust into add_hop_info2

Browse Source
This commit is contained in:
Sebastian Klähn
2021-10-06 13:54:00 +02:00
parent 8a60c49b24 3f8878fe7a
commit 04ca047370
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dc_receive_imf.rs
View File

@@ -1156,6 +1156,7 @@ INSERT INTO msgs
part.error.take().unwrap_or_default(), part.error.take().unwrap_or_default(),
ephemeral_timer, ephemeral_timer,
ephemeral_timestamp, ephemeral_timestamp,
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
if is_partial_download.is_some() { if is_partial_download.is_some() {
DownloadState::Available DownloadState::Available
@@ -1165,6 +1166,9 @@ INSERT INTO msgs
======= =======
mime_parser.hop_info mime_parser.hop_info
>>>>>>> 4fa0edcf (add hop info) >>>>>>> 4fa0edcf (add hop info)
=======
mime_parser.hop_info
>>>>>>> 3f8878fe7a756257dc6170712bc034d5b411ec3d
])?; ])?;
let row_id = conn.last_insert_rowid(); let row_id = conn.last_insert_rowid();

12
src/sql/migrations.rs
View File

@@ -477,11 +477,7 @@ paramsv![]
sql.execute_migration("UPDATE chats SET archived=1 WHERE blocked=2;", 78) sql.execute_migration("UPDATE chats SET archived=1 WHERE blocked=2;", 78)
.await?; .await?;
} }
if dbversion < 79 {
info!(context, "[migration] v79");
sql.execute_migration("ALTER TABLE msgs ADD COLUMN hop_info TEXT DEFAULT '';", 79)
.await?;
}
if dbversion < 79 { if dbversion < 79 {
info!(context, "[migration] v79"); info!(context, "[migration] v79");
sql.execute_migration( sql.execute_migration(
@@ -492,7 +488,11 @@ paramsv![]
) )
.await?; .await?;
} }
if dbversion < 80 {
info!(context, "[migration] v80");
sql.execute_migration("ALTER TABLE msgs ADD COLUMN hop_info TEXT DEFAULT '';", 80)
.await?;
}
Ok(( Ok((
recalc_fingerprints, recalc_fingerprints,
update_icons, update_icons,