ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-11-26 11:31:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make rollback take (&mut self) instead of (self)

Browse Source
This commit is contained in:
John Gallagher 2016-05-18 14:25:57 -05:00
parent e695ed8f03
commit 678b301494
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/transaction.rs
View File

@ -138,13 +138,8 @@ impl<'conn> Transaction<'conn> {
self.conn.execute_batch(&sql) self.conn.execute_batch(&sql)
} }
/// A convenience method which consumes and rolls back a transaction. /// A convenience method which rolls back a transaction.
pub fn rollback(mut self) -> Result<()> { pub fn rollback(&mut self) -> Result<()> {
self.rollback_()
}
fn rollback_(&mut self) -> Result<()> {
self.finished = true;
let sql = if self.depth == 0 { let sql = if self.depth == 0 {
Cow::Borrowed("ROLLBACK") Cow::Borrowed("ROLLBACK")
} else { } else {
@ -166,7 +161,7 @@ impl<'conn> Transaction<'conn> {
match (self.finished, self.commit) { match (self.finished, self.commit) {
(true, _) => Ok(()), (true, _) => Ok(()),
(false, true) => self.commit_(), (false, true) => self.commit_(),
(false, false) => self.rollback_(), (false, false) => self.rollback(),
} }
} }
} }
@ -221,18 +216,24 @@ mod test {
fn test_explicit_rollback_commit() { fn test_explicit_rollback_commit() {
let mut db = checked_memory_handle(); let mut db = checked_memory_handle();
{ {
let tx = db.transaction().unwrap(); let mut tx = db.transaction().unwrap();
tx.execute_batch("INSERT INTO foo VALUES(1)").unwrap(); {
tx.rollback().unwrap(); let mut sp = tx.savepoint().unwrap();
} sp.execute_batch("INSERT INTO foo VALUES(1)").unwrap();
{ sp.rollback().unwrap();
let tx = db.transaction().unwrap(); sp.execute_batch("INSERT INTO foo VALUES(2)").unwrap();
tx.execute_batch("INSERT INTO foo VALUES(2)").unwrap(); sp.commit().unwrap();
}
tx.commit().unwrap(); tx.commit().unwrap();
} }
{ {
let tx = db.transaction().unwrap(); let tx = db.transaction().unwrap();
assert_eq!(2i32, tx.execute_batch("INSERT INTO foo VALUES(4)").unwrap();
tx.commit().unwrap();
}
{
let tx = db.transaction().unwrap();
assert_eq!(6i32,
tx.query_row("SELECT SUM(x) FROM foo", &[], |r| r.get(0)).unwrap()); tx.query_row("SELECT SUM(x) FROM foo", &[], |r| r.get(0)).unwrap());
} }
} }