From cd43222280025d74b29354db78ad347fc0280d95 Mon Sep 17 00:00:00 2001 From: Chris Tsang Date: Sat, 28 Jan 2023 01:49:46 +0800 Subject: [PATCH] Tweaks --- .../src/{manager_connection.rs => connection.rs} | 5 ++++- sea-orm-migration/src/lib.rs | 4 ++-- sea-orm-migration/tests/main.rs | 4 ++-- .../tests/migrator/m20220118_000001_create_cake_table.rs | 2 +- .../tests/migrator/m20230109_000001_seed_cake_table.rs | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) rename sea-orm-migration/src/{manager_connection.rs => connection.rs} (98%) diff --git a/sea-orm-migration/src/manager_connection.rs b/sea-orm-migration/src/connection.rs similarity index 98% rename from sea-orm-migration/src/manager_connection.rs rename to sea-orm-migration/src/connection.rs index eda6f628..116185e4 100644 --- a/sea-orm-migration/src/manager_connection.rs +++ b/sea-orm-migration/src/connection.rs @@ -122,7 +122,10 @@ impl<'c> TransactionTrait for SchemaManagerConnection<'c> { } } -pub trait IntoSchemaManagerConnection<'c>: Send { +pub trait IntoSchemaManagerConnection<'c>: Send +where + Self: 'c, +{ fn into_schema_manager_connection(self) -> SchemaManagerConnection<'c>; } diff --git a/sea-orm-migration/src/lib.rs b/sea-orm-migration/src/lib.rs index 38b0dd1b..2118a20d 100644 --- a/sea-orm-migration/src/lib.rs +++ b/sea-orm-migration/src/lib.rs @@ -1,14 +1,14 @@ #[cfg(feature = "cli")] pub mod cli; +pub mod connection; pub mod manager; -pub mod manager_connection; pub mod migrator; pub mod prelude; pub mod seaql_migrations; pub mod util; +pub use connection::*; pub use manager::*; -pub use manager_connection::*; pub use migrator::*; pub use async_trait; diff --git a/sea-orm-migration/tests/main.rs b/sea-orm-migration/tests/main.rs index 2279f7ec..022ff8a5 100644 --- a/sea-orm-migration/tests/main.rs +++ b/sea-orm-migration/tests/main.rs @@ -119,7 +119,7 @@ async fn run_migration(url: &str, db_name: &str, schema: &str) -> Result<(), DbE assert_eq!( Migrator::up(db, None).await, Err(DbErr::Migration( - "Aboard migration and rollback changes".into() + "Abort migration and rollback changes".into() )) ); @@ -158,7 +158,7 @@ async fn run_migration(url: &str, db_name: &str, schema: &str) -> Result<(), DbE assert_eq!( Migrator::down(db, None).await, Err(DbErr::Migration( - "Aboard migration and rollback changes".into() + "Abort migration and rollback changes".into() )) ); diff --git a/sea-orm-migration/tests/migrator/m20220118_000001_create_cake_table.rs b/sea-orm-migration/tests/migrator/m20220118_000001_create_cake_table.rs index 926ba146..f06513aa 100644 --- a/sea-orm-migration/tests/migrator/m20220118_000001_create_cake_table.rs +++ b/sea-orm-migration/tests/migrator/m20220118_000001_create_cake_table.rs @@ -30,7 +30,7 @@ impl MigrationTrait for Migration { if std::env::var_os("ABORT_MIGRATION").eq(&Some("YES".into())) { return Err(DbErr::Migration( - "Aboard migration and rollback changes".into(), + "Abort migration and rollback changes".into(), )); } diff --git a/sea-orm-migration/tests/migrator/m20230109_000001_seed_cake_table.rs b/sea-orm-migration/tests/migrator/m20230109_000001_seed_cake_table.rs index 91314f5e..9d69188b 100644 --- a/sea-orm-migration/tests/migrator/m20230109_000001_seed_cake_table.rs +++ b/sea-orm-migration/tests/migrator/m20230109_000001_seed_cake_table.rs @@ -20,7 +20,7 @@ impl MigrationTrait for Migration { if std::env::var_os("ABORT_MIGRATION").eq(&Some("YES".into())) { return Err(DbErr::Migration( - "Aboard migration and rollback changes".into(), + "Abort migration and rollback changes".into(), )); }