ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-10-23 09:18:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into preupdate_hook

Browse Source
This commit is contained in:
Midas Lambrichts
2021-04-08 21:51:44 +02:00
parent 9187b3e960 ddf69f749a
commit 55dc6e1979
34 changed files with 7548 additions and 4924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/inner_connection.rs
View File

@@ -433,18 +433,14 @@ fn ensure_safe_sqlite_threading_mode() -> Result<()> {
}
unsafe {
let msg = "\
Could not ensure safe initialization of SQLite.
To fix this, either:
* Upgrade SQLite to at least version 3.7.0
* Ensure that SQLite has been initialized in Multi-thread or Serialized mode and call
rusqlite::bypass_sqlite_initialization() prior to your first connection attempt.";
if ffi::sqlite3_config(ffi::SQLITE_CONFIG_MULTITHREAD) != ffi::SQLITE_OK {
panic!(msg);
}
if ffi::sqlite3_initialize() != ffi::SQLITE_OK {
panic!(msg);
if ffi::sqlite3_config(ffi::SQLITE_CONFIG_MULTITHREAD) != ffi::SQLITE_OK || ffi::sqlite3_initialize() != ffi::SQLITE_OK {
panic!(
"Could not ensure safe initialization of SQLite.\n\
To fix this, either:\n\
* Upgrade SQLite to at least version 3.7.0\n\
* Ensure that SQLite has been initialized in Multi-thread or Serialized mode and call\n\
rusqlite::bypass_sqlite_initialization() prior to your first connection attempt."
);
}
}
});