Merge pull request #211 from Bootstrap-Academy/migrations

refactor(persistence): reorganize migrations

Author: Defelo

.github/workflows/check.yml

@@ -50,7 +50,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: DeterminateSystems/nix-installer-action@main
       - run: |
-          for m in academy_persistence/postgres/migrations/*.up.sql; do
+          for m in academy_persistence/postgres/migrations/*/up.sql; do
             psql -h 127.0.0.1 academy academy < "$m"
           done
       - run: nix run --accept-flake-config .#scripts.generate-clorinde

academy_persistence/postgres/build.rs

@@ -29,20 +29,18 @@ fn emit_migrations(path: &Path) {
 }
 
 fn collect_migrations() -> BTreeMap<String, (String, String)> {
-    let dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("migrations");
+    PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+        .join("migrations")
+        .read_dir()
+        .unwrap()
+        .map(|file| {
+            let file = file.unwrap();
+            let name = file.file_name().into_string().unwrap();
 
-    let mut out = BTreeMap::new();
-    for file in dir.read_dir().unwrap() {
-        let file = file.unwrap();
-        let name = file.file_name().into_string().unwrap();
+            let up = std::fs::read_to_string(file.path().join("up.sql")).unwrap();
+            let down = std::fs::read_to_string(file.path().join("down.sql")).unwrap();
 
-        if let Some(name) = name.strip_suffix(".up.sql").map(ToOwned::to_owned) {
-            let (up, _) = out.entry(name).or_insert_with(Default::default);
-            *up = std::fs::read_to_string(file.path()).unwrap();
-        } else if let Some(name) = name.strip_suffix(".down.sql").map(ToOwned::to_owned) {
-            let (_, down) = out.entry(name).or_insert_with(Default::default);
-            *down = std::fs::read_to_string(file.path()).unwrap();
-        }
-    }
-    out
+            (name, (up, down))
+        })
+        .collect()
 }