♻️ Replace diesel_async_migrations with diesel_migrations, refactor

diesel test init

crates/read_files/Cargo.toml

@@ -10,4 +10,4 @@ proc-macro = true
 [dependencies]
 syn = { workspace = true }
 quote = { workspace = true }
-regex = "1.10"
+regex = { workspace = true }

crates/tests/Cargo.toml

@@ -9,12 +9,9 @@ homepage.workspace = true
 [dependencies]
 diesel = { workspace = true }
 diesel-async = { workspace = true }
-lib = { path = "../../../rust-lib", features = ["diesel", "derive"] }
-derive_more = { workspace = true, features = ["constructor", "from"] }
-thiserror = { workspace = true }
+lib = { path = "../../../rust-lib", features = ["diesel", "derive", "test"] }
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["macros"] }
-dotenvy_macro = "0.15"
-testcontainers-modules = { version = "0.11", features = ["postgres"] }
-diesel_async_migrations = "0.15"
+testcontainers-modules = { workspace = true, features = ["postgres"] }
+diesel_migrations = { workspace = true }

crates/tests/tests/test_containers.rs

@@ -1,48 +1,17 @@
-use derive_more::{Constructor, From};
-use diesel_async::pooled_connection::deadpool::{BuildError, PoolError};
-use diesel_async::AsyncPgConnection;
-use diesel_async_migrations::EmbeddedMigrations;
-use lib::diesel::pool::{create_pool_from_url, PgPool};
-use lib::diesel::DieselError;
+use diesel_migrations::EmbeddedMigrations;
+use lib::diesel::migration::run_migrations;
+use lib::test::test_containers::{ContainerError, TestContainer};
 use testcontainers_modules::postgres::Postgres;
 use testcontainers_modules::testcontainers::runners::AsyncRunner;
 use testcontainers_modules::testcontainers::{ContainerAsync, TestcontainersError};
 
-/// When the TestContainer is dropped, the container will be removed.
-/// # Errors
-/// If destructed and the container field is dropped, the container will be stopped
-/// and all connections from the pool will result in DatabaseError.
-#[derive(Constructor)]
-pub struct TestContainer {
-    pub container: ContainerAsync<Postgres>,
-    pub pool: PgPool,
-}
-
-#[derive(Debug, From)]
-pub enum ContainerError {
-    TestContainers(TestcontainersError),
-    BuildError(BuildError),
-    PoolError(PoolError),
-    DieselError(DieselError),
-}
-
-pub async fn create_test_containers_pool<'a>() -> Result<TestContainer, ContainerError> {
-    let container = create_postgres_container().await?;
-    let connection_string = format!(
-        "postgres://postgres:postgres@localhost:{}/postgres",
-        container.get_host_port_ipv4(5432).await?
-    );
-    let pool = create_pool_from_url(connection_string)?;
-    run_migrations(pool.get().await?.as_mut()).await?;
-    Ok(TestContainer::new(container, pool))
-}
-
-pub(crate) async fn run_migrations(
-    conn: &mut AsyncPgConnection,
-) -> Result<(), diesel::result::Error> {
-    static EMBEDDED_MIGRATIONS: EmbeddedMigrations =
-        diesel_async_migrations::embed_migrations!("./migrations");
-    EMBEDDED_MIGRATIONS.run_pending_migrations(conn).await
+pub async fn create_test_containers_pool() -> Result<TestContainer, ContainerError> {
+    let test_container = lib::test::test_containers::create_test_containers_pool().await?;
+    let pool = &test_container.pool;
+    let connection = pool.get().await?;
+    const MIGRATIONS: EmbeddedMigrations = diesel_migrations::embed_migrations!("./migrations");
+    run_migrations(connection, MIGRATIONS).await?;
+    Ok(test_container)
 }
 
 pub async fn create_postgres_container() -> Result<ContainerAsync<Postgres>, TestcontainersError> {