diff --git a/Cargo.lock b/Cargo.lock index 9c397c555d..74947c4835 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2132,13 +2132,13 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libredox" -version = "0.1.4" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638" +checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" dependencies = [ "bitflags 2.9.1", "libc", - "redox_syscall", + "redox_syscall 0.7.0", ] [[package]] @@ -2547,7 +2547,7 @@ checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.13", "smallvec", "windows-targets 0.52.6", ] @@ -2970,6 +2970,15 @@ dependencies = [ "bitflags 2.9.1", ] +[[package]] +name = "redox_syscall" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27" +dependencies = [ + "bitflags 2.9.1", +] + [[package]] name = "regex" version = "1.11.1" @@ -3923,7 +3932,6 @@ dependencies = [ "time", "tracing", "uuid", - "whoami", ] [[package]] @@ -4709,12 +4717,6 @@ dependencies = [ "wit-bindgen-rt", ] -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - [[package]] name = "wasm-bindgen" version = "0.2.100" @@ -4828,12 +4830,11 @@ dependencies = [ [[package]] name = "whoami" -version = "1.6.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7" +checksum = "ace4d5c7b5ab3d99629156d4e0997edbe98a4beb6d5ba99e2cae830207a81983" dependencies = [ - "redox_syscall", - "wasite", + "libredox", ] [[package]] diff --git a/sqlx-mysql/Cargo.toml b/sqlx-mysql/Cargo.toml index ee9512b61e..8a7c9cef38 100644 --- a/sqlx-mysql/Cargo.toml +++ b/sqlx-mysql/Cargo.toml @@ -65,7 +65,6 @@ percent-encoding = "2.1.0" smallvec = "1.7.0" stringprep = "0.1.2" tracing = { version = "0.1.37", features = ["log"] } -whoami = { version = "1.2.1", default-features = false } dotenvy.workspace = true thiserror.workspace = true diff --git a/sqlx-postgres/Cargo.toml b/sqlx-postgres/Cargo.toml index ceec9eb648..89016c8088 100644 --- a/sqlx-postgres/Cargo.toml +++ b/sqlx-postgres/Cargo.toml @@ -65,7 +65,7 @@ num-bigint = { version = "0.4.3", optional = true } smallvec = { version = "1.7.0", features = ["serde"] } stringprep = "0.1.2" tracing = { version = "0.1.37", features = ["log"] } -whoami = { version = "1.2.1", default-features = false } +whoami = { version = "2.0.2", default-features = false } dotenvy.workspace = true thiserror.workspace = true diff --git a/sqlx-postgres/src/options/mod.rs b/sqlx-postgres/src/options/mod.rs index efbc43989b..230eeb4a0a 100644 --- a/sqlx-postgres/src/options/mod.rs +++ b/sqlx-postgres/src/options/mod.rs @@ -64,7 +64,13 @@ 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 { + "unknown".to_string() + }; let database = var("PGDATABASE").ok();