From 5008c836d695acde52b072a505d6a727bf48135f Mon Sep 17 00:00:00 2001 From: Jiseok CHOI Date: Wed, 24 Dec 2025 01:51:48 +0900 Subject: [PATCH 1/2] Bump libsqlite3-sys from 0.28 to 0.36 Update libsqlite3-sys to version 0.36 and adapt to API changes by replacing sqlite3_close_v2 with sqlite3_close. The v2 variant is no longer directly exported in the newer version. Fixes #6471 --- Cargo.lock | 4 ++-- crates/stdlib/Cargo.toml | 2 +- crates/stdlib/src/sqlite.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e3296732cb..5cc5905593 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1742,9 +1742,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.28.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +checksum = "95b4103cffefa72eb8428cb6b47d6627161e51c2739fc5e3b734584157bc642a" dependencies = [ "cc", "pkg-config", diff --git a/crates/stdlib/Cargo.toml b/crates/stdlib/Cargo.toml index 0cd853223e..4885319ea1 100644 --- a/crates/stdlib/Cargo.toml +++ b/crates/stdlib/Cargo.toml @@ -132,7 +132,7 @@ oid-registry = { version = "0.8", features = ["x509", "pkcs1", "nist_algs"], opt pkcs8 = { version = "0.10", features = ["encryption", "pkcs5", "pem"], optional = true } [target.'cfg(not(any(target_os = "android", target_arch = "wasm32")))'.dependencies] -libsqlite3-sys = { version = "0.28", features = ["bundled"], optional = true } +libsqlite3-sys = { version = "0.36", features = ["bundled"], optional = true } lzma-sys = "0.1" xz2 = "0.1" diff --git a/crates/stdlib/src/sqlite.rs b/crates/stdlib/src/sqlite.rs index ffdc9eb383..f4cedef9f9 100644 --- a/crates/stdlib/src/sqlite.rs +++ b/crates/stdlib/src/sqlite.rs @@ -30,7 +30,7 @@ mod _sqlite { sqlite3_bind_null, sqlite3_bind_parameter_count, sqlite3_bind_parameter_name, sqlite3_bind_text, sqlite3_blob, sqlite3_blob_bytes, sqlite3_blob_close, sqlite3_blob_open, sqlite3_blob_read, sqlite3_blob_write, sqlite3_busy_timeout, sqlite3_changes, - sqlite3_close_v2, sqlite3_column_blob, sqlite3_column_bytes, sqlite3_column_count, + sqlite3_close, sqlite3_column_blob, sqlite3_column_bytes, sqlite3_column_count, sqlite3_column_decltype, sqlite3_column_double, sqlite3_column_int64, sqlite3_column_name, sqlite3_column_text, sqlite3_column_type, sqlite3_complete, sqlite3_context, sqlite3_context_db_handle, sqlite3_create_collation_v2, sqlite3_create_function_v2, @@ -2661,7 +2661,7 @@ mod _sqlite { impl Drop for Sqlite { fn drop(&mut self) { - unsafe { sqlite3_close_v2(self.raw.db) }; + unsafe { sqlite3_close(self.raw.db) }; } } From 6798c26ed19b9bd01dae3f2106603d846d6d38e0 Mon Sep 17 00:00:00 2001 From: Jiseok CHOI Date: Wed, 24 Dec 2025 01:52:23 +0900 Subject: [PATCH 2/2] Fix clippy --- crates/stdlib/src/sqlite.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/stdlib/src/sqlite.rs b/crates/stdlib/src/sqlite.rs index f4cedef9f9..2328f23430 100644 --- a/crates/stdlib/src/sqlite.rs +++ b/crates/stdlib/src/sqlite.rs @@ -1349,14 +1349,14 @@ mod _sqlite { fn set_trace_callback(&self, callable: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { let db = self.db_lock(vm)?; let Some(data) = CallbackData::new(callable, vm) else { - unsafe { sqlite3_trace_v2(db.db, SQLITE_TRACE_STMT as u32, None, null_mut()) }; + unsafe { sqlite3_trace_v2(db.db, SQLITE_TRACE_STMT, None, null_mut()) }; return Ok(()); }; let ret = unsafe { sqlite3_trace_v2( db.db, - SQLITE_TRACE_STMT as u32, + SQLITE_TRACE_STMT, Some(CallbackData::trace_callback), Box::into_raw(Box::new(data)).cast(), )