Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed and error message and properly initialized the DB

Browse source
This commit is contained in:
Mikayla Maki 2022-12-03 16:46:35 -08:00
parent 1ce0863158
commit 55eb0a3742
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/db/src/db.rs
View file

@ -24,14 +24,14 @@ use util::{async_iife, ResultExt};
use util::channel::ReleaseChannel; use util::channel::ReleaseChannel;
const CONNECTION_INITIALIZE_QUERY: &'static str = sql!( const CONNECTION_INITIALIZE_QUERY: &'static str = sql!(
PRAGMA synchronous=NORMAL;
PRAGMA busy_timeout=1;
PRAGMA foreign_keys=TRUE; PRAGMA foreign_keys=TRUE;
PRAGMA case_sensitive_like=TRUE;
); );
const DB_INITIALIZE_QUERY: &'static str = sql!( const DB_INITIALIZE_QUERY: &'static str = sql!(
PRAGMA journal_mode=WAL; PRAGMA journal_mode=WAL;
PRAGMA busy_timeout=1;
PRAGMA case_sensitive_like=TRUE;
PRAGMA synchronous=NORMAL;
); );
const FALLBACK_DB_NAME: &'static str = "FALLBACK_MEMORY_DB"; const FALLBACK_DB_NAME: &'static str = "FALLBACK_MEMORY_DB";
@ -293,6 +293,7 @@ mod tests {
assert!(corrupt_db.persistent()); assert!(corrupt_db.persistent());
} }
let good_db = open_db::<GoodDB>(tempdir.path(), &util::channel::ReleaseChannel::Dev).await; let good_db = open_db::<GoodDB>(tempdir.path(), &util::channel::ReleaseChannel::Dev).await;
assert!(good_db.select_row::<usize>("SELECT * FROM test2").unwrap()().unwrap().is_none()); assert!(good_db.select_row::<usize>("SELECT * FROM test2").unwrap()().unwrap().is_none());
@ -339,10 +340,12 @@ mod tests {
let tempdir = TempDir::new("DbTests").unwrap(); let tempdir = TempDir::new("DbTests").unwrap();
{ {
// Setup the bad database
let corrupt_db = open_db::<CorruptedDB>(tempdir.path(), &util::channel::ReleaseChannel::Dev).await; let corrupt_db = open_db::<CorruptedDB>(tempdir.path(), &util::channel::ReleaseChannel::Dev).await;
assert!(corrupt_db.persistent()); assert!(corrupt_db.persistent());
} }
// Try to connect to it a bunch of times at once
let mut guards = vec![]; let mut guards = vec![];
for _ in 0..10 { for _ in 0..10 {
let tmp_path = tempdir.path().to_path_buf(); let tmp_path = tempdir.path().to_path_buf();

2
crates/sqlez/src/thread_safe_connection.rs
View file

@ -168,7 +168,7 @@ impl<M: Migrator> ThreadSafeConnection<M> {
let result = connection.with_write(|connection| callback(connection)); let result = connection.with_write(|connection| callback(connection));
sender.send(result).ok(); sender.send(result).ok();
})); }));
reciever.map(|response| response.expect("Background writer thread unexpectedly closed")) reciever.map(|response| response.expect("Write queue unexpectedly closed"))
} }
pub(crate) fn create_connection( pub(crate) fn create_connection(