starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-23 09:08:32 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix DB connection on Windows

Browse Source
This commit is contained in:
Gregory Schier
2025-01-17 14:02:03 -08:00
parent 07ff709429
commit 153a40cfb1
3 changed files with 3445 additions and 4750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@@ -15808,7 +15808,7 @@
}, },
"packages/plugin-runtime-types": { "packages/plugin-runtime-types": {
"name": "@yaakapp/api", "name": "@yaakapp/api",
"version": "0.2.25", "version": "0.2.27",
"dependencies": { "dependencies": {
"@types/node": "^22.5.4" "@types/node": "^22.5.4"
}, },

8176
src-tauri/gen/schemas/windows-schema.json generated
View File

File diff suppressed because it is too large Load Diff

17
src-tauri/yaak-models/src/plugin.rs
View File

@@ -4,14 +4,15 @@ use r2d2_sqlite::SqliteConnectionManager;
use serde::Deserialize; use serde::Deserialize;
use sqlx::migrate::Migrator; use sqlx::migrate::Migrator;
use sqlx::sqlite::SqliteConnectOptions; use sqlx::sqlite::SqliteConnectOptions;
use sqlx::{ConnectOptions, SqlitePool}; use sqlx::SqlitePool;
use std::fs::create_dir_all; use std::fs::create_dir_all;
use std::path::PathBuf; use std::path::PathBuf;
use std::str::FromStr;
use std::time::Duration; use std::time::Duration;
use tauri::async_runtime::Mutex; use tauri::async_runtime::Mutex;
use tauri::path::BaseDirectory; use tauri::path::BaseDirectory;
use tauri::plugin::TauriPlugin; use tauri::plugin::TauriPlugin;
use tauri::{plugin, AppHandle, Manager, Runtime, Url}; use tauri::{plugin, AppHandle, Manager, Runtime};
pub struct SqliteConnection(pub Mutex<Pool<SqliteConnectionManager>>); pub struct SqliteConnection(pub Mutex<Pool<SqliteConnectionManager>>);
@@ -61,16 +62,10 @@ impl Builder {
} }
} }
fn db_connection_url(sqlite_file_path: &PathBuf) -> Url {
let p_string = sqlite_file_path.to_string_lossy().replace(' ', "%20");
let url = format!("sqlite://{}?mode=rwc", p_string);
Url::parse(&url).unwrap()
}
async fn must_migrate_db<R: Runtime>(app_handle: &AppHandle<R>, sqlite_file_path: &PathBuf) { async fn must_migrate_db<R: Runtime>(app_handle: &AppHandle<R>, sqlite_file_path: &PathBuf) {
let url = db_connection_url(sqlite_file_path); info!("Connecting to database at {sqlite_file_path:?}");
info!("Connecting to database at {}", url); let sqlite_file_path = sqlite_file_path.to_str().unwrap().to_string();
let opts = SqliteConnectOptions::from_url(&url).unwrap(); let opts = SqliteConnectOptions::from_str(&sqlite_file_path).unwrap();
let pool = SqlitePool::connect_with(opts).await.expect("Failed to connect to database"); let pool = SqlitePool::connect_with(opts).await.expect("Failed to connect to database");
let p = app_handle let p = app_handle
.path() .path()