Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

Simplify sqlite
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details

Browse source
This commit is contained in:
Alex 2022-06-07 18:26:28 +02:00
parent cc4f1aca97
commit 48928d2d70
Signed by: lx
GPG key ID: 0E496D15096376BE
1 changed files with 12 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/db/sqlite_adapter.rs
View file

@ -154,22 +154,12 @@ impl IDb for SqliteDb {
let tree = this.get_tree(tree)?; let tree = this.get_tree(tree)?;
let old_val = this.internal_get(tree, key)?; let old_val = this.internal_get(tree, key)?;
match &old_val { let sql = match &old_val {
Some(_) => { Some(_) => format!("UPDATE {} SET v = ?2 WHERE k = ?1", tree),
let n = this.db.execute( None => format!("INSERT INTO {} (k, v) VALUES (?1, ?2)", tree),
&format!("UPDATE {} SET v = ?2 WHERE k = ?1", tree), };
params![key, value], let n = this.db.execute(&sql, params![key, value])?;
)?; assert_eq!(n, 1);
assert_eq!(n, 1);
}
None => {
let n = this.db.execute(
&format!("INSERT INTO {} (k, v) VALUES (?1, ?2)", tree),
params![key, value],
)?;
assert_eq!(n, 1);
}
}
Ok(old_val) Ok(old_val)
} }
@ -343,22 +333,12 @@ impl<'a> ITx for SqliteTx<'a> {
let tree = self.get_tree(tree)?; let tree = self.get_tree(tree)?;
let old_val = self.internal_get(tree, key)?; let old_val = self.internal_get(tree, key)?;
match &old_val { let sql = match &old_val {
Some(_) => { Some(_) => format!("UPDATE {} SET v = ?2 WHERE k = ?1", tree),
let n = self.tx.execute( None => format!("INSERT INTO {} (k, v) VALUES (?1, ?2)", tree),
&format!("UPDATE {} SET v = ?2 WHERE k = ?1", tree), };
params![key, value], let n = self.tx.execute(&sql, params![key, value])?;
)?; assert_eq!(n, 1);
assert_eq!(n, 1);
}
None => {
let n = self.tx.execute(
&format!("INSERT INTO {} (k, v) VALUES (?1, ?2)", tree),
params![key, value],
)?;
assert_eq!(n, 1);
}
}
Ok(old_val) Ok(old_val)
} }