mbess/sqlxgentools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

feat: add models path arg

Browse source
This commit is contained in:
Matthieu Bessat 2025-06-02 11:39:05 +02:00
parent e4f6c0f12d
commit 21c1f2e069
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/sqlxgentools_cli/src/gen_repositories.rs
View file

@ -26,7 +26,6 @@ fn gen_get_all_method(model: &Model) -> TokenStream {
fn gen_get_by_id_method(model: &Model) -> TokenStream { fn gen_get_by_id_method(model: &Model) -> TokenStream {
let resource_ident = format_ident!("{}", &model.name); let resource_ident = format_ident!("{}", &model.name);
let error_msg = format!("Failed to fetch resource {:?}", model.name.clone());
let primary_key = &model.fields.iter() let primary_key = &model.fields.iter()
.find(|f| f.is_primary) .find(|f| f.is_primary)
.expect("A model must have at least one primary key") .expect("A model must have at least one primary key")
@ -36,12 +35,11 @@ fn gen_get_by_id_method(model: &Model) -> TokenStream {
let func_name_ident = format_ident!("get_by_{}", primary_key); let func_name_ident = format_ident!("get_by_{}", primary_key);
quote! { quote! {
pub async fn #func_name_ident(&self, item_id: &str) -> Result<#resource_ident> { pub async fn #func_name_ident(&self, item_id: &str) -> Result<#resource_ident, sqlx::Error> {
sqlx::query_as::<_, #resource_ident>(#select_query) sqlx::query_as::<_, #resource_ident>(#select_query)
.bind(item_id) .bind(item_id)
.fetch_one(&self.db.0) .fetch_one(&self.db.0)
.await .await
.context(#error_msg)
} }
} }
} }
@ -186,7 +184,7 @@ fn generate_repository_file(model: &Model) -> Result<SourceNodeContainer> {
let base_repository_code: TokenStream = quote! { let base_repository_code: TokenStream = quote! {
use crate::models::#resource_module_ident::#resource_ident; use crate::models::#resource_module_ident::#resource_ident;
use crate::services::database::Database; use crate::db::Database;
use anyhow::{Result, Context}; use anyhow::{Result, Context};
pub struct #repository_ident { pub struct #repository_ident {

12
lib/sqlxgentools_cli/src/main.rs
View file

@ -38,6 +38,9 @@ struct GenerateMigration {
/// Generate Rust SQLx repositories code /// Generate Rust SQLx repositories code
#[argh(subcommand, name = "gen-repositories")] #[argh(subcommand, name = "gen-repositories")]
struct GenerateRepositories { struct GenerateRepositories {
/// path of the directory that contains repositories
#[argh(option, short = 'o')]
output: Option<String>
} }
#[derive(FromArgs, PartialEq, Debug)] #[derive(FromArgs, PartialEq, Debug)]
@ -58,6 +61,10 @@ struct GeneratorArgs {
#[argh(option)] #[argh(option)]
project_root: Option<String>, project_root: Option<String>,
/// path of the directory containing models
#[argh(option, short = 'm')]
models_path: Option<String>,
#[argh(subcommand)] #[argh(subcommand)]
nested: GeneratorArgsSubCommands nested: GeneratorArgsSubCommands
} }
@ -97,6 +104,9 @@ pub fn main() -> Result<()> {
// search for a models modules // search for a models modules
let models_mod_location = "src/models.rs"; let models_mod_location = "src/models.rs";
let mut models_mod_path = project_root_path.join(models_mod_location); let mut models_mod_path = project_root_path.join(models_mod_location);
if let Some(models_path) = args.models_path {
models_mod_path = project_root_path.join(models_path);
}
if !models_mod_path.exists() { if !models_mod_path.exists() {
let models_mod_location = "src/models/mod.rs"; let models_mod_location = "src/models/mod.rs";
models_mod_path = project_root_path.join(models_mod_location); models_mod_path = project_root_path.join(models_mod_location);
@ -115,7 +125,7 @@ pub fn main() -> Result<()> {
GeneratorArgsSubCommands::GenerateRepositories(opts) => { GeneratorArgsSubCommands::GenerateRepositories(opts) => {
eprintln!("Generating repositories…"); eprintln!("Generating repositories…");
// search for a repository module // search for a repository module
let repositories_mod_location = "src/repositories"; let repositories_mod_location = opts.output.unwrap_or("src/repositories".to_string());
let repositories_mod_path = project_root_path.join(repositories_mod_location); let repositories_mod_path = project_root_path.join(repositories_mod_location);
if !repositories_mod_path.exists() { if !repositories_mod_path.exists() {
return Err(anyhow!("Could not resolve repositories modules.")); return Err(anyhow!("Could not resolve repositories modules."));