diff --git a/TODO.md b/TODO.md index 47d28ce..5339cc5 100644 --- a/TODO.md +++ b/TODO.md @@ -14,9 +14,7 @@ - insert - update - delete_by_id -- [x] delete_many by ids - -- [ ] Better CLI documentation +- [ ] delete_many - [ ] Config file for project - configure models path @@ -28,12 +26,5 @@ - [ ] Support basic one to many, many to one, belongs to relationships - [ ] Support generating inner join SQL query -- [ ] Better, cleaner migration support UP and DOWN +- [ ] Better, cleaner migration support -- [ ] Add a version side -- [ ] man page -- [ ] Quick start guide -- [ ] Static website - -- [ ] release -- [ ] add comment in the start of the generated repositories files diff --git a/lib/sqlxgentools_cli/src/main.rs b/lib/sqlxgentools_cli/src/main.rs index a5658f9..7de6696 100644 --- a/lib/sqlxgentools_cli/src/main.rs +++ b/lib/sqlxgentools_cli/src/main.rs @@ -19,17 +19,8 @@ pub struct SqlGeneratorModelAttr { #[derive(FromAttr, PartialEq, Debug, Default)] #[attribute(ident = sql_generator_field)] pub struct SqlGeneratorFieldAttr { - /// indicate a primary key - /// primary usually means unique + indexed is_primary: Option, - - /// indicate a column consists of unique values is_unique: Option, - - /// name of the method to retreive a list of current type items from the point of view of the - /// remote foreign table - /// generally it's the same name as the current table - /// it can change depending on the context reverse_relation_name: Option, /// to indicate that this field will be used to obtains entities @@ -38,7 +29,7 @@ pub struct SqlGeneratorFieldAttr { } #[derive(FromArgs, PartialEq, Debug)] -/// Generate .sql files with CREATE TABLE migrations +/// Generate SQL CREATE TABLE migrations #[argh(subcommand, name = "gen-migrations")] struct GenerateMigration { /// path of file where to write all in one generated SQL migration @@ -63,15 +54,13 @@ enum GeneratorArgsSubCommands { } #[derive(FromArgs)] -/// The Sqlxgentools CLI. -/// Sqlxgentools is a set of library and code generators program, -/// to help you to use a Sqlite3 database in your Rust app with Sqlx. +/// SQLX Generator args struct GeneratorArgs { - /// path of your main cargo project directory (with the projcet root Cargo.toml file) + /// path where to find Cargo.toml #[argh(option)] project_root: Option, - /// path of the project sub-directory containing models definitions + /// path of the directory containing models #[argh(option, short = 'm')] models_path: Option, @@ -134,7 +123,7 @@ pub fn main() -> Result<()> { { models_mod_path.pop(); } - eprintln!("Found models in project, parsing models…"); + eprintln!("Found models in project, parsing models"); let models = parse_models::parse_models_from_module(&models_mod_path)?; eprintln!( "Found and parsed a grand total of {} sqlxgentools compatible models.", diff --git a/lib/sqlxgentools_cli/src/parse_models.rs b/lib/sqlxgentools_cli/src/parse_models.rs index d004923..dbe5648 100644 --- a/lib/sqlxgentools_cli/src/parse_models.rs +++ b/lib/sqlxgentools_cli/src/parse_models.rs @@ -270,7 +270,7 @@ fn parse_models_from_module_inner(module_path: &Path) -> Result> { let mut models: Vec = vec![]; if module_path.is_file() { - eprintln!("Looking for models to parse from path {:?}.", module_path); + println!("Looking for models to parse from path {:?}.", module_path); models.extend(parse_models(module_path)?); return Ok(models); }