Skip to content

admin/migrate: Simplify HarnessWithOutput creation #9933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 14, 2024
Merged

admin/migrate: Simplify HarnessWithOutput creation #9933

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15d780d
admin/migrate: Simplify `HarnessWithOutput` creation
Turbo87 Nov 14, 2024
3aae025
admin/migrate: Inline `harness` variable
Turbo87 Nov 14, 2024
5ad54e9
admin/migrate: Improve migration error handling
Turbo87 Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/bin/crates-admin/migrate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,10 @@ pub async fn run(_opts: Opts) -> Result<(), Error> {

spawn_blocking(move || {
info!("Migrating the database");
let mut stdout = std::io::stdout();
let mut harness = HarnessWithOutput::new(&mut conn, &mut stdout);
harness
HarnessWithOutput::write_to_stdout(&mut conn)
.run_pending_migrations(MIGRATIONS)
.map_err(|err| anyhow!("Failed to run migrations: {err}"))?;
.map_err(|e| anyhow!(e))
.context("Failed to run migrations")?;

info!("Synchronizing crate categories");
crates_io::boot::categories::sync_with_connection(CATEGORIES_TOML, &mut conn)?;
Expand Down