Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 4 additions & 9 deletions postgresql_embedded/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use std::env;
use std::env::current_dir;
use std::ffi::OsString;
use std::path::PathBuf;
#[cfg(feature = "bundled")]
use std::str::FromStr;
#[cfg(feature = "bundled")]
use std::sync::LazyLock;
Expand Down Expand Up @@ -156,19 +157,13 @@ impl Settings {
settings.version = VersionReq::parse(version)?;
}
if let Some(installation_dir) = query_parameters.get("installation_dir") {
if let Ok(path) = PathBuf::from_str(installation_dir) {
settings.installation_dir = path;
}
settings.installation_dir = PathBuf::from(installation_dir);
}
if let Some(password_file) = query_parameters.get("password_file") {
if let Ok(path) = PathBuf::from_str(password_file) {
settings.password_file = path;
}
settings.password_file = PathBuf::from(password_file);
}
if let Some(data_dir) = query_parameters.get("data_dir") {
if let Ok(path) = PathBuf::from_str(data_dir) {
settings.data_dir = path;
}
settings.data_dir = PathBuf::from(data_dir);
}
if let Some(host) = parsed_url.host() {
settings.host = host.to_string();
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.81.0"
channel = "1.82.0"
profile = "default"