changed the directory structure of the generated entity files

Signed-off-by: involk-secure-1609 <[email protected]>

Author: kev1N916

sea-orm-cli/src/commands/generate.rs

@@ -239,19 +239,24 @@ pub async fn run_generate_command(
             );
             let output = EntityTransformer::transform(table_stmts)?.generate(&writer_context);
 
-            let dir = Path::new(&output_dir);
-            fs::create_dir_all(dir)?;
+            let entities_dir_path = output_dir.clone() + "/entities";
+
+            let output_dir = Path::new(&(output_dir));
+            let entities_dir = Path::new(&(entities_dir_path));
+            fs::create_dir_all(entities_dir)?;
 
             for OutputFile { name, content } in output.files.iter() {
-                let file_path = dir.join(name);
+                let file_path = output_dir.join(name);
                 println!("Writing {}", file_path.display());
                 let mut file = fs::File::create(file_path)?;
                 file.write_all(content.as_bytes())?;
             }
 
             // Format each of the files
             for OutputFile { name, .. } in output.files.iter() {
-                let exit_status = Command::new("rustfmt").arg(dir.join(name)).status()?; // Get the status code
+                let exit_status = Command::new("rustfmt")
+                    .arg(output_dir.join(name))
+                    .status()?; // Get the status code
                 if !exit_status.success() {
                     // Propagate the error if any
                     return Err(format!("Fail to format file `{name}`").into());

sea-orm-codegen/src/entity/writer.rs

@@ -229,7 +229,7 @@ impl EntityWriter {
         self.entities
             .iter()
             .map(|entity| {
-                let entity_file = format!("{}.rs", entity.get_table_name_snake_case());
+                let entity_file = format!("entities/{}.rs", entity.get_table_name_snake_case());
                 let column_info = entity
                     .columns
                     .iter()
@@ -335,7 +335,7 @@ impl EntityWriter {
 
         let file_name = match lib {
             true => "lib.rs".to_owned(),
-            false => "mod.rs".to_owned(),
+            false => "entities.rs".to_owned(),
         };
 
         OutputFile {
@@ -363,7 +363,7 @@ impl EntityWriter {
             .collect();
         Self::write(&mut lines, code_blocks);
         OutputFile {
-            name: "prelude.rs".to_owned(),
+            name: "entities/prelude.rs".to_owned(),
             content: lines.join("\n"),
         }
     }