Use MigratorTraitSelf with shim

Author: tyt2y3

sea-orm-migration/src/cli.rs

@@ -8,13 +8,13 @@ use tracing_subscriber::{EnvFilter, prelude::*};
 use sea_orm::{ConnectOptions, Database, DbConn, DbErr};
 use sea_orm_cli::{MigrateSubcommands, run_migrate_generate, run_migrate_init};
 
-use super::MigratorTrait;
+use super::MigratorTraitSelf;
 
 const MIGRATION_DIR: &str = "./";
 
 pub async fn run_cli<M>(migrator: M)
 where
-    M: MigratorTrait,
+    M: MigratorTraitSelf,
 {
     run_cli_with_connection(migrator, Database::connect).await;
 }
@@ -26,7 +26,7 @@ where
 /// extensions.
 pub async fn run_cli_with_connection<M, F, Fut>(migrator: M, make_connection: F)
 where
-    M: MigratorTrait,
+    M: MigratorTraitSelf,
     F: FnOnce(ConnectOptions) -> Fut,
     Fut: Future<Output = Result<DbConn, DbErr>>,
 {
@@ -52,13 +52,13 @@ where
 }
 
 pub async fn run_migrate<M>(
-    _: M,
+    migrator: M,
     db: &DbConn,
     command: Option<MigrateSubcommands>,
     verbose: bool,
 ) -> Result<(), Box<dyn Error>>
 where
