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

Fix module issue found when testing all-features.

Browse source
This commit is contained in:
Greg Burd 2020-01-23 11:14:27 -05:00
parent 9421a5c3bb
commit fcb3a9182f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/store.rs
View file

@ -27,7 +27,7 @@ use mentat_transaction::{
CacheAction, CacheDirection, InProgress, InProgressRead, Pullable, Queryable, CacheAction, CacheDirection, InProgress, InProgressRead, Pullable, Queryable,
}; };
use super::conn::Conn; use crate::conn::Conn;
use public_traits::errors::Result; use public_traits::errors::Result;
@ -37,7 +37,7 @@ use mentat_transaction::query::{PreparedResult, QueryExplanation, QueryInputs, Q
use mentat_tolstoy::{SyncFollowup, SyncReport, SyncResult}; use mentat_tolstoy::{SyncFollowup, SyncReport, SyncResult};
#[cfg(feature = "syncable")] #[cfg(feature = "syncable")]
use super::sync::Syncable; use crate::sync::Syncable;
/// A convenience wrapper around a single SQLite connection and a Conn. This is suitable /// A convenience wrapper around a single SQLite connection and a Conn. This is suitable
/// for applications that don't require complex connection management. /// for applications that don't require complex connection management.
@ -97,7 +97,7 @@ impl Store {
/// supplied. Fails unless linked against sqlcipher (or something else that /// supplied. Fails unless linked against sqlcipher (or something else that
/// supports the Sqlite Encryption Extension). /// supports the Sqlite Encryption Extension).
pub fn open_with_key(path: &str, encryption_key: &str) -> Result<Store> { pub fn open_with_key(path: &str, encryption_key: &str) -> Result<Store> {
let mut connection = ::new_connection_with_key(path, encryption_key)?; let mut connection = crate::new_connection_with_key(path, encryption_key)?;
let conn = Conn::connect(&mut connection)?; let conn = Conn::connect(&mut connection)?;
Ok(Store { Ok(Store {
conn: conn, conn: conn,
@ -109,7 +109,7 @@ impl Store {
/// rekey`). Fails unless linked against sqlcipher (or something else that supports the Sqlite /// rekey`). Fails unless linked against sqlcipher (or something else that supports the Sqlite
/// Encryption Extension). /// Encryption Extension).
pub fn change_encryption_key(&mut self, new_encryption_key: &str) -> Result<()> { pub fn change_encryption_key(&mut self, new_encryption_key: &str) -> Result<()> {
::change_encryption_key(&self.sqlite, new_encryption_key)?; crate::change_encryption_key(&self.sqlite, new_encryption_key)?;
Ok(()) Ok(())
} }
} }