fix: db naming

loco-new/base_template/config/development.yaml.t

@@ -97,7 +97,7 @@ mailer:
 # Database Configuration
 database:
   # Database connection URI
-  uri: {% raw %}{{{% endraw %} get_env(name="DATABASE_URL", default="{{settings.db.endpoint}}") {% raw %}}}{% endraw %}
+  uri: {% raw %}{{{% endraw %} get_env(name="DATABASE_URL", default="{{settings.db.endpoint | replace(from='NAME', to=settings.package_name) | replace(from='ENV', to='development')}}") {% raw %}}}{% endraw %}
   # When enabled, the sql query will be logged.
   enable_logging: false
   # Set the timeout duration when acquiring a connection.

loco-new/base_template/config/test.yaml.t

@@ -97,7 +97,7 @@ mailer:
 # Database Configuration
 database:
   # Database connection URI
-  uri: {% raw %}{{{% endraw %} get_env(name="DATABASE_URL", default="{{settings.db.endpoint}}") {% raw %}}}{% endraw %}
+  uri: {% raw %}{{{% endraw %} get_env(name="DATABASE_URL", default="{{settings.db.endpoint | replace(from='NAME', to=settings.package_name) | replace(from='ENV', to='test')}}") {% raw %}}}{% endraw %}
   # When enabled, the sql query will be logged.
   enable_logging: false
   # Set the timeout duration when acquiring a connection.

loco-new/devnew.sh

@@ -1 +1 @@
-LOCO_DEV_MODE_PATH=../../ loco new
+LOCO_DEV_MODE_PATH=../../ cargo run -- new

loco-new/src/wizard.rs

