greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Run pragmas to configure SQLite store and connection when we open a DB, r=ncalexan (#275)

Browse source 
Signed-off-by: Victor Porof <victor.porof@gmail.com>
This commit is contained in:
Victor Porof 2017-02-09 21:23:04 +01:00 committed by GitHub
parent 42580539b8
commit 9be487ca7d
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
db/src/db.rs
View file

@ -11,6 +11,7 @@
#![allow(dead_code)] #![allow(dead_code)]
use std::iter::once; use std::iter::once;
use std::path::Path;
use itertools; use itertools;
use itertools::Itertools; use itertools::Itertools;
@ -27,8 +28,21 @@ use mentat_tx::entities as entmod;
use mentat_tx::entities::{Entity, OpType}; use mentat_tx::entities::{Entity, OpType};
use types::*; use types::*;
pub fn new_connection() -> rusqlite::Connection { pub fn new_connection<T>(uri: T) -> rusqlite::Result<rusqlite::Connection> where T: AsRef<Path> {
return rusqlite::Connection::open_in_memory().unwrap(); let conn = match uri.as_ref().to_string_lossy().len() {
0 => rusqlite::Connection::open_in_memory()?,
_ => rusqlite::Connection::open(uri)?,
};
conn.execute_batch("
PRAGMA page_size=32768;
PRAGMA journal_mode=wal;
PRAGMA wal_autocheckpoint=32;
PRAGMA journal_size_limit=3145728;
PRAGMA foreign_keys=ON;
")?;
Ok(conn)
} }
/// Version history: /// Version history:
@ -889,7 +903,7 @@ mod tests {
#[test] #[test]
fn test_add() { fn test_add() {
let mut conn = new_connection(); let mut conn = new_connection("").expect("Couldn't open in-memory db");
assert_eq!(ensure_current_version(&mut conn).unwrap(), CURRENT_VERSION); assert_eq!(ensure_current_version(&mut conn).unwrap(), CURRENT_VERSION);
let bootstrap_db = DB::new(bootstrap::bootstrap_partition_map(), bootstrap::bootstrap_schema()); let bootstrap_db = DB::new(bootstrap::bootstrap_partition_map(), bootstrap::bootstrap_schema());
@ -912,7 +926,7 @@ mod tests {
#[test] #[test]
fn test_retract() { fn test_retract() {
let mut conn = new_connection(); let mut conn = new_connection("").expect("Couldn't open in-memory db");
assert_eq!(ensure_current_version(&mut conn).unwrap(), CURRENT_VERSION); assert_eq!(ensure_current_version(&mut conn).unwrap(), CURRENT_VERSION);
let bootstrap_db = DB::new(bootstrap::bootstrap_partition_map(), bootstrap::bootstrap_schema()); let bootstrap_db = DB::new(bootstrap::bootstrap_partition_map(), bootstrap::bootstrap_schema());