Merge branch 'master' into patch-1

examples/demo/tests/cmd/cli.trycmd

@@ -40,6 +40,7 @@ Commands:
   status    Migration status
   entities  Generate entity .rs files from database schema
   truncate  Truncate data in tables (without dropping)
+  seed      Seed your database with initial data or dump tables to files
   help      Print this message or the help of the given subcommand(s)
 
 Options:

loco-new/base_template/src/app.rs.t

@@ -23,6 +23,7 @@ use migration::Migrator;
 use sea_orm::DatabaseConnection;
 {%- endif %}
 
+#[allow(unused_imports)]
 use crate::{
     controllers
     {%- if settings.initializers -%}
@@ -89,15 +90,9 @@ impl Hooks for App {
         {%- endif %}
         Ok(())
     }
-    
-    {%- if settings.db %}
+
+    #[allow(unused_variables)]
     fn register_tasks(tasks: &mut Tasks) {
-    {%- else %}
-    fn register_tasks(_tasks: &mut Tasks) {
-    {%- endif %}     
-        {%- if settings.db %}
-        tasks.register(tasks::seed::SeedData);
-        {%- endif %}
         // tasks-inject (do not remove)
     }
 

loco-new/base_template/src/tasks/mod.rs.t

@@ -1,3 +0,0 @@
-{%- if settings.db %}
-pub mod seed;
-{%- endif %}

loco-new/base_template/tests/tasks/mod.rs.t

@@ -1,3 +0,0 @@
-{%- if settings.db -%} 
-pub mod seed;
-{%- endif -%}

loco-new/setup.rhai

@@ -51,17 +51,15 @@ gen.copy_file("config/production.yaml");            // Production config
 // Database-Related Files
 // =====================
 if db {
-   gen.copy_template_dir("migration");                       // Database migrations directory
+   gen.copy_template_dir("migration");              // Database migrations directory
    gen.copy_dir("src/models");                      // Models directory, copied if background enabled
-   gen.copy_file("src/tasks/seed.rs");              // Task to seed database
    gen.copy_dir("src/fixtures");                    // Database fixtures directory
    gen.copy_template("examples/playground.rs.t");   // Example playground template with DB setup
 
    // Test modules related to database models
    gen.copy_file("tests/models/mod.rs");            // Models tests root
    gen.copy_dir("tests/models/snapshots");          // Test snapshots for models
    gen.copy_template("tests/models/users.rs.t");    // User model test template
-   gen.copy_template("tests/tasks/seed.rs.t");      // Seed tasks test template
    gen.copy_template("tests/requests/prepare_data.rs.t"); // Data preparation template
 }
 

loco-new/tests/templates/auth.rs

@@ -1,9 +1,9 @@
-use super::*;
-
-use crate::assertion;
 use loco::settings;
 use rstest::rstest;
 
+use super::*;
+use crate::assertion;
+
 pub fn run_generator(enable_auth: bool) -> TestGenerator {
     let settings = settings::Settings {
         package_name: "loco-app-test".to_string(),

loco-new/tests/templates/db.rs

@@ -122,20 +122,6 @@ fn test_src_bin_tool_rs(
     }
 }
 
-#[rstest]
-fn test_tasks_mod_rs(#[values(DBOption::None, DBOption::Sqlite, DBOption::Postgres)] db: DBOption) {
-    let generator = run_generator(db.clone());
-
-    let content =
-        std::fs::read_to_string(generator.path("src/tasks/mod.rs")).expect("could not open file");
-
-    if db.enable() {
-        assertion::string::assert_line_regex(&content, "(?m)^pub mod seed;$");
-    } else {
-        assertion::string::assert_str_not_exists(&content, "pub mod seed");
-    }
-}
-
 #[rstest]
 fn test_tests_mod_rs(#[values(DBOption::None, DBOption::Sqlite, DBOption::Postgres)] db: DBOption) {
     let generator = run_generator(db.clone());
@@ -149,19 +135,3 @@ fn test_tests_mod_rs(#[values(DBOption::None, DBOption::Sqlite, DBOption::Postgr
         assertion::string::assert_str_not_exists(&content, "mod models;");
     }
 }
-
-#[rstest]
-fn test_tests_tasks_mod_rs(
-    #[values(DBOption::None, DBOption::Sqlite, DBOption::Postgres)] db: DBOption,
-) {
-    let generator = run_generator(db.clone());
-
-    let content =
-        std::fs::read_to_string(generator.path("tests/tasks/mod.rs")).expect("could not open file");
-
-    if db.enable() {
-        assertion::string::assert_line_regex(&content, "(?m)^pub mod seed;$");
-    } else {
-        assertion::string::assert_str_not_exists(&content, "pub mod seed");
-    }
-}

loco-new/tests/templates/features.rs

@@ -1,7 +1,7 @@
-use super::*;
+use loco::settings;
 
+use super::*;
 use crate::assertion;
-use loco::settings;
 
 pub fn run_generator(default_features: bool, names: &[&str]) -> TestGenerator {
     let settings = settings::Settings {

loco-new/tests/templates/initializers.rs

@@ -1,9 +1,9 @@
-use super::*;
-
-use crate::assertion;
 use loco::settings;
 use rstest::rstest;
 
+use super::*;
+use crate::assertion;
+
 pub fn run_generator(initializers: Option<settings::Initializers>) -> TestGenerator {
     let settings = settings::Settings {
         initializers,

loco-new/tests/templates/mailer.rs

@@ -1,9 +1,9 @@
-use super::*;
-
-use crate::assertion;
 use loco::settings;
 use rstest::rstest;
 
+use super::*;
+use crate::assertion;
+
 pub fn run_generator(enable_mailer: bool) -> TestGenerator {
     let settings = settings::Settings {
         mailer: enable_mailer,

loco-new/tests/templates/mod.rs

@@ -1,12 +1,13 @@
+use std::{
+    path::{Path, PathBuf},
+    sync::Arc,
+};
+
 use loco::{
     generator::{self, executer::FileSystem, template},
     settings,
 };
 use rand::{rngs::StdRng, SeedableRng};
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-};
 
 mod asset;
 mod auth;

loco-new/tests/templates/module_name.rs

@@ -46,12 +46,7 @@ fn test_use_name(#[values("src/bin/main.rs", "tests/requests/home.rs")] file: &s
 
 #[rstest]
 fn test_use_name_with_db(
-    #[values(
-        "tests/models/users.rs",
-        "tests/requests/prepare_data.rs",
-        "tests/tasks/seed.rs"
-    )]
-    file: &str,
+    #[values("tests/models/users.rs", "tests/requests/prepare_data.rs")] file: &str,
 ) {
     let generator = super::db::run_generator(DBOption::Sqlite);
 

loco-new/tests/templates/snapshots/r#mod__templates__auth__src_app_rs_auth_false.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/templates/auth.rs
 expression: "std::fs::read_to_string(generator.path(\"src/app.rs\")).expect(\"could not open file\")"
-snapshot_kind: text
 ---
 use async_trait::async_trait;
 use loco_rs::{
@@ -15,6 +14,7 @@ use loco_rs::{
     Result,
 };
 
+#[allow(unused_imports)]
 use crate::{
     controllers,
 };
@@ -51,7 +51,9 @@ impl Hooks for App {
     async fn connect_workers(_ctx: &AppContext, _queue: &Queue) -> Result<()> {
         Ok(())
     }
-    fn register_tasks(_tasks: &mut Tasks) {
+
+    #[allow(unused_variables)]
+    fn register_tasks(tasks: &mut Tasks) {
         // tasks-inject (do not remove)
     }
 }

loco-new/tests/templates/snapshots/r#mod__templates__auth__src_app_rs_auth_true.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/templates/auth.rs
 expression: "std::fs::read_to_string(generator.path(\"src/app.rs\")).expect(\"could not open file\")"
-snapshot_kind: text
 ---
 use async_trait::async_trait;
 use loco_rs::{
@@ -15,6 +14,7 @@ use loco_rs::{
     Result,
 };
 
+#[allow(unused_imports)]
 use crate::{
     controllers,
 };
@@ -51,7 +51,9 @@ impl Hooks for App {
     async fn connect_workers(_ctx: &AppContext, _queue: &Queue) -> Result<()> {
         Ok(())
     }
-    fn register_tasks(_tasks: &mut Tasks) {
+
+    #[allow(unused_variables)]
+    fn register_tasks(tasks: &mut Tasks) {
         // tasks-inject (do not remove)
     }
 }

loco-new/tests/templates/snapshots/r#mod__templates__background__src_app_rs_Async.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/templates/background.rs
 expression: "std::fs::read_to_string(generator.path(\"src/app.rs\")).expect(\"could not open file\")"
-snapshot_kind: text
 ---
 use async_trait::async_trait;
 use loco_rs::{
@@ -16,6 +15,7 @@ use loco_rs::{
     Result,
 };
 
+#[allow(unused_imports)]
 use crate::{
     controllers
     , workers::downloader::DownloadWorker,
@@ -54,7 +54,9 @@ impl Hooks for App {
         queue.register(DownloadWorker::build(ctx)).await?;
         Ok(())
     }
-    fn register_tasks(_tasks: &mut Tasks) {
+
+    #[allow(unused_variables)]
+    fn register_tasks(tasks: &mut Tasks) {
         // tasks-inject (do not remove)
     }
 }

loco-new/tests/templates/snapshots/r#mod__templates__background__src_app_rs_Blocking.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/templates/background.rs
 expression: "std::fs::read_to_string(generator.path(\"src/app.rs\")).expect(\"could not open file\")"
-snapshot_kind: text
 ---
 use async_trait::async_trait;
 use loco_rs::{
@@ -16,6 +15,7 @@ use loco_rs::{
     Result,
 };
 
+#[allow(unused_imports)]
 use crate::{
     controllers
     , workers::downloader::DownloadWorker,
@@ -54,7 +54,9 @@ impl Hooks for App {
         queue.register(DownloadWorker::build(ctx)).await?;
         Ok(())
     }
-    fn register_tasks(_tasks: &mut Tasks) {
+
+    #[allow(unused_variables)]
+    fn register_tasks(tasks: &mut Tasks) {
         // tasks-inject (do not remove)
     }
 }

loco-new/tests/templates/snapshots/r#mod__templates__background__src_app_rs_None.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/templates/background.rs
 expression: "std::fs::read_to_string(generator.path(\"src/app.rs\")).expect(\"could not open file\")"
-snapshot_kind: text
 ---
 use async_trait::async_trait;
 use loco_rs::{
@@ -15,6 +14,7 @@ use loco_rs::{
     Result,
 };
 
+#[allow(unused_imports)]
 use crate::{
     controllers,
 };
@@ -51,7 +51,9 @@ impl Hooks for App {
     async fn connect_workers(_ctx: &AppContext, _queue: &Queue) -> Result<()> {
         Ok(())
     }
-    fn register_tasks(_tasks: &mut Tasks) {
+
+    #[allow(unused_variables)]
+    fn register_tasks(tasks: &mut Tasks) {
         // tasks-inject (do not remove)
     }
 }