Skip to content

Commit 959f662

Browse files
committed
Bump whoami to v2
Signed-off-by: tison <wander4096@gmail.com>
1 parent 452da1a commit 959f662

File tree

4 files changed

+20
-18
lines changed

4 files changed

+20
-18
lines changed

Cargo.lock

Lines changed: 16 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sqlx-mysql/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ percent-encoding = "2.1.0"
6565
smallvec = "1.7.0"
6666
stringprep = "0.1.2"
6767
tracing = { version = "0.1.37", features = ["log"] }
68-
whoami = { version = "1.2.1", default-features = false }
6968

7069
dotenvy.workspace = true
7170
thiserror.workspace = true

sqlx-postgres/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ num-bigint = { version = "0.4.3", optional = true }
6565
smallvec = { version = "1.7.0", features = ["serde"] }
6666
stringprep = "0.1.2"
6767
tracing = { version = "0.1.37", features = ["log"] }
68-
whoami = { version = "1.2.1", default-features = false }
68+
whoami = { version = "2.0.2", default-features = false }
6969

7070
dotenvy.workspace = true
7171
thiserror.workspace = true

sqlx-postgres/src/options/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ impl PgConnectOptions {
6464
.or_else(|| var("PGHOST").ok())
6565
.unwrap_or_else(|| default_host(port));
6666

67-
let username = var("PGUSER").ok().unwrap_or_else(whoami::username);
67+
let username = var("PGUSER")
68+
.ok()
69+
.unwrap_or_else(|| whoami::username().unwrap_or_else(|| "unknown".to_string()));
6870

6971
let database = var("PGDATABASE").ok();
7072

0 commit comments

Comments
 (0)