diff --git a/Changelog.md b/Changelog.md index b593e07..00f2b20 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,9 @@ # Version UPCOMING (TBD) +* BREAKING CHANGE: `SqliteTransactionDeferred`, `SqliteTransactionImmediate`, and + `SqliteTransactionExclusive` are no longer exported. Instead, use + `TransactionBehavior::Deferred`, `TransactionBehavior::Immediate`, and + `TransactionBehavior::Exclusive`. * Removed `Sqlite` prefix on many types: * `SqliteConnection` is now `Connection` * `SqliteError` is now `Error` diff --git a/src/lib.rs b/src/lib.rs index 666342d..67fc19f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -74,9 +74,7 @@ use libc::{c_int, c_void, c_char}; use types::{ToSql, FromSql}; -pub use transaction::{SqliteTransaction, Transaction}; -pub use transaction::{TransactionBehavior, TransactionDeferred, - TransactionImmediate, TransactionExclusive}; +pub use transaction::{SqliteTransaction, Transaction, TransactionBehavior}; #[cfg(feature = "load_extension")] pub use load_extension_guard::{SqliteLoadExtensionGuard, LoadExtensionGuard}; @@ -286,7 +284,7 @@ impl Connection { /// /// Will return `Err` if the underlying SQLite call fails. pub fn transaction<'a>(&'a self) -> Result> { - Transaction::new(self, TransactionDeferred) + Transaction::new(self, TransactionBehavior::Deferred) } /// Begin a new transaction with a specified behavior. diff --git a/src/transaction.rs b/src/transaction.rs index 2ed671f..3adbdb2 100644 --- a/src/transaction.rs +++ b/src/transaction.rs @@ -1,7 +1,5 @@ use {Result, Connection}; -pub use TransactionBehavior::{TransactionDeferred, TransactionImmediate, TransactionExclusive}; - /// Old name for `TransactionBehavior`. `SqliteTransactionBehavior` is deprecated. pub type SqliteTransactionBehavior = TransactionBehavior; @@ -9,9 +7,9 @@ pub type SqliteTransactionBehavior = TransactionBehavior; /// TRANSACTION](http://www.sqlite.org/lang_transaction.html) for details. #[derive(Copy,Clone)] pub enum TransactionBehavior { - TransactionDeferred, - TransactionImmediate, - TransactionExclusive, + Deferred, + Immediate, + Exclusive, } /// Old name for `Transaction`. `SqliteTransaction` is deprecated. @@ -53,9 +51,9 @@ impl<'conn> Transaction<'conn> { behavior: TransactionBehavior) -> Result { let query = match behavior { - TransactionDeferred => "BEGIN DEFERRED", - TransactionImmediate => "BEGIN IMMEDIATE", - TransactionExclusive => "BEGIN EXCLUSIVE", + TransactionBehavior::Deferred => "BEGIN DEFERRED", + TransactionBehavior::Immediate => "BEGIN IMMEDIATE", + TransactionBehavior::Exclusive => "BEGIN EXCLUSIVE", }; conn.execute_batch(query).map(|_| { Transaction {