Show error dialog on migration failure

src-tauri/yaak-models/src/error.rs

@@ -20,6 +20,9 @@ pub enum Error {
 
     #[error("Model error: {0}")]
     GenericError(String),
+    
+    #[error("DB Migration Failed: {0}")]
+    MigrationError(String),
 
     #[error("No base environment for {0}")]
     MissingBaseEnvironment(String),

src-tauri/yaak-models/src/lib.rs

@@ -1,22 +1,24 @@
 use crate::commands::*;
+use crate::migrate::migrate_db;
 use crate::query_manager::QueryManager;
 use crate::util::ModelChangeEvent;
+use log::error;
 use r2d2::Pool;
 use r2d2_sqlite::SqliteConnectionManager;
 use std::fs::create_dir_all;
 use std::time::Duration;
 use tauri::async_runtime::Mutex;
 use tauri::plugin::TauriPlugin;
-use tauri::{generate_handler, Emitter, Manager, Runtime};
+use tauri::{Emitter, Manager, Runtime, generate_handler};
+use tauri_plugin_dialog::{DialogExt, MessageDialogKind};
 use tokio::sync::mpsc;
-use crate::migrate::must_migrate_db;
 
 mod commands;
 
 mod connection_or_tx;
-mod migrate;
 pub mod db_context;
 pub mod error;
+mod migrate;
 pub mod models;
 pub mod queries;
 pub mod query_manager;
@@ -57,7 +59,15 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
                 .build(manager)
                 .unwrap();
 
-            must_migrate_db(app_handle.app_handle(), &pool).expect("Failed to run migrations");
+            if let Err(e) = migrate_db(app_handle.app_handle(), &pool) {
+                error!("Failed to run database migration {e:?}");
+                app_handle
+                    .dialog()
+                    .message(e.to_string())
+                    .kind(MessageDialogKind::Error)
+                    .blocking_show();
+                return Err(Box::from(e.to_string()));
+            };
 
             app_handle.manage(SqliteConnection::new(pool.clone()));
 

src-tauri/yaak-models/src/migrate.rs

@@ -1,5 +1,6 @@
+use crate::error::Error::MigrationError;
 use crate::error::Result;
-use log::{error, info};
+use log::info;
 use r2d2::Pool;
 use r2d2_sqlite::SqliteConnectionManager;
 use rusqlite::{OptionalExtension, TransactionBehavior, params};
@@ -10,7 +11,7 @@ use std::result::Result as StdResult;
 use tauri::path::BaseDirectory;
 use tauri::{AppHandle, Manager, Runtime};
 
-pub(crate) fn must_migrate_db<R: Runtime>(
+pub(crate) fn migrate_db<R: Runtime>(
     app_handle: &AppHandle<R>,
     pool: &Pool<SqliteConnectionManager>,
 ) -> Result<()> {
@@ -54,9 +55,13 @@ pub(crate) fn must_migrate_db<R: Runtime>(
         match run_migration(entry.path().as_path(), &mut tx) {
             Ok(_) => tx.commit()?,
             Err(e) => {
-                error!("Failed to apply migration {:?} {e:?}", entry.path().file_name());
+                let msg = format!(
+                    "{} failed with {}",
+                    entry.path().file_name().unwrap().to_str().unwrap(),
+                    e.to_string()
+                );
                 tx.rollback()?;
-                return Err(e);
+                return Err(MigrationError(msg));
             }
         };
     }