refactor(filemanager): remove aws directory from migrations as its no…

…t that useful a distinction for now
umccr · Jan 1, 2024 · 8647464 · 8647464
1 parent 205adb1
commit 8647464
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/lib/workload/stateful/filemanager/build.rs b/lib/workload/stateful/filemanager/build.rs
@@ -1,5 +1,5 @@
 // generated by `sqlx migrate build-script`
 fn main() {
     // trigger recompilation when a new migration is added
-    println!("cargo:rerun-if-changed=migrations");
-}
+    println!("cargo:rerun-if-changed=database/migrations");
+}
diff --git a/...grations/aws/0002_add_s3_object_table.sql → ...e/migrations/0002_add_s3_object_table.sql b/...grations/aws/0002_add_s3_object_table.sql → ...e/migrations/0002_add_s3_object_table.sql
diff --git a/lib/workload/stateful/filemanager/filemanager/src/database/aws/migration.rs b/lib/workload/stateful/filemanager/filemanager/src/database/aws/migration.rs
@@ -27,15 +27,7 @@ impl Migration {
 
     /// Get the underlying sqlx migrator for the migrations.
     pub fn migrator() -> Migrator {
-        let mut migrator = migrate!("../database/migrations");
-        let aws_migrations = migrate!("../database/migrations/aws");
-
-        migrator
-            .migrations
-            .to_mut()
-            .extend(aws_migrations.migrations.into_owned());
-
-        migrator
+        migrate!("../database/migrations")
     }
 
     /// Get a reference to the database client.