ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-04-06 23:37:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Extracted the preupdate_hook to a separate cargo feature.

Browse Source 
Moved hooks and preupdate_hook into their own modules inside hooks.rs
Also created an initial way to access the functions that are available
during the callback.
This commit is contained in:
Midas Lambrichts 2021-02-06 12:20:05 +01:00
parent d88f49f830
commit ceff6cb8b1
5 changed files with 556 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -37,7 +37,8 @@ trace = ["libsqlite3-sys/min_sqlite_version_3_6_23"]
bundled = ["libsqlite3-sys/bundled", "modern_sqlite"] bundled = ["libsqlite3-sys/bundled", "modern_sqlite"]
buildtime_bindgen = ["libsqlite3-sys/buildtime_bindgen"] buildtime_bindgen = ["libsqlite3-sys/buildtime_bindgen"]
limits = [] limits = []
hooks = ["libsqlite3-sys/preupdate_hook"] hooks = []
preupdate_hook = ["libsqlite3-sys/preupdate_hook"]
i128_blob = ["byteorder"] i128_blob = ["byteorder"]
sqlcipher = ["libsqlite3-sys/sqlcipher"] sqlcipher = ["libsqlite3-sys/sqlcipher"]
unlock_notify = ["libsqlite3-sys/unlock_notify"] unlock_notify = ["libsqlite3-sys/unlock_notify"]

978
src/hooks.rs
View File

File diff suppressed because it is too large Load Diff

11
src/inner_connection.rs
View File

@ -33,7 +33,7 @@ pub struct InnerConnection {
pub free_update_hook: Option<unsafe fn(*mut ::std::os::raw::c_void)>, pub free_update_hook: Option<unsafe fn(*mut ::std::os::raw::c_void)>,
#[cfg(feature = "hooks")] #[cfg(feature = "hooks")]
pub progress_handler: Option<Box<dyn FnMut() -> bool + Send>>, pub progress_handler: Option<Box<dyn FnMut() -> bool + Send>>,
#[cfg(feature = "hooks")] #[cfg(feature = "preupdate_hook")]
pub free_preupdate_hook: Option<unsafe fn(*mut ::std::os::raw::c_void)>, pub free_preupdate_hook: Option<unsafe fn(*mut ::std::os::raw::c_void)>,
owned: bool, owned: bool,
} }
@ -52,9 +52,9 @@ impl InnerConnection {
#[cfg(feature = "hooks")] #[cfg(feature = "hooks")]
free_update_hook: None, free_update_hook: None,
#[cfg(feature = "hooks")] #[cfg(feature = "hooks")]
free_preupdate_hook: None,
#[cfg(feature = "hooks")]
progress_handler: None, progress_handler: None,
#[cfg(feature = "preupdate_hook")]
free_preupdate_hook: None,
owned, owned,
} }
} }
@ -155,6 +155,7 @@ impl InnerConnection {
return Ok(()); return Ok(());
} }
self.remove_hooks(); self.remove_hooks();
self.remove_preupdate_hook();
let mut shared_handle = self.interrupt_lock.lock().unwrap(); let mut shared_handle = self.interrupt_lock.lock().unwrap();
assert!( assert!(
!shared_handle.is_null(), !shared_handle.is_null(),
@ -305,6 +306,10 @@ impl InnerConnection {
#[cfg(not(feature = "hooks"))] #[cfg(not(feature = "hooks"))]
#[inline] #[inline]
fn remove_hooks(&mut self) {} fn remove_hooks(&mut self) {}
#[cfg(not(feature = "preupdate_hook"))]
#[inline]
fn remove_preupdate_hook(&mut self) {}
} }
impl Drop for InnerConnection { impl Drop for InnerConnection {

4
src/lib.rs
View File

@ -101,8 +101,8 @@ pub mod config;
mod context; mod context;
#[cfg(feature = "functions")] #[cfg(feature = "functions")]
pub mod functions; pub mod functions;
#[cfg(feature = "hooks")] #[cfg(any(feature = "hooks", feature = "preupdate_hook"))]
mod hooks; pub mod hooks;
mod inner_connection; mod inner_connection;
#[cfg(feature = "limits")] #[cfg(feature = "limits")]
pub mod limits; pub mod limits;

7
src/types/value_ref.rs
View File

@ -133,7 +133,12 @@ where
} }
} }
#[cfg(any(feature = "functions", feature = "session", feature = "vtab"))] #[cfg(any(
feature = "functions",
feature = "session",
feature = "vtab",
feature = "preupdate_hook"
))]
impl<'a> ValueRef<'a> { impl<'a> ValueRef<'a> {
pub(crate) unsafe fn from_value(value: *mut crate::ffi::sqlite3_value) -> ValueRef<'a> { pub(crate) unsafe fn from_value(value: *mut crate::ffi::sqlite3_value) -> ValueRef<'a> {
use crate::ffi; use crate::ffi;