robin/nextcloud-config-parser
1
0
Fork 0
mirror of https://codeberg.org/icewind/nextcloud-config-parser.git synced 2026-06-03 08:34:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

handle postgres without password

Browse source 
fixes #4
This commit is contained in:
Robin Appelman 2023-03-30 13:03:48 +02:00
commit 39e4ae9a2b
4 changed files with 46 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib.rs
View file

@ -216,8 +216,12 @@ impl From<Database> for sqlx::any::AnyConnectOptions {
} => {
let mut options = PgConnectOptions::default()
.database(&database)
.username(&username)
.password(&password);
.username(&username);
if !password.is_empty() {
options = options.password(&password);
}
if matches!(ssl_options, SslOptions::Disabled) {
options = options.ssl_mode(PgSslMode::Disable);
}

2
src/nc.rs
View file

@ -212,7 +212,7 @@ fn parse_db_options(parsed: &Value) -> Result<Database> {
}
Some("pgsql") => {
let username = parsed["dbuser"].as_str().ok_or(DbError::NoUsername)?;
let password = parsed["dbpassword"].as_str().ok_or(DbError::NoPassword)?;
let password = parsed["dbpassword"].as_str().unwrap_or_default();
let (mut connect, disable_ssl) =
match split_host(parsed["dbhost"].as_str().unwrap_or_default()) {
(addr, None, None) => (