From 43c0e1bf17e19c1526ebdfc24632997267ebad16 Mon Sep 17 00:00:00 2001 From: EETagent Date: Tue, 27 Dec 2022 13:04:08 +0100 Subject: [PATCH 1/2] fix: create admin only on debug release --- migration/src/lib.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/migration/src/lib.rs b/migration/src/lib.rs index 3d8205f..2a1d825 100644 --- a/migration/src/lib.rs +++ b/migration/src/lib.rs @@ -14,17 +14,23 @@ pub struct Migrator; #[async_trait::async_trait] impl MigratorTrait for Migrator { fn migrations() -> Vec> { - vec![ + let mut migrations: Vec> = vec![ Box::new(m20221024_111310_create_admin::Migration), Box::new(m20221024_121621_create_candidate::Migration), Box::new(m20221024_124701_create_parent::Migration), - Box::new(m20221024_134454_insert_sample_admin::Migration::default()), Box::new(m20221025_154422_create_session::Migration), Box::new(m20221027_194728_session_create_user_fk::Migration), Box::new(m20221112_112212_create_parent_candidate_fk::Migration), Box::new(m20221221_162232_create_admin_session::Migration), Box::new(m20221028_194728_session_create_admin_fk::Migration), + ]; - ] + if cfg!(debug_assertions) { + migrations.push(Box::new( + m20221024_134454_insert_sample_admin::Migration::default(), + )); + } + + migrations } } From 46730d791c7aad62a5ecce23d206eaafff4faaf8 Mon Sep 17 00:00:00 2001 From: EETagent Date: Fri, 30 Dec 2022 22:42:16 +0100 Subject: [PATCH 2/2] fix: remove fk for sqlite tests --- migration/src/lib.rs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/migration/src/lib.rs b/migration/src/lib.rs index 2a1d825..8b2f658 100644 --- a/migration/src/lib.rs +++ b/migration/src/lib.rs @@ -19,18 +19,25 @@ impl MigratorTrait for Migrator { Box::new(m20221024_121621_create_candidate::Migration), Box::new(m20221024_124701_create_parent::Migration), Box::new(m20221025_154422_create_session::Migration), - Box::new(m20221027_194728_session_create_user_fk::Migration), - Box::new(m20221112_112212_create_parent_candidate_fk::Migration), Box::new(m20221221_162232_create_admin_session::Migration), - Box::new(m20221028_194728_session_create_admin_fk::Migration), ]; - if cfg!(debug_assertions) { + if cfg!(debug_assertions) || cfg!(test) { migrations.push(Box::new( m20221024_134454_insert_sample_admin::Migration::default(), )); } + if !cfg!(test) { + migrations.push(Box::new(m20221027_194728_session_create_user_fk::Migration)); + migrations.push(Box::new( + m20221112_112212_create_parent_candidate_fk::Migration, + )); + migrations.push(Box::new( + m20221028_194728_session_create_admin_fk::Migration, + )); + } + migrations } }