-    M: MigratorTrait,
+    M: MigratorTraitSelf,
 {
     let filter = match verbose {
         true => "debug",
@@ -85,19 +85,19 @@ where
     };
 
     match command {
-        Some(MigrateSubcommands::Fresh) => M::fresh(db).await?,
-        Some(MigrateSubcommands::Refresh) => M::refresh(db).await?,
-        Some(MigrateSubcommands::Reset) => M::reset(db).await?,
-        Some(MigrateSubcommands::Status) => M::status(db).await?,
-        Some(MigrateSubcommands::Up { num }) => M::up(db, num).await?,
-        Some(MigrateSubcommands::Down { num }) => M::down(db, Some(num)).await?,
+        Some(MigrateSubcommands::Fresh) => migrator.fresh(db).await?,
+        Some(MigrateSubcommands::Refresh) => migrator.refresh(db).await?,
+        Some(MigrateSubcommands::Reset) => migrator.reset(db).await?,
+        Some(MigrateSubcommands::Status) => migrator.status(db).await?,
+        Some(MigrateSubcommands::Up { num }) => migrator.up(db, num).await?,
+        Some(MigrateSubcommands::Down { num }) => migrator.down(db, Some(num)).await?,
         Some(MigrateSubcommands::Init) => run_migrate_init(MIGRATION_DIR)?,
         Some(MigrateSubcommands::Generate {
             migration_name,
             universal_time: _,
             local_time,
         }) => run_migrate_generate(MIGRATION_DIR, &migration_name, !local_time)?,
-        _ => M::up(db, None).await?,
+        _ => migrator.up(db, None).await?,
     };
 
     Ok(())

sea-orm-migration/src/migrator/exec.rs

@@ -69,7 +69,7 @@ pub fn get_migration_with_status(
 macro_rules! exec_with_connection {
     ($db:ident, $fn:expr) => {{
         async {
-            let db = $db.into_schema_manager_connection();
+            let db = $db.into_database_executor();
 
             match db.get_database_backend() {
                 DbBackend::Postgres => {

sea-orm-migration/src/migrator/with_self.rs

@@ -167,6 +167,109 @@ pub trait MigratorTraitSelf: Sized + Send + Sync {
     }
 }
 
+#[async_trait::async_trait]
+impl<M> MigratorTraitSelf for M
+where
+    M: super::MigratorTrait + Sized + Send + Sync,
+{
+    fn migrations(&self) -> Vec<Box<dyn MigrationTrait>> {
+        M::migrations()
+    }
+
+    fn migration_table_name(&self) -> DynIden {
+        M::migration_table_name()
+    }
+
+    fn get_migration_files(&self) -> Vec<Migration> {
+        M::get_migration_files()
+    }
+
+    async fn get_migration_models<C>(&self, db: &C) -> Result<Vec<seaql_migrations::Model>, DbErr>
+    where
+        C: ConnectionTrait,
+    {
+        M::get_migration_models(db).await
+    }
+
+    async fn get_migration_with_status<C>(&self, db: &C) -> Result<Vec<Migration>, DbErr>
+    where
+        C: ConnectionTrait,
+    {
+        M::get_migration_with_status(db).await
+    }
+
+    async fn get_pending_migrations<C>(&self, db: &C) -> Result<Vec<Migration>, DbErr>
+    where
+        C: ConnectionTrait,
+    {
+        M::get_pending_migrations(db).await
+    }
+
+    async fn get_applied_migrations<C>(&self, db: &C) -> Result<Vec<Migration>, DbErr>
+    where
+        C: ConnectionTrait,
+    {
+        M::get_applied_migrations(db).await
+    }
+
+    async fn install<C>(&self, db: &C) -> Result<(), DbErr>
+    where
+        C: ConnectionTrait,
+    {
+        M::install(db).await
+    }
+
+    /// Check the status of all migrations
+    async fn status<C>(&self, db: &C) -> Result<(), DbErr>
+    where
+        C: ConnectionTrait,
+    {
+        M::status(db).await
+    }
+
+    async fn fresh<'c, C>(&self, db: C) -> Result<(), DbErr>
+    where
+        C: IntoSchemaManagerConnection<'c>,
+    {
+        M::fresh(db).await
+    }
+
+    async fn refresh<'c, C>(&self, db: C) -> Result<(), DbErr>
+    where
+        C: IntoSchemaManagerConnection<'c>,
+    {
+        M::refresh(db).await
+    }
+
+    async fn reset<'c, C>(&self, db: C) -> Result<(), DbErr>
+    where
+        C: IntoSchemaManagerConnection<'c>,
+    {
+        M::reset(db).await
+    }
+
+    async fn uninstall<'c, C>(&self, db: C) -> Result<(), DbErr>
+    where
+        C: IntoSchemaManagerConnection<'c>,
+    {
+        M::uninstall(db).await
+    }
+
+    async fn up<'c, C>(&self, db: C, steps: Option<u32>) -> Result<(), DbErr>
+    where
+        C: IntoSchemaManagerConnection<'c>,
+    {
+        M::up(db, steps).await
+    }
+
+    async fn down<'c, C>(&self, db: C, steps: Option<u32>) -> Result<(), DbErr>
+    where
+        C: IntoSchemaManagerConnection<'c>,
+    {
+        M::down(db, steps).await
+    }
+}
+
 async fn exec_fresh<M>(migrator: &M, manager: &SchemaManager<'_>) -> Result<(), DbErr>
 where
     M: MigratorTraitSelf,

sea-orm-migration/tests/common/migrator/mod.rs

@@ -1,2 +1,3 @@
 pub mod default;
 pub mod override_migration_table_name;
+pub mod with_self;

sea-orm-migration/tests/common/migrator/with_self.rs

@@ -0,0 +1,20 @@
+use crate::common::migration::*;
+use sea_orm_migration::{MigratorTraitSelf, prelude::*};
+
+pub struct Migrator {
+    pub i: i32,
+}
+
+#[async_trait::async_trait]
+impl MigratorTraitSelf for Migrator {
+    fn migrations(&self) -> Vec<Box<dyn MigrationTrait>> {
+        vec![
+            Box::new(m20220118_000001_create_cake_table::Migration),
+            Box::new(m20220118_000002_create_fruit_table::Migration),
+            Box::new(m20220118_000003_seed_cake_table::Migration),
+            Box::new(m20220118_000004_create_tea_enum::Migration),
+            Box::new(m20220923_000001_seed_cake_table::Migration),
+            Box::new(m20230109_000001_seed_cake_table::Migration),
+        ]
+    }
+}