@@ -71,8 +71,8 @@ impl DBOption {
     #[must_use]
     pub const fn endpoint_config(&self) -> &str {
         match self {
-            Self::Sqlite => "sqlite://loco_app.sqlite?mode=rwc",
-            Self::Postgres => "postgres://loco:loco@localhost:5432/loco_app",
+            Self::Sqlite => "sqlite://NAME_ENV.sqlite?mode=rwc",
+            Self::Postgres => "postgres://loco:loco@localhost:5432/NAME_ENV",
             Self::None => "",
         }
     }

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

@@ -1,6 +1,7 @@
 ---
-source: loco-new/tests/templates/auth.rs
+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::{
@@ -51,5 +52,6 @@ impl Hooks for App {
         Ok(())
     }
     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,6 +1,7 @@
 ---
-source: loco-new/tests/templates/auth.rs
+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::{
@@ -51,5 +52,6 @@ impl Hooks for App {
         Ok(())
     }
     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,6 +1,7 @@
 ---
-source: loco-new/tests/templates/background.rs
+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::{
@@ -54,5 +55,6 @@ impl Hooks for App {
         Ok(())
     }
     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,6 +1,7 @@
 ---
-source: loco-new/tests/templates/background.rs
+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::{
@@ -54,5 +55,6 @@ impl Hooks for App {
         Ok(())
     }
     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,6 +1,7 @@
 ---
-source: loco-new/tests/templates/background.rs
+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::{
@@ -51,5 +52,6 @@ impl Hooks for App {
         Ok(())
     }
     fn register_tasks(_tasks: &mut Tasks) {
+        // tasks-inject (do not remove)
     }
 }

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

@@ -1,6 +1,7 @@
 ---
-source: loco-new/tests/templates/background.rs
+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::{
@@ -54,5 +55,6 @@ impl Hooks for App {
         Ok(())
     }
     fn register_tasks(_tasks: &mut Tasks) {
+        // tasks-inject (do not remove)
     }
 }

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

@@ -1,12 +1,13 @@
 ---
-source: loco-new/tests/templates/db.rs
-expression: "format!(\"{:#?}\",\n    assertion::yaml::get_value_at_path(&content, &[\"database\"]).unwrap())"
+source: tests/templates/db.rs
+expression: "format!(\"{:#?}\",\nassertion::yaml::get_value_at_path(&content, &[\"database\"]).unwrap())"
+snapshot_kind: text
 ---
 Mapping {
     "uri": Mapping {
         Mapping {
             "get_env(name=\"DATABASE_URL\"": Null,
-            "default=\"postgres://loco:loco@localhost:5432/loco_app\")": Null,
+            "default=\"postgres://loco:loco@localhost:5432/loco-app-test_development\")": Null,
         }: Null,
     },
     "enable_logging": Bool(false),

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

@@ -1,12 +1,13 @@
 ---
-source: loco-new/tests/templates/db.rs
-expression: "format!(\"{:#?}\",\n    assertion::yaml::get_value_at_path(&content, &[\"database\"]).unwrap())"
+source: tests/templates/db.rs
+expression: "format!(\"{:#?}\",\nassertion::yaml::get_value_at_path(&content, &[\"database\"]).unwrap())"
+snapshot_kind: text
 ---
 Mapping {
     "uri": Mapping {
         Mapping {
             "get_env(name=\"DATABASE_URL\"": Null,
-            "default=\"sqlite://loco_app.sqlite?mode=rwc\")": Null,
+            "default=\"sqlite://loco-app-test_development.sqlite?mode=rwc\")": Null,
         }: Null,
     },
     "enable_logging": Bool(false),

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

@@ -1,12 +1,13 @@
 ---
-source: loco-new/tests/templates/db.rs
-expression: "format!(\"{:#?}\",\n    assertion::yaml::get_value_at_path(&content, &[\"database\"]).unwrap())"
+source: tests/templates/db.rs
+expression: "format!(\"{:#?}\",\nassertion::yaml::get_value_at_path(&content, &[\"database\"]).unwrap())"
+snapshot_kind: text
 ---
 Mapping {
     "uri": Mapping {
         Mapping {
             "get_env(name=\"DATABASE_URL\"": Null,
-            "default=\"postgres://loco:loco@localhost:5432/loco_app\")": Null,
+            "default=\"postgres://loco:loco@localhost:5432/loco-app-test_test\")": Null,
         }: Null,
     },
     "enable_logging": Bool(false),

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

@@ -1,12 +1,13 @@
 ---
-source: loco-new/tests/templates/db.rs
-expression: "format!(\"{:#?}\",\n    assertion::yaml::get_value_at_path(&content, &[\"database\"]).unwrap())"
+source: tests/templates/db.rs
+expression: "format!(\"{:#?}\",\nassertion::yaml::get_value_at_path(&content, &[\"database\"]).unwrap())"
+snapshot_kind: text
 ---
 Mapping {
     "uri": Mapping {
         Mapping {
             "get_env(name=\"DATABASE_URL\"": Null,
-            "default=\"sqlite://loco_app.sqlite?mode=rwc\")": Null,
+            "default=\"sqlite://loco-app-test_test.sqlite?mode=rwc\")": Null,
         }: Null,
     },
     "enable_logging": Bool(false),

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

@@ -1,6 +1,7 @@
 ---
-source: loco-new/tests/templates/db.rs
+source: tests/templates/db.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::{
@@ -51,5 +52,6 @@ impl Hooks for App {
         Ok(())
     }
     fn register_tasks(_tasks: &mut Tasks) {
+        // tasks-inject (do not remove)
     }
 }

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

@@ -1,6 +1,7 @@
 ---
-source: loco-new/tests/templates/db.rs
+source: tests/templates/db.rs
 expression: "std::fs::read_to_string(generator.path(\"src/app.rs\")).expect(\"could not open file\")"
+snapshot_kind: text
 ---
 use std::path::Path;
 use async_trait::async_trait;
@@ -59,6 +60,7 @@ impl Hooks for App {
     }
     fn register_tasks(tasks: &mut Tasks) {
         tasks.register(tasks::seed::SeedData);
+        // tasks-inject (do not remove)
     }
     async fn truncate(db: &DatabaseConnection) -> Result<()> {
         truncate_table(db, users::Entity).await?;

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

@@ -1,6 +1,7 @@
 ---
-source: loco-new/tests/templates/db.rs
+source: tests/templates/db.rs
 expression: "std::fs::read_to_string(generator.path(\"src/app.rs\")).expect(\"could not open file\")"
+snapshot_kind: text
 ---
 use std::path::Path;
 use async_trait::async_trait;
@@ -59,6 +60,7 @@ impl Hooks for App {
     }
     fn register_tasks(tasks: &mut Tasks) {
         tasks.register(tasks::seed::SeedData);
+        // tasks-inject (do not remove)
     }
     async fn truncate(db: &DatabaseConnection) -> Result<()> {
         truncate_table(db, users::Entity).await?;

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

@@ -1,6 +1,7 @@
 ---
-source: loco-new/tests/templates/initializers.rs
+source: tests/templates/initializers.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::{
@@ -51,5 +52,6 @@ impl Hooks for App {
         Ok(())
     }
     fn register_tasks(_tasks: &mut Tasks) {
+        // tasks-inject (do not remove)
     }
 }

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

@@ -1,6 +1,7 @@
 ---
-source: loco-new/tests/templates/initializers.rs
+source: tests/templates/initializers.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::{
@@ -51,5 +52,6 @@ impl Hooks for App {
         Ok(())
     }
     fn register_tasks(_tasks: &mut Tasks) {
+        // tasks-inject (do not remove)
     }
 }