From b19f85f9b5b271e733986feb1970d2d43a791303 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Tue, 6 Aug 2024 17:31:52 -0400 Subject: [PATCH] collab: Remove unused parameter to `run_database_migrations` (#15883) This PR removes the unused `ignore_checksum_mismatch` parameter to `run_database_migrations`. We were always passing `false`, which meant the behavior didn't need to be parameterized. Release Notes: - N/A --- crates/collab/src/db/tests.rs | 2 +- crates/collab/src/llm/db/tests.rs | 2 +- crates/collab/src/main.rs | 4 ++-- crates/collab/src/migrations.rs | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/collab/src/db/tests.rs b/crates/collab/src/db/tests.rs index c570e87aa680c73476243e17b18329cae6720cd3..c1976fd9c5031675160eae1eea9c74238cce6c4c 100644 --- a/crates/collab/src/db/tests.rs +++ b/crates/collab/src/db/tests.rs @@ -93,7 +93,7 @@ impl TestDb { .await .unwrap(); let migrations_path = concat!(env!("CARGO_MANIFEST_DIR"), "/migrations"); - run_database_migrations(db.options(), migrations_path, false) + run_database_migrations(db.options(), migrations_path) .await .unwrap(); db.initialize_notification_kinds().await.unwrap(); diff --git a/crates/collab/src/llm/db/tests.rs b/crates/collab/src/llm/db/tests.rs index 4fadc02cadc04ef6bdc46ed0fa96512d400bd3ae..d5f2c8e19c89752e8f235628df67be83f1328ab4 100644 --- a/crates/collab/src/llm/db/tests.rs +++ b/crates/collab/src/llm/db/tests.rs @@ -81,7 +81,7 @@ impl TestLlmDb { .await .unwrap(); let migrations_path = concat!(env!("CARGO_MANIFEST_DIR"), "/migrations_llm"); - run_database_migrations(db.options(), migrations_path, false) + run_database_migrations(db.options(), migrations_path) .await .unwrap(); db diff --git a/crates/collab/src/main.rs b/crates/collab/src/main.rs index ebf6f9bb2d9e226911a3b2fda70b9b4bd0e18ba3..f28d560613238a08ccbc3f6b8e777e6116922ec2 100644 --- a/crates/collab/src/main.rs +++ b/crates/collab/src/main.rs @@ -220,7 +220,7 @@ async fn setup_app_database(config: &Config) -> Result<()> { Path::new(default_migrations) }); - let migrations = run_database_migrations(db.options(), migrations_path, false).await?; + let migrations = run_database_migrations(db.options(), migrations_path).await?; for (migration, duration) in migrations { log::info!( "Migrated {} {} {:?}", @@ -265,7 +265,7 @@ async fn setup_llm_database(config: &Config) -> Result<()> { Path::new(default_migrations) }); - let migrations = run_database_migrations(db.options(), migrations_path, false).await?; + let migrations = run_database_migrations(db.options(), migrations_path).await?; for (migration, duration) in migrations { log::info!( "Migrated {} {} {:?}", diff --git a/crates/collab/src/migrations.rs b/crates/collab/src/migrations.rs index 8887a4fb3e30317fe08de2bd698a40b048fa2131..56200500cf602ce8d32e49b27418912679ffe048 100644 --- a/crates/collab/src/migrations.rs +++ b/crates/collab/src/migrations.rs @@ -11,7 +11,6 @@ use sqlx::Connection; pub async fn run_database_migrations( database_options: &ConnectOptions, migrations_path: impl AsRef, - ignore_checksum_mismatch: bool, ) -> Result> { let migrations = MigrationSource::resolve(migrations_path.as_ref()) .await @@ -31,7 +30,7 @@ pub async fn run_database_migrations( for migration in migrations { match applied_migrations.get(&migration.version) { Some(applied_migration) => { - if migration.checksum != applied_migration.checksum && !ignore_checksum_mismatch { + if migration.checksum != applied_migration.checksum { Err(anyhow!( "checksum mismatch for applied migration {}", migration.description