ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-10-07 03:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Connection::extension_init2

Browse Source
This commit is contained in:
gwenn
2023-07-09 15:53:03 +02:00
parent 92c536b622
commit 81585a75cb
6 changed files with 75 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libsqlite3-sys/bindgen-bindings/bindgen_3.14.0_ext.rs
View File

@@ -6263,49 +6263,23 @@ pub unsafe fn sqlite3_expanded_sql(
(fun)(arg1)
}
/// Loadable extension initialization error
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
#[non_exhaustive]
pub enum InitError {
/// Invalid sqlite3_api_routines pointer
NullApiPointer,
/// Version mismatch between the extension and the SQLite3 library
VersionMismatch { compile_time: i32, runtime: i32 },
/// Invalid function pointer in one of sqlite3_api_routines fields
NullFunctionPointer,
}
impl ::std::fmt::Display for InitError {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
match *self {
InitError::NullApiPointer => {
write!(f, "Invalid sqlite3_api_routines pointer")
}
InitError::VersionMismatch { compile_time, runtime } => {
write!(f, "SQLite version mismatch: {runtime} < {compile_time}")
}
InitError::NullFunctionPointer => {
write!(f, "Some sqlite3_api_routines fields are null")
}
}
}
}
/// Like SQLITE_EXTENSION_INIT2 macro
pub unsafe fn rusqlite_extension_init2(
p_api: *mut sqlite3_api_routines,
) -> ::std::result::Result<(), InitError> {
) -> ::std::result::Result<(), crate::InitError> {
if p_api.is_null() {
return Err(InitError::NullApiPointer);
return Err(crate::InitError::NullApiPointer);
}
if let Some(fun) = (*p_api).libversion_number {
let version = fun();
if SQLITE_VERSION_NUMBER > version {
return Err(InitError::VersionMismatch {
return Err(crate::InitError::VersionMismatch {
compile_time: SQLITE_VERSION_NUMBER,
runtime: version,
});
}
} else {
return Err(InitError::NullFunctionPointer);
return Err(crate::InitError::NullFunctionPointer);
}
__SQLITE3_AGGREGATE_CONTEXT
.store((*p_api).aggregate_context, ::atomic::Ordering::Release);

28
libsqlite3-sys/build.rs
View File

@@ -773,38 +773,18 @@ mod loadable_extension {
}
// (3) generate rust code similar to SQLITE_EXTENSION_INIT2 macro
let tokens = quote::quote! {
/// Loadable extension initialization error
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
#[non_exhaustive]
pub enum InitError {
/// Invalid sqlite3_api_routines pointer
NullApiPointer,
/// Version mismatch between the extension and the SQLite3 library
VersionMismatch{compile_time: i32, runtime: i32},
/// Invalid function pointer in one of sqlite3_api_routines fields
NullFunctionPointer,
}
impl ::std::fmt::Display for InitError {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
match *self {
InitError::NullApiPointer => write!(f, "Invalid sqlite3_api_routines pointer"),
InitError::VersionMismatch{compile_time, runtime} => write!(f, "SQLite version mismatch: {runtime} < {compile_time}"),
InitError::NullFunctionPointer => write!(f, "Some sqlite3_api_routines fields are null"),
}
}
}
/// Like SQLITE_EXTENSION_INIT2 macro
pub unsafe fn rusqlite_extension_init2(#p_api: *mut #sqlite3_api_routines_ident) -> ::std::result::Result<(),InitError> {
pub unsafe fn rusqlite_extension_init2(#p_api: *mut #sqlite3_api_routines_ident) -> ::std::result::Result<(),crate::InitError> {
if #p_api.is_null() {
return Err(InitError::NullApiPointer);
return Err(crate::InitError::NullApiPointer);
}
if let Some(fun) = (*#p_api).libversion_number {
let version = fun();
if SQLITE_VERSION_NUMBER > version {
return Err(InitError::VersionMismatch{compile_time: SQLITE_VERSION_NUMBER, runtime: version});
return Err(crate::InitError::VersionMismatch{compile_time: SQLITE_VERSION_NUMBER, runtime: version});
}
} else {
return Err(InitError::NullFunctionPointer);
return Err(crate::InitError::NullFunctionPointer);
}
#(#stores)*
Ok(())

34
libsqlite3-sys/sqlite3/bindgen_bundled_version_ext.rs vendored
View File

@@ -7459,49 +7459,23 @@ pub unsafe fn sqlite3_is_interrupted(arg1: *mut sqlite3) -> ::std::os::raw::c_in
(fun)(arg1)
}
/// Loadable extension initialization error
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
#[non_exhaustive]
pub enum InitError {
/// Invalid sqlite3_api_routines pointer
NullApiPointer,
/// Version mismatch between the extension and the SQLite3 library
VersionMismatch { compile_time: i32, runtime: i32 },
/// Invalid function pointer in one of sqlite3_api_routines fields
NullFunctionPointer,
}
impl ::std::fmt::Display for InitError {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
match *self {
InitError::NullApiPointer => {
write!(f, "Invalid sqlite3_api_routines pointer")
}
InitError::VersionMismatch { compile_time, runtime } => {
write!(f, "SQLite version mismatch: {runtime} < {compile_time}")
}
InitError::NullFunctionPointer => {
write!(f, "Some sqlite3_api_routines fields are null")
}
}
}
}
/// Like SQLITE_EXTENSION_INIT2 macro
pub unsafe fn rusqlite_extension_init2(
p_api: *mut sqlite3_api_routines,
) -> ::std::result::Result<(), InitError> {
) -> ::std::result::Result<(), crate::InitError> {
if p_api.is_null() {
return Err(InitError::NullApiPointer);
return Err(crate::InitError::NullApiPointer);
}
if let Some(fun) = (*p_api).libversion_number {
let version = fun();
if SQLITE_VERSION_NUMBER > version {
return Err(InitError::VersionMismatch {
return Err(crate::InitError::VersionMismatch {
compile_time: SQLITE_VERSION_NUMBER,
runtime: version,
});
}
} else {
return Err(InitError::NullFunctionPointer);
return Err(crate::InitError::NullFunctionPointer);
}
__SQLITE3_AGGREGATE_CONTEXT
.store((*p_api).aggregate_context, ::atomic::Ordering::Release);

34
libsqlite3-sys/src/error.rs
View File

@@ -269,3 +269,37 @@ pub fn code_to_str(code: c_int) -> &'static str {
_ => "Unknown error code",
}
}
/// Loadable extension initialization error
#[cfg(feature = "loadable_extension")]
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
#[non_exhaustive]
pub enum InitError {
/// Invalid sqlite3_api_routines pointer
NullApiPointer,
/// Version mismatch between the extension and the SQLite3 library
VersionMismatch { compile_time: i32, runtime: i32 },
/// Invalid function pointer in one of sqlite3_api_routines fields
NullFunctionPointer,
}
#[cfg(feature = "loadable_extension")]
impl ::std::fmt::Display for InitError {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
match *self {
InitError::NullApiPointer => {
write!(f, "Invalid sqlite3_api_routines pointer")
}
InitError::VersionMismatch {
compile_time,
runtime,
} => {
write!(f, "SQLite version mismatch: {runtime} < {compile_time}")
}
InitError::NullFunctionPointer => {
write!(f, "Some sqlite3_api_routines fields are null")
}
}
}
}
#[cfg(feature = "loadable_extension")]
impl error::Error for InitError {}