From 2a14eadf34357ede810db82bc525166dccc32ce5 Mon Sep 17 00:00:00 2001 From: filipriec Date: Sun, 22 Jun 2025 14:00:49 +0200 Subject: [PATCH] fixed compatibility layer to old tests git status REMOVE IN THE FUTURE --- server/tests/common/mod.rs | 13 ++++++++----- server/tests/mod.rs | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/server/tests/common/mod.rs b/server/tests/common/mod.rs index bc0165f..a0a35dd 100644 --- a/server/tests/common/mod.rs +++ b/server/tests/common/mod.rs @@ -1,30 +1,28 @@ // tests/common/mod.rs use dotenvy::dotenv; -// --- CHANGE 1: Add Alphanumeric to the use statement --- use rand::distr::Alphanumeric; use rand::Rng; use sqlx::{postgres::PgPoolOptions, Connection, Executor, PgConnection, PgPool}; use std::env; -// (The get_database_url and get_root_connection functions remain the same) fn get_database_url() -> String { dotenv().ok(); env::var("TEST_DATABASE_URL").expect("TEST_DATABASE_URL must be set") } + async fn get_root_connection() -> PgConnection { PgConnection::connect(&get_database_url()) .await .expect("Failed to create root connection to test database") } - /// The primary test setup function. /// Creates a new, unique schema and returns a connection pool that is scoped to that schema. /// This is the key to test isolation. pub async fn setup_isolated_db() -> PgPool { let mut root_conn = get_root_connection().await; - + // Make schema names more unique - include timestamp + random let schema_name = format!( "test_{}_{}", @@ -56,7 +54,6 @@ pub async fn setup_isolated_db() -> PgPool { let schema_name = schema_name.clone(); Box::pin(async move { conn.execute(format!("SET search_path TO \"{}\", \"default\", \"public\"", schema_name).as_str()) - .await?; Ok(()) }) @@ -83,3 +80,9 @@ pub async fn setup_isolated_db() -> PgPool { pool } + +/// Compatibility alias for the old function name +/// This allows existing tests to continue working without modification +pub async fn setup_test_db() -> PgPool { + setup_isolated_db().await +} diff --git a/server/tests/mod.rs b/server/tests/mod.rs index 39e3317..38aa6cc 100644 --- a/server/tests/mod.rs +++ b/server/tests/mod.rs @@ -1,5 +1,5 @@ // tests/mod.rs -// pub mod adresar; +pub mod adresar; // pub mod tables_data; pub mod common; pub mod table_definition;