fix: do not apply migration conflict strategy when opening the sled s…

…tore more than once (whisperfish#228)
Schmiddiii · Jan 4, 2024 · dac9b35 · dac9b35
1 parent 0e536d5
commit dac9b35
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/presage-store-sled/src/lib.rs b/presage-store-sled/src/lib.rs
@@ -355,7 +355,7 @@ fn migrate(
         Ok(())
     };
 
-    if let Err(error) = run_migrations() {
+    if let Err(SledStoreError::MigrationConflict) = run_migrations() {
         match migration_conflict_strategy {
             MigrationConflictStrategy::BackupAndDrop => {
                 let mut new_db_path = db_path.to_path_buf();
@@ -373,7 +373,7 @@ fn migrate(
             MigrationConflictStrategy::Drop => {
                 fs_extra::dir::remove(db_path)?;
             }
-            MigrationConflictStrategy::Raise => return Err(error),
+            MigrationConflictStrategy::Raise => return Err(SledStoreError::MigrationConflict),
         }
     }