diff options
| author | Melody Horn <melody@boringcactus.com> | 2021-06-30 16:31:21 -0600 |
|---|---|---|
| committer | Melody Horn <melody@boringcactus.com> | 2021-06-30 16:31:21 -0600 |
| commit | bc874c9d1363d3bf8865ea7a629eb976e23386b3 (patch) | |
| tree | 17327e9d10acbb198b915592391ef9446c5b4c37 /src | |
| parent | a4f6e7af6576744e238ecafda826cbe602c23db5 (diff) | |
| download | tosin-bc874c9d1363d3bf8865ea7a629eb976e23386b3.tar.gz tosin-bc874c9d1363d3bf8865ea7a629eb976e23386b3.zip | |
use the actual path to the app dir for make_migrations
Diffstat (limited to 'src')
| -rw-r--r-- | src/apps.rs | 1 | ||||
| -rw-r--r-- | src/cli/make_migrations.rs | 13 | ||||
| -rw-r--r-- | src/contrib/admin/mod.rs | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/apps.rs b/src/apps.rs index 8c16136..c2fe099 100644 --- a/src/apps.rs +++ b/src/apps.rs @@ -3,6 +3,7 @@ use crate::db::models::ModelMeta; pub struct AppConfig { pub name: &'static str, + pub mod_rs_path: &'static str, pub models: &'static [ModelMeta], pub migrations: &'static [Migration], } diff --git a/src/cli/make_migrations.rs b/src/cli/make_migrations.rs index e0653b6..d4ddcbf 100644 --- a/src/cli/make_migrations.rs +++ b/src/cli/make_migrations.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; use std::fs; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use quote::{quote, ToTokens}; use structopt::StructOpt; @@ -131,12 +131,11 @@ impl MakeMigrations { }; let file_name = format!("m_{:04}_{}.rs", next_id, name); let file_text = file.into_token_stream().to_string(); - let app_folder = app.name.split("::").skip(1).collect::<PathBuf>(); - // TODO don't explode if running in a weird place - let file_path = PathBuf::from("src") - .join(app_folder) - .join("migrations") - .join(file_name); + let app_mod_rs = Path::new(app.mod_rs_path); + let app_folder = app_mod_rs + .parent() + .expect("app mod.rs lives at filesystem root???"); + let file_path = app_folder.join("migrations").join(file_name); println!("Saving migration to {}...", file_path.display()); fs::write(file_path, file_text).unwrap(); // TODO cargo fmt diff --git a/src/contrib/admin/mod.rs b/src/contrib/admin/mod.rs index 7b442b2..300eeac 100644 --- a/src/contrib/admin/mod.rs +++ b/src/contrib/admin/mod.rs @@ -6,6 +6,7 @@ pub mod site; pub const APP: AppConfig = AppConfig { name: module_path!(), + mod_rs_path: file!(), models: models::ALL, migrations: migrations::ALL, }; |