From 76913073b57b11033ea16a797473c607db3c69f4 Mon Sep 17 00:00:00 2001 From: Yaw Boakye Date: Fri, 26 Jul 2024 13:06:06 +0100 Subject: [PATCH] in db config, prepare simple values to blocks --- guides/source/command_line.md | 2 +- .../rails/app/templates/config/databases/mysql.yml.tt | 2 +- .../rails/app/templates/config/databases/postgresql.yml.tt | 2 +- .../rails/app/templates/config/databases/sqlite3.yml.tt | 4 ++-- .../rails/app/templates/config/databases/trilogy.yml.tt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/guides/source/command_line.md b/guides/source/command_line.md index 8a42c728c1216..c2cdb7bfd2f07 100644 --- a/guides/source/command_line.md +++ b/guides/source/command_line.md @@ -109,7 +109,7 @@ default: &default # For details on connection pooling, see Rails configuration guide # https://guides.rubyonrails.org/configuring.html#database-pooling - pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + pool: <%= ENV.fetch("RAILS_MAX_THREADS", 5) %> development: <<: *default diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml.tt b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml.tt index e90be60d2f6d8..2ae8bba28324e 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml.tt @@ -12,7 +12,7 @@ default: &default adapter: mysql2 encoding: utf8mb4 - pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + pool: <%%= ENV.fetch("RAILS_MAX_THREADS", 5) %> username: root password: <% if database.socket -%> diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml.tt b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml.tt index 590e5d5d93d03..ba47f6e9cba96 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml.tt @@ -17,7 +17,7 @@ default: &default encoding: unicode # For details on connection pooling, see Rails configuration guide # https://guides.rubyonrails.org/configuring.html#database-pooling - pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + pool: <%%= ENV.fetch("RAILS_MAX_THREADS", 5) %> <% if devcontainer? -%> <%% if ENV["DB_HOST"] %> host: <%%= ENV["DB_HOST"] %> diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml.tt b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml.tt index 3875752cf72d9..25b23cb983e61 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml.tt @@ -6,7 +6,7 @@ # default: &default adapter: sqlite3 - pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + pool: <%%= ENV.fetch("RAILS_MAX_THREADS", 5) %> timeout: 5000 development: @@ -37,4 +37,4 @@ production: production: <<: *default database: storage/production.sqlite3 -<%- end -%> \ No newline at end of file +<%- end -%> diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/trilogy.yml.tt b/railties/lib/rails/generators/rails/app/templates/config/databases/trilogy.yml.tt index 73b9000f4cc04..cf8afc6c4bc81 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/trilogy.yml.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/trilogy.yml.tt @@ -12,7 +12,7 @@ default: &default adapter: trilogy encoding: utf8mb4 - pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + pool: <%%= ENV.fetch("RAILS_MAX_THREADS", 5) %> username: root password: <% if database.socket -%>