mirror of
https://github.com/isar/rusqlite.git
synced 2024-11-26 19:41:37 +08:00
commit
d44203116a
@ -6,10 +6,6 @@ use std::str;
|
|||||||
use types::Type;
|
use types::Type;
|
||||||
use {errmsg_to_string, ffi};
|
use {errmsg_to_string, ffi};
|
||||||
|
|
||||||
/// Old name for `Error`. `SqliteError` is deprecated.
|
|
||||||
#[deprecated(since = "0.6.0", note = "Use Error instead")]
|
|
||||||
pub type SqliteError = Error;
|
|
||||||
|
|
||||||
/// Enum listing possible errors from rusqlite.
|
/// Enum listing possible errors from rusqlite.
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[allow(enum_variant_names)]
|
#[allow(enum_variant_names)]
|
||||||
|
31
src/lib.rs
31
src/lib.rs
@ -98,12 +98,8 @@ pub use statement::Statement;
|
|||||||
pub use row::{AndThenRows, MappedRows, Row, RowIndex, Rows};
|
pub use row::{AndThenRows, MappedRows, Row, RowIndex, Rows};
|
||||||
|
|
||||||
pub use transaction::{DropBehavior, Savepoint, Transaction, TransactionBehavior};
|
pub use transaction::{DropBehavior, Savepoint, Transaction, TransactionBehavior};
|
||||||
#[allow(deprecated)]
|
|
||||||
pub use transaction::{SqliteTransaction, SqliteTransactionBehavior};
|
|
||||||
|
|
||||||
pub use error::Error;
|
pub use error::Error;
|
||||||
#[allow(deprecated)]
|
|
||||||
pub use error::SqliteError;
|
|
||||||
pub use ffi::ErrorCode;
|
pub use ffi::ErrorCode;
|
||||||
|
|
||||||
pub use cache::CachedStatement;
|
pub use cache::CachedStatement;
|
||||||
@ -112,8 +108,7 @@ pub use version::*;
|
|||||||
#[cfg(feature = "hooks")]
|
#[cfg(feature = "hooks")]
|
||||||
pub use hooks::*;
|
pub use hooks::*;
|
||||||
#[cfg(feature = "load_extension")]
|
#[cfg(feature = "load_extension")]
|
||||||
#[allow(deprecated)]
|
pub use load_extension_guard::LoadExtensionGuard;
|
||||||
pub use load_extension_guard::{LoadExtensionGuard, SqliteLoadExtensionGuard};
|
|
||||||
|
|
||||||
#[cfg(feature = "backup")]
|
#[cfg(feature = "backup")]
|
||||||
pub mod backup;
|
pub mod backup;
|
||||||
@ -149,10 +144,6 @@ const STATEMENT_CACHE_DEFAULT_CAPACITY: usize = 16;
|
|||||||
/// To be used when your statement has no [parameter](https://sqlite.org/lang_expr.html#varparam).
|
/// To be used when your statement has no [parameter](https://sqlite.org/lang_expr.html#varparam).
|
||||||
pub const NO_PARAMS: &[&ToSql] = &[];
|
pub const NO_PARAMS: &[&ToSql] = &[];
|
||||||
|
|
||||||
/// Old name for `Result`. `SqliteResult` is deprecated.
|
|
||||||
#[deprecated(since = "0.6.0", note = "Use Result instead")]
|
|
||||||
pub type SqliteResult<T> = Result<T>;
|
|
||||||
|
|
||||||
/// A typedef of the result returned by many methods.
|
/// A typedef of the result returned by many methods.
|
||||||
pub type Result<T> = result::Result<T, Error>;
|
pub type Result<T> = result::Result<T, Error>;
|
||||||
|
|
||||||
@ -197,10 +188,6 @@ impl<'a> DatabaseName<'a> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Old name for `Connection`. `SqliteConnection` is deprecated.
|
|
||||||
#[deprecated(since = "0.6.0", note = "Use Connection instead")]
|
|
||||||
pub type SqliteConnection = Connection;
|
|
||||||
|
|
||||||
/// A connection to a SQLite database.
|
/// A connection to a SQLite database.
|
||||||
pub struct Connection {
|
pub struct Connection {
|
||||||
db: RefCell<InnerConnection>,
|
db: RefCell<InnerConnection>,
|
||||||
@ -631,10 +618,6 @@ struct InnerConnection {
|
|||||||
free_update_hook: Option<fn(*mut ::std::os::raw::c_void)>,
|
free_update_hook: Option<fn(*mut ::std::os::raw::c_void)>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Old name for `OpenFlags`. `SqliteOpenFlags` is deprecated.
|
|
||||||
#[deprecated(since = "0.6.0", note = "Use OpenFlags instead")]
|
|
||||||
pub type SqliteOpenFlags = OpenFlags;
|
|
||||||
|
|
||||||
bitflags! {
|
bitflags! {
|
||||||
#[doc = "Flags for opening SQLite database connections."]
|
#[doc = "Flags for opening SQLite database connections."]
|
||||||
#[doc = "See [sqlite3_open_v2](http://www.sqlite.org/c3ref/open.html) for details."]
|
#[doc = "See [sqlite3_open_v2](http://www.sqlite.org/c3ref/open.html) for details."]
|
||||||
@ -1070,18 +1053,6 @@ impl Drop for InnerConnection {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Old name for `Statement`. `SqliteStatement` is deprecated.
|
|
||||||
#[deprecated(since = "0.6.0", note = "Use Statement instead")]
|
|
||||||
pub type SqliteStatement<'conn> = Statement<'conn>;
|
|
||||||
|
|
||||||
/// Old name for `Rows`. `SqliteRows` is deprecated.
|
|
||||||
#[deprecated(since = "0.6.0", note = "Use Rows instead")]
|
|
||||||
pub type SqliteRows<'stmt> = Rows<'stmt>;
|
|
||||||
|
|
||||||
/// Old name for `Row`. `SqliteRow` is deprecated.
|
|
||||||
#[deprecated(since = "0.6.0", note = "Use Row instead")]
|
|
||||||
pub type SqliteRow<'a, 'stmt> = Row<'a, 'stmt>;
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
extern crate tempdir;
|
extern crate tempdir;
|
||||||
|
@ -1,9 +1,5 @@
|
|||||||
use {Connection, Result};
|
use {Connection, Result};
|
||||||
|
|
||||||
/// Old name for `LoadExtensionGuard`. `SqliteLoadExtensionGuard` is deprecated.
|
|
||||||
#[deprecated(since = "0.6.0", note = "Use LoadExtensionGuard instead")]
|
|
||||||
pub type SqliteLoadExtensionGuard<'conn> = LoadExtensionGuard<'conn>;
|
|
||||||
|
|
||||||
/// RAII guard temporarily enabling SQLite extensions to be loaded.
|
/// RAII guard temporarily enabling SQLite extensions to be loaded.
|
||||||
///
|
///
|
||||||
/// ## Example
|
/// ## Example
|
||||||
|
@ -1,11 +1,6 @@
|
|||||||
use std::ops::Deref;
|
use std::ops::Deref;
|
||||||
use {Connection, Result};
|
use {Connection, Result};
|
||||||
|
|
||||||
/// Old name for `TransactionBehavior`. `SqliteTransactionBehavior` is
|
|
||||||
/// deprecated.
|
|
||||||
#[deprecated(since = "0.6.0", note = "Use TransactionBehavior instead")]
|
|
||||||
pub type SqliteTransactionBehavior = TransactionBehavior;
|
|
||||||
|
|
||||||
/// Options for transaction behavior. See [BEGIN
|
/// Options for transaction behavior. See [BEGIN
|
||||||
/// TRANSACTION](http://www.sqlite.org/lang_transaction.html) for details.
|
/// TRANSACTION](http://www.sqlite.org/lang_transaction.html) for details.
|
||||||
#[derive(Copy, Clone)]
|
#[derive(Copy, Clone)]
|
||||||
@ -32,10 +27,6 @@ pub enum DropBehavior {
|
|||||||
Panic,
|
Panic,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Old name for `Transaction`. `SqliteTransaction` is deprecated.
|
|
||||||
#[deprecated(since = "0.6.0", note = "Use Transaction instead")]
|
|
||||||
pub type SqliteTransaction<'conn> = Transaction<'conn>;
|
|
||||||
|
|
||||||
/// Represents a transaction on a database connection.
|
/// Represents a transaction on a database connection.
|
||||||
///
|
///
|
||||||
/// ## Note
|
/// ## Note
|
||||||
|
Loading…
Reference in New Issue
Block a user