Skip to content

feat: support DATABASE_URL_TEST env var override in #[sqlx::test] #4312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
compiledbyutkarsh wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −4
Open

feat: support DATABASE_URL_TEST env var override in #[sqlx::test] #4312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions sqlx-mysql/src/testing/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ impl TestSupport for MySql {
}

async fn cleanup_test_dbs() -> Result<Option<usize>, Error> {
let url = dotenvy::var("DATABASE_URL").expect("DATABASE_URL must be set");
let url = dotenvy::var("DATABASE_URL_TEST")
.or_else(|_| dotenvy::var("DATABASE_URL"))
.expect("DATABASE_URL_TEST or DATABASE_URL must be set");

let mut conn = MySqlConnection::connect(&url).await?;

Expand Down Expand Up @@ -97,7 +99,9 @@ impl TestSupport for MySql {
}

async fn test_context(args: &TestArgs) -> Result<TestContext<MySql>, Error> {
let url = dotenvy::var("DATABASE_URL").expect("DATABASE_URL must be set");
let url = dotenvy::var("DATABASE_URL_TEST")
.or_else(|_| dotenvy::var("DATABASE_URL"))
.expect("DATABASE_URL_TEST or DATABASE_URL must be set");

let master_opts = MySqlConnectOptions::from_str(&url).expect("failed to parse DATABASE_URL");

Expand Down
8 changes: 6 additions & 2 deletions sqlx-postgres/src/testing/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ impl TestSupport for Postgres {
}

async fn cleanup_test_dbs() -> Result<Option<usize>, Error> {
let url = dotenvy::var("DATABASE_URL").expect("DATABASE_URL must be set");
let url = dotenvy::var("DATABASE_URL_TEST")
.or_else(|_| dotenvy::var("DATABASE_URL"))
.expect("DATABASE_URL_TEST or DATABASE_URL must be set");

let mut conn = PgConnection::connect(&url).await?;

Expand Down Expand Up @@ -90,7 +92,9 @@ impl TestSupport for Postgres {
}

async fn test_context(args: &TestArgs) -> Result<TestContext<Postgres>, Error> {
let url = dotenvy::var("DATABASE_URL").expect("DATABASE_URL must be set");
let url = dotenvy::var("DATABASE_URL_TEST")
.or_else(|_| dotenvy::var("DATABASE_URL"))
.expect("DATABASE_URL_TEST or DATABASE_URL must be set");

let master_opts = PgConnectOptions::from_str(&url).expect("failed to parse DATABASE_URL");

Expand Down
Loading