Fix up DB creation and migration

src-tauri/src/analytics.rs

@@ -2,8 +2,7 @@ use std::fmt::Display;
 
 use log::{debug, info};
 use serde::{Deserialize, Serialize};
-use serde_json::json;
-use sqlx::types::JsonValue;
+use serde_json::{json, Value};
 use tauri::{AppHandle, Manager};
 
 use yaak_models::queries::{generate_id, get_key_value_int, get_key_value_string, set_key_value_int, set_key_value_string};
@@ -155,7 +154,7 @@ pub async fn track_event(
     app_handle: &AppHandle,
     resource: AnalyticsResource,
     action: AnalyticsAction,
-    attributes: Option<JsonValue>,
+    attributes: Option<Value>,
 ) {
     let id = get_id(app_handle).await;
     let event = format!("{}.{}", resource, action);

src-tauri/src/lib.rs

@@ -17,10 +17,6 @@ use fern::colors::ColoredLevelConfig;
 use log::{debug, error, info, warn};
 use rand::random;
 use serde_json::{json, Value};
-use sqlx::migrate::Migrator;
-use sqlx::sqlite::SqliteConnectOptions;
-use sqlx::{Pool, Sqlite, SqlitePool};
-use tauri::path::BaseDirectory;
 use tauri::Listener;
 #[cfg(target_os = "macos")]
 use tauri::TitleBarStyle;
@@ -76,19 +72,6 @@ mod window_menu;
 const DEFAULT_WINDOW_WIDTH: f64 = 1100.0;
 const DEFAULT_WINDOW_HEIGHT: f64 = 600.0;
 
-async fn migrate_db(app_handle: &AppHandle, pool: &Pool<Sqlite>) -> Result<(), String> {
-    let p = app_handle
-        .path()
-        .resolve("migrations", BaseDirectory::Resource)
-        .expect("failed to resolve resource");
-    info!("Running migrations at {}", p.to_string_lossy());
-    let mut m = Migrator::new(p).await.expect("Failed to load migrations");
-    m.set_ignore_missing(true); // So we can rollback versions and not crash
-    m.run(pool).await.expect("Failed to run migrations");
-    info!("Migrations complete!");
-    Ok(())
-}
-
 #[derive(serde::Serialize)]
 #[serde(default, rename_all = "camelCase")]
 struct AppMetaData {
@@ -1639,28 +1622,7 @@ pub fn run() {
     builder
         .setup(|app| {
             let app_data_dir = app.path().app_data_dir().unwrap();
-            let app_config_dir = app.path().app_config_dir().unwrap();
-            info!(
-                "App Config Dir: {}",
-                app_config_dir.as_path().to_string_lossy(),
-            );
-            info!("App Data Dir: {}", app_data_dir.as_path().to_string_lossy());
-            let app_data_dir = match is_dev() {
-                true => current_dir().unwrap(),
-                false => app_data_dir,
-            };
-
             create_dir_all(app_data_dir.clone()).expect("Problem creating App directory!");
-            let p = app_data_dir.join("db.sqlite");
-            File::options()
-                .write(true)
-                .create(true)
-                .open(&p)
-                .expect("Problem creating database file!");
-
-            let p_string = p.to_string_lossy().replace(' ', "%20");
-            let url = format!("sqlite://{}?mode=rwc", p_string);
-            info!("Connecting to database at {}", url);
 
             // Add updater
             let yaak_updater = YaakUpdater::new();
@@ -1678,20 +1640,6 @@ pub fn run() {
             let grpc_handle = GrpcHandle::new(&app.app_handle());
             app.manage(Mutex::new(grpc_handle));
 
-            // Add DB handle
-            tauri::async_runtime::block_on(async move {
-                let opts = SqliteConnectOptions::from_str(p.to_str().unwrap()).unwrap();
-                let pool = SqlitePool::connect_with(opts)
-                    .await
-                    .expect("Failed to connect to database");
-                migrate_db(app.handle(), &pool)
-                    .await
-                    .expect("Failed to migrate database");
-                let h = app.handle();
-                let _ = cancel_pending_responses(h).await;
-                let _ = cancel_pending_grpc_connections(h).await;
-            });
-
             Ok(())
         })
         .invoke_handler(tauri::generate_handler![
@@ -1774,6 +1722,13 @@ pub fn run() {
                         let info = analytics::track_launch_event(&h).await;
                         debug!("Launched Yaak {:?}", info);
                     });
+
+                    // Cancel pending requests
+                    let h = app_handle.clone();
+                    tauri::async_runtime::block_on(async move {
+                        let _ = cancel_pending_responses(&h).await;
+                        let _ = cancel_pending_grpc_connections(&h).await;
+                    });
                 }
                 RunEvent::WindowEvent {
                     event: WindowEvent::Focused(true),

src-tauri/src/notifications.rs

@@ -1,12 +1,12 @@
 use std::time::SystemTime;
 
+use crate::analytics::get_num_launches;
 use chrono::{DateTime, Duration, Utc};
 use log::debug;
 use reqwest::Method;
 use serde::{Deserialize, Serialize};
 use tauri::{AppHandle, Emitter};
 use yaak_models::queries::{get_key_value_raw, set_key_value_raw};
-use crate::analytics::get_num_launches;
 
 // Check for updates every hour
 const MAX_UPDATE_CHECK_SECONDS: u64 = 60 * 60;
@@ -19,7 +19,7 @@ pub struct YaakNotifier {
     last_check: SystemTime,
 }
 
-#[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(default, rename_all = "camelCase")]
 pub struct YaakNotification {
     timestamp: DateTime<Utc>,

src-tauri/src/render.rs

@@ -1,7 +1,5 @@
 use std::collections::HashMap;
-
-use sqlx::types::JsonValue;
-
+use serde_json::Value;
 use crate::template_fns::timestamp;
 use templates::parse_and_render;
 use yaak_models::models::{
@@ -41,9 +39,9 @@ pub fn render_request(r: &HttpRequest, w: &Workspace, e: Option<&Environment>) -
                 } else {
                     v.to_string()
                 };
-                (render(k, vars), JsonValue::from(v))
+                (render(k, vars), Value::from(v))
             })
-            .collect::<HashMap<String, JsonValue>>(),
+            .collect::<HashMap<String, Value>>(),
         authentication: r
             .authentication
             .iter()
@@ -53,9 +51,9 @@ pub fn render_request(r: &HttpRequest, w: &Workspace, e: Option<&Environment>) -
                 } else {
                     v.to_string()
                 };
-                (render(k, vars), JsonValue::from(v))
+                (render(k, vars), Value::from(v))
             })
-            .collect::<HashMap<String, JsonValue>>(),
+            .collect::<HashMap<String, Value>>(),
         ..r
     }
 }