langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix implicit transaction not being cleared on transact() failure

Browse Source 
"release foo" clears the implicit outer transaction, but "rollback to foo"
does not.
This commit is contained in:
Damien Elmes 2022-05-05 13:39:41 +10:00
parent 1297beff63
commit ac1cbaf719
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rslib/src/collection/transact.rs
View File

@ -10,6 +10,7 @@ impl Collection {
{ {
let have_op = op.is_some(); let have_op = op.is_some();
let skip_undo_queue = op == Some(Op::SkipUndo); let skip_undo_queue = op == Some(Op::SkipUndo);
let autocommit = self.storage.db.is_autocommit();
self.storage.begin_rust_trx()?; self.storage.begin_rust_trx()?;
self.begin_undoable_operation(op); self.begin_undoable_operation(op);
@ -43,7 +44,11 @@ impl Collection {
// roll back on error // roll back on error
.or_else(|err| { .or_else(|err| {
self.discard_undo_and_study_queues(); self.discard_undo_and_study_queues();
if autocommit {
self.storage.rollback_trx()?;
} else {
self.storage.rollback_rust_trx()?; self.storage.rollback_rust_trx()?;
}
Err(err) Err(err)
}) })
} }