fix: codegen generating migrations that apply backwards (#952)

* fix: codegen generating migrations that apply backwards BREAKING CHANGE: requires inject comment in `migration/src/lib.rs` to now be `inject-above` * Update lib.rs to be nonbreaking --------- Co-authored-by: Elad Kaplan <[email protected]> Co-authored-by: Dotan J. Nahum <[email protected]>
loco-rs · Nov 9, 2024 · 52cf0b6 · 52cf0b6
1 parent 2b34485
commit 52cf0b6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/examples/demo/Cargo.lock b/examples/demo/Cargo.lock
diff --git a/examples/demo/migration/src/lib.rs b/examples/demo/migration/src/lib.rs
@@ -2,21 +2,19 @@ pub use sea_orm_migration::prelude::*;
 
 mod m20220101_000001_users;
 mod m20231103_114510_notes;
-
 mod m20240416_071825_roles;
-
 mod m20240416_082115_users_roles;
 pub struct Migrator;
 
 #[async_trait::async_trait]
 impl MigratorTrait for Migrator {
     fn migrations() -> Vec<Box<dyn MigrationTrait>> {
         vec![
-            // inject-below (do not remove this comment)
             Box::new(m20220101_000001_users::Migration),
             Box::new(m20231103_114510_notes::Migration),
             Box::new(m20240416_071825_roles::Migration),
             Box::new(m20240416_082115_users_roles::Migration),
+            // inject-above (do not remove this comment)
         ]
     }
 }
diff --git a/examples/demo/src/controllers/cache.rs b/examples/demo/src/controllers/cache.rs
@@ -1,6 +1,7 @@
-use crate::models::users;
 use loco_rs::prelude::*;
 use serde::{Deserialize, Serialize};
+
+use crate::models::users;
 #[derive(Serialize, Deserialize)]
 pub struct CacheResponse {
     value: Option<String>,

diff --git a/loco-gen/src/templates/migration.t b/loco-gen/src/templates/migration.t
@@ -6,7 +6,7 @@ skip_glob: "migration/src/*_{{mig_name}}.rs"
 message: "Migration for `{{name}}` added! You can now apply it with `$ cargo loco db migrate`."
 injections:
 - into: "migration/src/lib.rs"
-  after: "inject-below"
+  before: "inject-above"
   content: "            Box::new({{module_name}}::Migration),"
 - into: "migration/src/lib.rs"
   before: "pub struct Migrator"

diff --git a/loco-gen/src/templates/model.t b/loco-gen/src/templates/model.t
@@ -7,7 +7,7 @@ skip_glob: "migration/src/m????????_??????_{{plural_snake}}.rs"
 message: "Migration for `{{name}}` added! You can now apply it with `$ cargo loco db migrate`."
 injections:
 - into: "migration/src/lib.rs"
-  after: "inject-below"
+  before: "inject-above"
   content: "            Box::new({{module_name}}::Migration),"
 - into: "migration/src/lib.rs"
   before: "pub struct Migrator"

diff --git a/starters/rest-api/migration/src/lib.rs b/starters/rest-api/migration/src/lib.rs
@@ -10,8 +10,9 @@ pub struct Migrator;
 impl MigratorTrait for Migrator {
     fn migrations() -> Vec<Box<dyn MigrationTrait>> {
         vec![
-            // inject-below
+            // inject-below (do not remove this comment)
             Box::new(m20220101_000001_users::Migration),
+            // inject-above (do not remove this comment)
         ]
     }
 }
diff --git a/starters/saas/migration/src/lib.rs b/starters/saas/migration/src/lib.rs
@@ -10,8 +10,9 @@ pub struct Migrator;
 impl MigratorTrait for Migrator {
     fn migrations() -> Vec<Box<dyn MigrationTrait>> {
         vec![
-            // inject-below
+            // inject-below (do not remove this comment)
             Box::new(m20220101_000001_users::Migration),
+            // inject-above (do not remove this comment)
         ]
     }
 }