Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

collab: Remove unused parameter to run_database_migrations (#15883)

Browse source 
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
This commit is contained in:
Marshall Bowers 2024-08-06 17:31:52 -04:00 • committed by GitHub
parent 7f6d0919c9
commit b19f85f9b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/collab/src/db/tests.rs
View file

@ -93,7 +93,7 @@ impl TestDb {
.await .await
.unwrap(); .unwrap();
let migrations_path = concat!(env!("CARGO_MANIFEST_DIR"), "/migrations"); 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 .await
.unwrap(); .unwrap();
db.initialize_notification_kinds().await.unwrap(); db.initialize_notification_kinds().await.unwrap();

2
crates/collab/src/llm/db/tests.rs
View file

@ -81,7 +81,7 @@ impl TestLlmDb {
.await .await
.unwrap(); .unwrap();
let migrations_path = concat!(env!("CARGO_MANIFEST_DIR"), "/migrations_llm"); 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 .await
.unwrap(); .unwrap();
db db

4
crates/collab/src/main.rs
View file

@ -220,7 +220,7 @@ async fn setup_app_database(config: &Config) -> Result<()> {
Path::new(default_migrations) 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 { for (migration, duration) in migrations {
log::info!( log::info!(
"Migrated {} {} {:?}", "Migrated {} {} {:?}",
@ -265,7 +265,7 @@ async fn setup_llm_database(config: &Config) -> Result<()> {
Path::new(default_migrations) 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 { for (migration, duration) in migrations {
log::info!( log::info!(
"Migrated {} {} {:?}", "Migrated {} {} {:?}",

3
crates/collab/src/migrations.rs
View file

@ -11,7 +11,6 @@ use sqlx::Connection;
pub async fn run_database_migrations( pub async fn run_database_migrations(
database_options: &ConnectOptions, database_options: &ConnectOptions,
migrations_path: impl AsRef<Path>, migrations_path: impl AsRef<Path>,
ignore_checksum_mismatch: bool,
) -> Result<Vec<(Migration, Duration)>> { ) -> Result<Vec<(Migration, Duration)>> {
let migrations = MigrationSource::resolve(migrations_path.as_ref()) let migrations = MigrationSource::resolve(migrations_path.as_ref())
.await .await
@ -31,7 +30,7 @@ pub async fn run_database_migrations(
for migration in migrations { for migration in migrations {
match applied_migrations.get(&migration.version) { match applied_migrations.get(&migration.version) {
Some(applied_migration) => { Some(applied_migration) => {
if migration.checksum != applied_migration.checksum && !ignore_checksum_mismatch { if migration.checksum != applied_migration.checksum {
Err(anyhow!( Err(anyhow!(
"checksum mismatch for applied migration {}", "checksum mismatch for applied migration {}",
migration.description migration.description