Skip to content

fix(libsql-sys): support non-Unix when rusqlite feature is disabled #1971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
penberg merged 1 commit into from
Mar 20, 2025
Merged

fix(libsql-sys): support non-Unix when rusqlite feature is disabled #1971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions libsql-sys/src/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,27 @@ impl<W: Wal> Connection<W> {

#[cfg(not(feature = "rusqlite"))]
let conn = unsafe {
use std::os::unix::ffi::OsStrExt;
let path = std::ffi::CString::new(path.as_ref().as_os_str().as_bytes())
.map_err(|_| crate::error::Error::Bug("invalid database path"))?;
#[cfg(unix)]
let path = {
use std::os::unix::ffi::OsStrExt;
std::ffi::CString::new(path.as_ref().as_os_str().as_bytes()).map_err(|_| {
crate::error::Error::Bug(
"invalid database path containing an internal nul byte",
)
})?
};
#[cfg(not(unix))]
let path = path
.to_str()
.ok_or_else(|| crate::error::Error::Bug("database path is not valid unicode"))
.and_then(|x| {
std::ffi::CString::new(x).map_err(|_| {
crate::error::Error::Bug(
"invalid database path containing an internal nul byte",
)
})
})?;

let mut conn: *mut crate::ffi::sqlite3 = std::ptr::null_mut();
// We pass a pointer to the WAL methods data to the database connection. This means
// that the reference must outlive the connection. This is guaranteed by the marker in
Expand Down
Loading