diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cd828382..34bce4108 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,12 @@ ### Fixes - Fix python bindings README documentation on installing the bindings from source. +## [1.112.5] - 2023-04-02 + +### Fixes + +- Run SQL database migrations after receiving a backup from the network. #4287 + ## [1.112.4] - 2023-03-31 ### Fixes @@ -2361,10 +2367,11 @@ For a full list of changes, please see our closed Pull Requests: https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed -[unreleased]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.4...HEAD +[unreleased]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.5...HEAD [1.111.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.110.0...v1.111.0 [1.112.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.111.0...v1.112.0 [1.112.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.0...v1.112.1 [1.112.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.1...v1.112.2 [1.112.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.2...v1.112.3 [1.112.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.3...v1.112.4 +[1.112.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.4...v1.112.5 diff --git a/Cargo.lock b/Cargo.lock index 3f9106d75..c42a98589 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1150,7 +1150,7 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.112.4" +version = "1.112.5" dependencies = [ "ansi_term", "anyhow", @@ -1225,7 +1225,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.112.4" +version = "1.112.5" dependencies = [ "anyhow", "async-channel", @@ -1248,7 +1248,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.112.4" +version = "1.112.5" dependencies = [ "ansi_term", "anyhow", @@ -1263,7 +1263,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.112.4" +version = "1.112.5" dependencies = [ "anyhow", "deltachat", @@ -1287,7 +1287,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.112.4" +version = "1.112.5" dependencies = [ "anyhow", "deltachat", diff --git a/Cargo.toml b/Cargo.toml index 800afafae..3167e5a7e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat" -version = "1.112.4" +version = "1.112.5" edition = "2021" license = "MPL-2.0" rust-version = "1.65" diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml index 28e3e8f0a..bdac367da 100644 --- a/deltachat-ffi/Cargo.toml +++ b/deltachat-ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat_ffi" -version = "1.112.4" +version = "1.112.5" description = "Deltachat FFI" edition = "2018" readme = "README.md" diff --git a/deltachat-jsonrpc/Cargo.toml b/deltachat-jsonrpc/Cargo.toml index 80ebe0b71..5a4504924 100644 --- a/deltachat-jsonrpc/Cargo.toml +++ b/deltachat-jsonrpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat-jsonrpc" -version = "1.112.4" +version = "1.112.5" description = "DeltaChat JSON-RPC API" edition = "2021" default-run = "deltachat-jsonrpc-server" diff --git a/deltachat-jsonrpc/typescript/package.json b/deltachat-jsonrpc/typescript/package.json index c75c62be3..5121a87e2 100644 --- a/deltachat-jsonrpc/typescript/package.json +++ b/deltachat-jsonrpc/typescript/package.json @@ -55,5 +55,5 @@ }, "type": "module", "types": "dist/deltachat.d.ts", - "version": "1.112.4" + "version": "1.112.5" } diff --git a/deltachat-repl/Cargo.toml b/deltachat-repl/Cargo.toml index 977136e26..226a0b4df 100644 --- a/deltachat-repl/Cargo.toml +++ b/deltachat-repl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat-repl" -version = "1.112.4" +version = "1.112.5" license = "MPL-2.0" edition = "2021" diff --git a/deltachat-rpc-server/Cargo.toml b/deltachat-rpc-server/Cargo.toml index c13ccea4d..c06856bbe 100644 --- a/deltachat-rpc-server/Cargo.toml +++ b/deltachat-rpc-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat-rpc-server" -version = "1.112.4" +version = "1.112.5" description = "DeltaChat JSON-RPC server" edition = "2021" readme = "README.md" diff --git a/package.json b/package.json index 71d20d605..a06a0c3f5 100644 --- a/package.json +++ b/package.json @@ -60,5 +60,5 @@ "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit" }, "types": "node/dist/index.d.ts", - "version": "1.112.4" + "version": "1.112.5" } diff --git a/src/imex.rs b/src/imex.rs index c9cf6cc68..62d97f8fc 100644 --- a/src/imex.rs +++ b/src/imex.rs @@ -397,8 +397,7 @@ async fn imex_inner( export_backup(context, path, passphrase.unwrap_or_default()).await } ImexMode::ImportBackup => { - import_backup(context, path, passphrase.unwrap_or_default()).await?; - context.sql.run_migrations(context).await + import_backup(context, path, passphrase.unwrap_or_default()).await } } } @@ -474,6 +473,7 @@ async fn import_backup( } } + context.sql.run_migrations(context).await?; delete_and_reset_all_device_msgs(context).await?; Ok(()) diff --git a/src/imex/transfer.rs b/src/imex/transfer.rs index 6156628a6..e2a257511 100644 --- a/src/imex/transfer.rs +++ b/src/imex/transfer.rs @@ -407,6 +407,7 @@ async fn get_backup_inner(context: &Context, qr: Qr) -> Result<()> { match transfer_from_provider(context, &ticket).await { Ok(()) => { + context.sql.run_migrations(context).await?; delete_and_reset_all_device_msgs(context).await?; context.emit_event(ReceiveProgress::Completed.into()); Ok(())