From f0f4e1197a62d61c539775e6475b016b525e9fee Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 4 Apr 2025 21:00:35 -0400 Subject: [PATCH] Correction --- src/lib.rs | 2 +- src/main.rs | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index d7c6e20..891aac4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,7 +4,7 @@ pub mod hashing; pub mod models; pub mod repo; -mod keys { +pub mod keys { pub const DBURL: &str = "DATABASE_URL"; pub mod error { diff --git a/src/main.rs b/src/main.rs index e9482ef..dfe28f5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -78,10 +78,12 @@ mod tests { mod db_mgr { use std::str::FromStr; + use icarus_auth::keys; + pub const LIMIT: usize = 6; - pub async fn eeee() -> Result { - let tm_db_url = std::env::var("DATABASE_URL").expect("DATABASE_URL must be present"); + pub async fn get_pool() -> Result { + let tm_db_url = std::env::var(keys::DBURL).expect("DATABASE_URL must be present"); let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap(); sqlx::PgPool::connect_with(tm_options).await } @@ -93,7 +95,7 @@ mod tests { } pub async fn connect_to_db(db_name: &str) -> Result { - let db_url = std::env::var("DATABASE_URL").expect("DATABASE_URL must be set for tests"); + let db_url = std::env::var(keys::DBURL).expect("DATABASE_URL must be set for tests"); let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name); sqlx::PgPool::connect_with(options).await } @@ -122,7 +124,7 @@ mod tests { pub fn get_database_name() -> Result> { dotenvy::dotenv().ok(); // Load .env file if it exists - match std::env::var("DATABASE_URL") { + match std::env::var(keys::DBURL) { Ok(database_url) => { let parsed_url = url::Url::parse(&database_url)?; if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" { @@ -170,7 +172,7 @@ mod tests { #[tokio::test] async fn test_register_user() { - let tm_pool = db_mgr::eeee().await.unwrap(); + let tm_pool = db_mgr::get_pool().await.unwrap(); let db_name = db_mgr::generate_db_name().await;