From 1891c39a5fd13b65ba3566a3d9ffdb2d8f0f257a Mon Sep 17 00:00:00 2001 From: Mike Seddon Date: Wed, 17 Jul 2024 17:05:47 +1000 Subject: [PATCH 1/3] Allow setting default connection transaction behavior --- src/lib.rs | 5 +++++ src/transaction.rs | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 0f7eb16..3f5c862 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -377,6 +377,7 @@ impl DatabaseName<'_> { pub struct Connection { db: RefCell, cache: StatementCache, + transaction_behavior: TransactionBehavior } unsafe impl Send for Connection {} @@ -473,6 +474,7 @@ impl Connection { InnerConnection::open_with_flags(&c_path, flags, None).map(|db| Connection { db: RefCell::new(db), cache: StatementCache::with_capacity(STATEMENT_CACHE_DEFAULT_CAPACITY), + transaction_behavior: TransactionBehavior::Deferred }) } @@ -497,6 +499,7 @@ impl Connection { InnerConnection::open_with_flags(&c_path, flags, Some(&c_vfs)).map(|db| Connection { db: RefCell::new(db), cache: StatementCache::with_capacity(STATEMENT_CACHE_DEFAULT_CAPACITY), + transaction_behavior: TransactionBehavior::Deferred }) } @@ -949,6 +952,7 @@ impl Connection { Ok(Connection { db: RefCell::new(db), cache: StatementCache::with_capacity(STATEMENT_CACHE_DEFAULT_CAPACITY), + transaction_behavior: TransactionBehavior::Deferred }) } @@ -997,6 +1001,7 @@ impl Connection { Ok(Connection { db: RefCell::new(db), cache: StatementCache::with_capacity(STATEMENT_CACHE_DEFAULT_CAPACITY), + transaction_behavior: TransactionBehavior::Deferred }) } diff --git a/src/transaction.rs b/src/transaction.rs index 218d026..40e51d9 100644 --- a/src/transaction.rs +++ b/src/transaction.rs @@ -1,10 +1,18 @@ use crate::{Connection, Result}; use std::ops::Deref; +impl Connection { + /// Set the default transaction behavior for the connection. + pub fn set_transaction_behavior(&mut self, behavior: TransactionBehavior) { + self.transaction_behavior = behavior; + } +} + /// Options for transaction behavior. See [BEGIN /// TRANSACTION](http://www.sqlite.org/lang_transaction.html) for details. #[derive(Copy, Clone)] #[non_exhaustive] + pub enum TransactionBehavior { /// DEFERRED means that the transaction does not actually start until the /// database is first accessed. @@ -414,7 +422,7 @@ impl Connection { /// Will return `Err` if the underlying SQLite call fails. #[inline] pub fn transaction(&mut self) -> Result> { - Transaction::new(self, TransactionBehavior::Deferred) + Transaction::new(self, self.transaction_behavior) } /// Begin a new transaction with a specified behavior. From 0d948205add3ca17f0ee4d9de70627cf117c8503 Mon Sep 17 00:00:00 2001 From: Mike Seddon Date: Thu, 18 Jul 2024 07:24:34 +1000 Subject: [PATCH 2/3] refactor to add examples and address comments --- src/transaction.rs | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/src/transaction.rs b/src/transaction.rs index 40e51d9..07e3fe8 100644 --- a/src/transaction.rs +++ b/src/transaction.rs @@ -1,18 +1,10 @@ use crate::{Connection, Result}; use std::ops::Deref; -impl Connection { - /// Set the default transaction behavior for the connection. - pub fn set_transaction_behavior(&mut self, behavior: TransactionBehavior) { - self.transaction_behavior = behavior; - } -} - /// Options for transaction behavior. See [BEGIN /// TRANSACTION](http://www.sqlite.org/lang_transaction.html) for details. #[derive(Copy, Clone)] #[non_exhaustive] - pub enum TransactionBehavior { /// DEFERRED means that the transaction does not actually start until the /// database is first accessed. @@ -472,7 +464,7 @@ impl Connection { /// Will return `Err` if the underlying SQLite call fails. The specific /// error returned if transactions are nested is currently unspecified. pub fn unchecked_transaction(&self) -> Result> { - Transaction::new_unchecked(self, TransactionBehavior::Deferred) + Transaction::new_unchecked(self, self.transaction_behavior) } /// Begin a new savepoint with the default behavior (DEFERRED). @@ -526,6 +518,34 @@ impl Connection { ) -> Result { self.db.borrow().txn_state(db_name) } + + /// Set the default transaction behavior for the connection. + /// + /// ## Note + /// + /// This will only apply to transactions initiated by [`transaction`](Connection::transaction) + /// or [`unchecked_transaction`](Connection::unchecked_transaction). + /// + /// ## Example + /// + /// ```rust,no_run + /// # use rusqlite::{Connection, Result, TransactionBehavior}; + /// # fn do_queries_part_1(_conn: &Connection) -> Result<()> { Ok(()) } + /// # fn do_queries_part_2(_conn: &Connection) -> Result<()> { Ok(()) } + /// fn perform_queries(conn: &mut Connection) -> Result<()> { + /// conn.set_transaction_behavior(TransactionBehavior::Immediate); + /// + /// let tx = conn.transaction()?; + /// + /// do_queries_part_1(&tx)?; // tx causes rollback if this fails + /// do_queries_part_2(&tx)?; // tx causes rollback if this fails + /// + /// tx.commit() + /// } + /// ``` + pub fn set_transaction_behavior(&mut self, behavior: TransactionBehavior) { + self.transaction_behavior = behavior; + } } #[cfg(test)] From 484e01badac23e444e29d02579f50f7d87f59f81 Mon Sep 17 00:00:00 2001 From: Mike Seddon Date: Fri, 19 Jul 2024 08:02:55 +1000 Subject: [PATCH 3/3] cargofmt --- src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 3f5c862..f1d830a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -377,7 +377,7 @@ impl DatabaseName<'_> { pub struct Connection { db: RefCell, cache: StatementCache, - transaction_behavior: TransactionBehavior + transaction_behavior: TransactionBehavior, } unsafe impl Send for Connection {} @@ -474,7 +474,7 @@ impl Connection { InnerConnection::open_with_flags(&c_path, flags, None).map(|db| Connection { db: RefCell::new(db), cache: StatementCache::with_capacity(STATEMENT_CACHE_DEFAULT_CAPACITY), - transaction_behavior: TransactionBehavior::Deferred + transaction_behavior: TransactionBehavior::Deferred, }) } @@ -499,7 +499,7 @@ impl Connection { InnerConnection::open_with_flags(&c_path, flags, Some(&c_vfs)).map(|db| Connection { db: RefCell::new(db), cache: StatementCache::with_capacity(STATEMENT_CACHE_DEFAULT_CAPACITY), - transaction_behavior: TransactionBehavior::Deferred + transaction_behavior: TransactionBehavior::Deferred, }) } @@ -952,7 +952,7 @@ impl Connection { Ok(Connection { db: RefCell::new(db), cache: StatementCache::with_capacity(STATEMENT_CACHE_DEFAULT_CAPACITY), - transaction_behavior: TransactionBehavior::Deferred + transaction_behavior: TransactionBehavior::Deferred, }) } @@ -1001,7 +1001,7 @@ impl Connection { Ok(Connection { db: RefCell::new(db), cache: StatementCache::with_capacity(STATEMENT_CACHE_DEFAULT_CAPACITY), - transaction_behavior: TransactionBehavior::Deferred + transaction_behavior: TransactionBehavior::Deferred, }) }