fix lifetime issue in async trait with ugly workaround (for now)

Signed-off-by: simonsan <14062932+simonsan@users.noreply.github.com>
pace-rs · Mar 30, 2024 · e73d00f · e73d00f
1 parent df635c7
commit e73d00f
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/crates/storage/src/migration/m20240325_000001_create_activities.rs b/crates/storage/src/migration/m20240325_000001_create_activities.rs
@@ -10,7 +10,7 @@ pub struct Migration;
 
 #[async_trait::async_trait]
 impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn up(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .create_table(
                 Table::create()
@@ -70,7 +70,7 @@ impl MigrationTrait for Migration {
             .await
     }
 
-    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn down(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .drop_table(
                 Table::drop()

diff --git a/crates/storage/src/migration/m20240326_000001_create_tags.rs b/crates/storage/src/migration/m20240326_000001_create_tags.rs
@@ -7,7 +7,7 @@ pub struct Migration;
 
 #[async_trait::async_trait]
 impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn up(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .create_table(
                 Table::create()
@@ -25,7 +25,7 @@ impl MigrationTrait for Migration {
             .await
     }
 
-    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn down(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .drop_table(Table::drop().table(TagsEnum::Table).if_exists().to_owned())
             .await

diff --git a/crates/storage/src/migration/m20240326_000002_create_categories.rs b/crates/storage/src/migration/m20240326_000002_create_categories.rs
@@ -7,7 +7,7 @@ pub struct Migration;
 
 #[async_trait::async_trait]
 impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn up(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .create_table(
                 Table::create()
@@ -26,7 +26,7 @@ impl MigrationTrait for Migration {
             .await
     }
 
-    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn down(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .drop_table(
                 Table::drop()

diff --git a/crates/storage/src/migration/m20240326_000003_create_activity_status.rs b/crates/storage/src/migration/m20240326_000003_create_activity_status.rs
@@ -7,7 +7,7 @@ pub struct Migration;
 
 #[async_trait::async_trait]
 impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn up(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .create_table(
                 Table::create()
@@ -25,7 +25,7 @@ impl MigrationTrait for Migration {
             .await
     }
 
-    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn down(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .drop_table(
                 Table::drop()

diff --git a/crates/storage/src/migration/m20240326_000004_create_activity_kinds.rs b/crates/storage/src/migration/m20240326_000004_create_activity_kinds.rs
@@ -7,7 +7,7 @@ pub struct Migration;
 
 #[async_trait::async_trait]
 impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn up(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .create_table(
                 Table::create()
@@ -25,7 +25,7 @@ impl MigrationTrait for Migration {
             .await
     }
 
-    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn down(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .drop_table(
                 Table::drop()

diff --git a/crates/storage/src/migration/m20240326_000005_create_activities_tags.rs b/crates/storage/src/migration/m20240326_000005_create_activities_tags.rs
@@ -9,7 +9,7 @@ pub struct Migration;
 
 #[async_trait::async_trait]
 impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn up(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .create_table(
                 Table::create()
@@ -48,7 +48,7 @@ impl MigrationTrait for Migration {
             .await
     }
 
-    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn down(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .drop_table(
                 Table::drop()

diff --git a/crates/storage/src/migration/m20240326_000006_create_activities_categories.rs b/crates/storage/src/migration/m20240326_000006_create_activities_categories.rs
@@ -9,7 +9,7 @@ pub struct Migration;
 
 #[async_trait::async_trait]
 impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn up(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .create_table(
                 Table::create()
@@ -54,7 +54,7 @@ impl MigrationTrait for Migration {
             .await
     }
 
-    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn down(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .drop_table(
                 Table::drop()

diff --git a/crates/storage/src/migration/m20240327_000001_create_activity_status_values.rs b/crates/storage/src/migration/m20240327_000001_create_activity_status_values.rs
@@ -12,7 +12,7 @@ pub struct Migration;
 
 #[async_trait::async_trait]
 impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn up(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         let activity_kinds = ActivityStatusKind::iter()
             .map(|kind| {
                 Query::insert()
@@ -30,7 +30,7 @@ impl MigrationTrait for Migration {
         Ok(())
     }
 
-    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn down(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .exec_stmt(
                 Query::delete()

diff --git a/crates/storage/src/migration/m20240327_000002_create_activity_kind_values.rs b/crates/storage/src/migration/m20240327_000002_create_activity_kind_values.rs
@@ -11,7 +11,7 @@ pub struct Migration;
 
 #[async_trait::async_trait]
 impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn up(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         let activity_kinds = ActivityKind::iter()
             .map(|kind| {
                 Query::insert()
@@ -29,7 +29,7 @@ impl MigrationTrait for Migration {
         Ok(())
     }
 
-    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn down(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .exec_stmt(
                 Query::delete()

diff --git a/crates/storage/src/migration/m20240329_000001_create_descriptions.rs b/crates/storage/src/migration/m20240329_000001_create_descriptions.rs
@@ -7,7 +7,7 @@ pub struct Migration;
 
 #[async_trait::async_trait]
 impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn up(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .create_table(
                 Table::create()
@@ -29,7 +29,7 @@ impl MigrationTrait for Migration {
             .await
     }
 
-    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+    async fn down(&self, manager: &'life1 SchemaManager<'_>) -> Result<(), DbErr> {
         manager
             .drop_table(
                 Table::drop()