mirror of
https://github.com/launchbadge/sqlx.git
synced 2026-03-23 10:38:57 +00:00
Bump whoami to v2 (#4143)
* Bump whoami to v2 Signed-off-by: tison <wander4096@gmail.com> * Update sqlx-postgres/src/options/mod.rs --------- Signed-off-by: tison <wander4096@gmail.com>
This commit is contained in:
@@ -64,7 +64,14 @@ impl PgConnectOptions {
|
||||
.or_else(|| var("PGHOST").ok())
|
||||
.unwrap_or_else(|| default_host(port));
|
||||
|
||||
let username = var("PGUSER").ok().unwrap_or_else(whoami::username);
|
||||
let username = if let Ok(username) = var("PGUSER") {
|
||||
username
|
||||
} else if let Ok(username) = whoami::username() {
|
||||
username
|
||||
} else {
|
||||
// keep the same fallback as previous version
|
||||
"unknown".to_string()
|
||||
};
|
||||
|
||||
let database = var("PGDATABASE").ok();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user