ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-11-01 22:38:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jgallagher/master' into 2018

Browse Source 
# Conflicts:
#	src/lib.rs
#	src/statement.rs
This commit is contained in:
gwenn
2018-11-05 20:04:04 +01:00
parent 1262238229 e25f39e739
commit bcaa929748
9 changed files with 10 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib.rs
View File

@@ -98,12 +98,8 @@ pub use crate::statement::Statement;
pub use crate::row::{AndThenRows, MappedRows, Row, RowIndex, Rows};
pub use crate::transaction::{DropBehavior, Savepoint, Transaction, TransactionBehavior};
#[allow(deprecated)]
pub use crate::transaction::{SqliteTransaction, SqliteTransactionBehavior};
pub use crate::error::Error;
#[allow(deprecated)]
pub use crate::error::SqliteError;
pub use crate::ffi::ErrorCode;
pub use crate::cache::CachedStatement;
@@ -112,8 +108,7 @@ pub use crate::version::*;
#[cfg(feature = "hooks")]
pub use crate::hooks::*;
#[cfg(feature = "load_extension")]
#[allow(deprecated)]
pub use crate::load_extension_guard::{LoadExtensionGuard, SqliteLoadExtensionGuard};
pub use crate::load_extension_guard::LoadExtensionGuard;
#[cfg(feature = "backup")]
pub mod backup;
@@ -147,11 +142,7 @@ pub mod vtab;
// Number of cached prepared statements we'll hold on to.
const STATEMENT_CACHE_DEFAULT_CAPACITY: usize = 16;
/// To be used when your statement has no [parameter](https://sqlite.org/lang_expr.html#varparam).
pub const NO_PARAMS: &'static [&'static ToSql] = &[];
/// Old name for `Result`. `SqliteResult` is deprecated.
#[deprecated(since = "0.6.0", note = "Use Result instead")]
pub type SqliteResult<T> = Result<T>;
pub const NO_PARAMS: &[&ToSql] = &[];
/// A typedef of the result returned by many methods.
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.
pub struct Connection {
db: RefCell<InnerConnection>,
@@ -631,10 +618,6 @@ struct InnerConnection {
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! {
#[doc = "Flags for opening SQLite database connections."]
#[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)]
mod test {
extern crate tempdir;