Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-11-29 20:16:33 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix(asb): Allow history command to be run while asb is running (#82)

Browse source 
This applies the following PRs from upstream to our fork:
* fix(asb): Allow history command to be run while asb is running (#1724)
* Allow history command to be executed while asb is running by opening database in read-only mode (#1722)

---------

Co-authored-by: einliterflasche <einliterflasche@pm.me>
Co-authored-by: Einliterflasche <81313171+Einliterflasche@users.noreply.github.com>
This commit is contained in:
binarybaron 2024-09-17 17:32:21 +02:00 • committed by GitHub
parent 34c97c59d9
commit 5bb33fe35d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 51 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

19
swap/src/database/sqlite.rs
View file

@ -11,25 +11,30 @@ use std::str::FromStr;
use time::OffsetDateTime;
use uuid::Uuid;
use super::AccessMode;
pub struct SqliteDatabase {
pool: Pool<Sqlite>,
}
impl SqliteDatabase {
pub async fn open(path: impl AsRef<Path>) -> Result<Self>
pub async fn open(path: impl AsRef<Path>, access_mode: AccessMode) -> Result<Self>
where
Self: std::marker::Sized,
{
let read_only = matches!(access_mode, AccessMode::ReadOnly);
let path_str = format!("sqlite:{}", path.as_ref().display());
let mut options = SqliteConnectOptions::from_str(&path_str)?;
let mut options = SqliteConnectOptions::from_str(&path_str)?.read_only(read_only);
let options = options.disable_statement_logging();
options.disable_statement_logging();
let pool = SqlitePool::connect_with(options).await?;
let pool = SqlitePool::connect_with(options.to_owned()).await?;
let mut sqlite = Self { pool };
sqlite.run_migrations().await?;
if !read_only {
sqlite.run_migrations().await?;
}
Ok(sqlite)
}
@ -480,7 +485,7 @@ mod tests {
// file has to exist in order to connect with sqlite
File::create(temp_db.clone()).unwrap();
let db = SqliteDatabase::open(temp_db).await?;
let db = SqliteDatabase::open(temp_db, AccessMode::ReadWrite).await?;
Ok(db)
}