Fix Config::url handling

This closes #290
bikeshedder · Dec 18, 2023 · 24c6051 · 24c6051
1 parent 7869a0b
commit 24c6051
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/postgres/CHANGELOG.md b/postgres/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## unreleased
+
+- Fix `Config::url` handling
+
 ## v0.12.0
 
 - Add `load_balance_hosts` to `Config` struct.

diff --git a/postgres/src/config.rs b/postgres/src/config.rs
@@ -199,21 +199,29 @@ impl Config {
         } else {
             tokio_postgres::Config::new()
         };
-        if let Some(user) = &self.user {
-            cfg.user(user.as_str());
-        } else if let Ok(user) = env::var("USER") {
+        if let Some(user) = self.user.as_ref().filter(|s| !s.is_empty()) {
             cfg.user(user.as_str());
         }
+        if !cfg.get_user().is_some_and(|s| !s.is_empty()) {
+            if let Ok(user) = env::var("USER") {
+                cfg.user(&user);
+            }
+        }
         if let Some(password) = &self.password {
             cfg.password(password);
         }
-        match &self.dbname {
-            Some(dbname) => match dbname.as_str() {
-                "" => return Err(ConfigError::DbnameMissing),
-                dbname => cfg.dbname(dbname),
-            },
-            None => return Err(ConfigError::DbnameEmpty),
-        };
+        if let Some(dbname) = self.dbname.as_ref().filter(|s| !s.is_empty()) {
+            cfg.dbname(dbname);
+        }
+        match cfg.get_dbname() {
+            None => {
+                return Err(ConfigError::DbnameMissing);
+            }
+            Some(s) if s.is_empty() => {
+                return Err(ConfigError::DbnameEmpty);
+            }
+            _ => {}
+        }
         if let Some(options) = &self.options {
             cfg.options(options.as_str());
         }
@@ -228,7 +236,7 @@ impl Config {
                 cfg.host(host.as_str());
             }
         }
-        if self.host.is_none() && self.hosts.is_none() {
+        if cfg.get_hosts().is_empty() {
             // Systems that support it default to unix domain sockets.
             #[cfg(unix)]
             {