Skip to content

fix(rust/driver_manager): modify SYSTEM path behavior on macOS #3252

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
merged 3 commits into from
Aug 12, 2025
Merged

fix(rust/driver_manager): modify SYSTEM path behavior on macOS #3252

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f50a4a1
Update rust driver manager
amoeba Aug 8, 2025
04ca3a2
Factor out system path code
amoeba Aug 8, 2025
ca75aa2
Add fallback cfg directive
amoeba Aug 11, 2025
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
28 changes: 25 additions & 3 deletions rust/driver_manager/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1753,6 +1753,23 @@ fn user_config_dir() -> Option<PathBuf> {
}
}

fn system_config_dir() -> Option<PathBuf> {
#[cfg(target_os = "macos")]
{
Some(PathBuf::from("/Library/Application Support/ADBC"))
}

#[cfg(all(unix, not(target_os = "macos")))]
{
Some(PathBuf::from("/etc/adbc"))
}

#[cfg(not(unix))]
{
None
}
}

fn get_search_paths(lvls: LoadFlags) -> Vec<PathBuf> {
let mut result = Vec::new();
if lvls & LOAD_FLAG_SEARCH_ENV != 0 {
Expand All @@ -1774,9 +1791,10 @@ fn get_search_paths(lvls: LoadFlags) -> Vec<PathBuf> {
// system level for windows is to search the registry keys
#[cfg(not(windows))]
if lvls & LOAD_FLAG_SEARCH_SYSTEM != 0 {
let system_config_dir = PathBuf::from("/etc/adbc");
if system_config_dir.exists() {
result.push(system_config_dir);
if let Some(path) = system_config_dir() {
if path.exists() {
result.push(path);
}
}
}

Expand Down Expand Up @@ -2184,7 +2202,11 @@ mod tests {
#[test]
#[cfg_attr(not(windows), ignore)]
fn test_get_search_paths() {
#[cfg(target_os = "macos")]
let system_path = PathBuf::from("/Library/Application Support/ADBC");
#[cfg(not(target_os = "macos"))]
let system_path = PathBuf::from("/etc/adbc");

let search_paths = get_search_paths(LOAD_FLAG_SEARCH_SYSTEM);
if system_path.exists() {
assert_eq!(search_paths, vec![system_path]);
Expand Down
Loading