mirror of
https://github.com/isar/rusqlite.git
synced 2025-10-23 00:48:54 +08:00
Merge remote-tracking branch 'jgallagher/master' into from_handle
This commit is contained in:
@@ -90,7 +90,7 @@ use crate::error::{error_from_handle, error_from_sqlite_code};
|
||||
use crate::raw_statement::RawStatement;
|
||||
use crate::types::{ToSql, ValueRef};
|
||||
|
||||
pub use crate::statement::Statement;
|
||||
pub use crate::statement::{Statement, StatementStatus};
|
||||
|
||||
pub use crate::row::{AndThenRows, MappedRows, Row, RowIndex, Rows};
|
||||
|
||||
@@ -115,6 +115,7 @@ mod busy;
|
||||
mod cache;
|
||||
#[cfg(any(feature = "functions", feature = "vtab"))]
|
||||
mod context;
|
||||
#[macro_use]
|
||||
mod error;
|
||||
#[cfg(feature = "functions")]
|
||||
pub mod functions;
|
||||
@@ -126,6 +127,8 @@ pub mod limits;
|
||||
mod load_extension_guard;
|
||||
mod raw_statement;
|
||||
mod row;
|
||||
#[cfg(feature = "session")]
|
||||
pub mod session;
|
||||
mod statement;
|
||||
#[cfg(feature = "trace")]
|
||||
pub mod trace;
|
||||
@@ -193,7 +196,7 @@ pub enum DatabaseName<'a> {
|
||||
|
||||
// Currently DatabaseName is only used by the backup and blob mods, so hide
|
||||
// this (private) impl to avoid dead code warnings.
|
||||
#[cfg(any(feature = "backup", feature = "blob", feature = "bundled"))]
|
||||
#[cfg(any(feature = "backup", feature = "blob", feature = "session", feature = "bundled"))]
|
||||
impl<'a> DatabaseName<'a> {
|
||||
fn to_cstring(&self) -> Result<CString> {
|
||||
use self::DatabaseName::{Attached, Main, Temp};
|
||||
|
Reference in New Issue
Block a user