talexander/foil
1
0
Fork 0
Code Issues Pull Requests Releases Activity

move transaction handling to rust code

Browse Source
This commit is contained in:
Tom Alexander 2019-05-26 00:09:56 -04:00
parent 2248cdeaad
commit 523a3f6ec4
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/db.rs
View File

@ -13,8 +13,10 @@ impl DbHandle {
.as_ref() .as_ref()
.map(|path: &String| PathBuf::from(path)) .map(|path: &String| PathBuf::from(path))
.unwrap_or_else(|| dirs::home_dir().unwrap().join(".foil").to_path_buf()); .unwrap_or_else(|| dirs::home_dir().unwrap().join(".foil").to_path_buf());
let conn: Connection = Connection::open(path).unwrap(); let mut conn: Connection = Connection::open(path).unwrap();
conn.execute_batch(DB_INIT_QUERY).unwrap(); let tx = conn.transaction().unwrap();
tx.execute_batch(DB_INIT_QUERY).unwrap();
tx.commit();
DbHandle { conn: conn } DbHandle { conn: conn }
} }
} }

4
src/init.sql
View File

@ -1,5 +1,3 @@
BEGIN TRANSACTION;
CREATE TABLE IF NOT EXISTS encrypted_values ( CREATE TABLE IF NOT EXISTS encrypted_values (
id INTEGER PRIMARY KEY AUTOINCREMENT, id INTEGER PRIMARY KEY AUTOINCREMENT,
iv TEXT, iv TEXT,
@ -23,5 +21,3 @@ CREATE TABLE IF NOT EXISTS accounts(
user INTEGER NOT NULL, user INTEGER NOT NULL,
password INTEGER NOT NULL password INTEGER NOT NULL
); );
END TRANSACTION;