mirror of
https://github.com/isar/rusqlite.git
synced 2024-11-26 19:41:37 +08:00
parent
e7bb33a99c
commit
1985e78fa6
@ -203,8 +203,8 @@ impl Backup<'_, '_> {
|
|||||||
to: &'b mut Connection,
|
to: &'b mut Connection,
|
||||||
to_name: DatabaseName<'_>,
|
to_name: DatabaseName<'_>,
|
||||||
) -> Result<Backup<'a, 'b>> {
|
) -> Result<Backup<'a, 'b>> {
|
||||||
let to_name = to_name.to_cstring()?;
|
let to_name = to_name.as_cstring()?;
|
||||||
let from_name = from_name.to_cstring()?;
|
let from_name = from_name.as_cstring()?;
|
||||||
|
|
||||||
let to_db = to.db.borrow_mut().db;
|
let to_db = to.db.borrow_mut().db;
|
||||||
|
|
||||||
|
@ -225,7 +225,7 @@ impl Connection {
|
|||||||
) -> Result<Blob<'a>> {
|
) -> Result<Blob<'a>> {
|
||||||
let mut c = self.db.borrow_mut();
|
let mut c = self.db.borrow_mut();
|
||||||
let mut blob = ptr::null_mut();
|
let mut blob = ptr::null_mut();
|
||||||
let db = db.to_cstring()?;
|
let db = db.as_cstring()?;
|
||||||
let table = super::str_to_cstring(table)?;
|
let table = super::str_to_cstring(table)?;
|
||||||
let column = super::str_to_cstring(column)?;
|
let column = super::str_to_cstring(column)?;
|
||||||
let rc = unsafe {
|
let rc = unsafe {
|
||||||
|
@ -169,7 +169,7 @@ mod test {
|
|||||||
let _ = db2
|
let _ = db2
|
||||||
.query_row("PRAGMA schema_version", [], |row| row.get::<_, i32>(0))
|
.query_row("PRAGMA schema_version", [], |row| row.get::<_, i32>(0))
|
||||||
.expect("unexpected error");
|
.expect("unexpected error");
|
||||||
assert_eq!(CALLED.load(Ordering::Relaxed), true);
|
assert!(CALLED.load(Ordering::Relaxed));
|
||||||
|
|
||||||
child.join().unwrap();
|
child.join().unwrap();
|
||||||
}
|
}
|
||||||
|
@ -883,7 +883,7 @@ mod test {
|
|||||||
let result: Result<bool> =
|
let result: Result<bool> =
|
||||||
db.query_row("SELECT regexp('l.s[aeiouy]', 'lisa')", [], |r| r.get(0));
|
db.query_row("SELECT regexp('l.s[aeiouy]', 'lisa')", [], |r| r.get(0));
|
||||||
|
|
||||||
assert_eq!(true, result?);
|
assert!(result?);
|
||||||
|
|
||||||
let result: Result<i64> = db.query_row(
|
let result: Result<i64> = db.query_row(
|
||||||
"SELECT COUNT(*) FROM foo WHERE regexp('l.s[aeiouy]', x) == 1",
|
"SELECT COUNT(*) FROM foo WHERE regexp('l.s[aeiouy]', x) == 1",
|
||||||
|
@ -310,7 +310,7 @@ pub const TEMP_DB: DatabaseName<'static> = DatabaseName::Temp;
|
|||||||
))]
|
))]
|
||||||
impl DatabaseName<'_> {
|
impl DatabaseName<'_> {
|
||||||
#[inline]
|
#[inline]
|
||||||
fn to_cstring(&self) -> Result<util::SmallCString> {
|
fn as_cstring(&self) -> Result<util::SmallCString> {
|
||||||
use self::DatabaseName::{Attached, Main, Temp};
|
use self::DatabaseName::{Attached, Main, Temp};
|
||||||
match *self {
|
match *self {
|
||||||
Main => str_to_cstring("main"),
|
Main => str_to_cstring("main"),
|
||||||
@ -1016,7 +1016,7 @@ impl InterruptHandle {
|
|||||||
|
|
||||||
#[cfg(feature = "modern_sqlite")] // 3.7.10
|
#[cfg(feature = "modern_sqlite")] // 3.7.10
|
||||||
unsafe fn db_filename(db: *mut ffi::sqlite3) -> Option<PathBuf> {
|
unsafe fn db_filename(db: *mut ffi::sqlite3) -> Option<PathBuf> {
|
||||||
let db_name = DatabaseName::Main.to_cstring().unwrap();
|
let db_name = DatabaseName::Main.as_cstring().unwrap();
|
||||||
let db_filename = ffi::sqlite3_db_filename(db, db_name.as_ptr());
|
let db_filename = ffi::sqlite3_db_filename(db, db_name.as_ptr());
|
||||||
if db_filename.is_null() {
|
if db_filename.is_null() {
|
||||||
None
|
None
|
||||||
|
@ -40,7 +40,7 @@ impl Session<'_> {
|
|||||||
db: &'conn Connection,
|
db: &'conn Connection,
|
||||||
name: DatabaseName<'_>,
|
name: DatabaseName<'_>,
|
||||||
) -> Result<Session<'conn>> {
|
) -> Result<Session<'conn>> {
|
||||||
let name = name.to_cstring()?;
|
let name = name.as_cstring()?;
|
||||||
|
|
||||||
let db = db.db.borrow_mut().db;
|
let db = db.db.borrow_mut().db;
|
||||||
|
|
||||||
@ -161,7 +161,7 @@ impl Session<'_> {
|
|||||||
|
|
||||||
/// Load the difference between tables.
|
/// Load the difference between tables.
|
||||||
pub fn diff(&mut self, from: DatabaseName<'_>, table: &str) -> Result<()> {
|
pub fn diff(&mut self, from: DatabaseName<'_>, table: &str) -> Result<()> {
|
||||||
let from = from.to_cstring()?;
|
let from = from.as_cstring()?;
|
||||||
let table = str_to_cstring(table)?;
|
let table = str_to_cstring(table)?;
|
||||||
let table = table.as_ptr();
|
let table = table.as_ptr();
|
||||||
unsafe {
|
unsafe {
|
||||||
|
Loading…
Reference in New Issue
Block a user