aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorGeorge Claghorn <george.claghorn@gmail.com>2017-08-19 21:24:57 -0400
committerGitHub <noreply@github.com>2017-08-19 21:24:57 -0400
commitba282f02bd40243adcb3221e2b1a337789c2e9b9 (patch)
tree97f3e02f1af6b5dd03c9ee90291ec195f7b1688a /guides
parent1da7fa87288efdc89aa01d7ef71998e770b81671 (diff)
parente42e8319c08188700c5c45a6623ca0067ea1f1ed (diff)
downloadrails-ba282f02bd40243adcb3221e2b1a337789c2e9b9.tar.gz
rails-ba282f02bd40243adcb3221e2b1a337789c2e9b9.tar.bz2
rails-ba282f02bd40243adcb3221e2b1a337789c2e9b9.zip
Merge pull request #30330 from yhirano55/update_database_config_in_command_line_of_guide
Update database config in The Rails Comamnd Line of guide [ci skip]
Diffstat (limited to 'guides')
-rw-r--r--guides/source/command_line.md11
1 files changed, 7 insertions, 4 deletions
diff --git a/guides/source/command_line.md b/guides/source/command_line.md
index 8ae01286e4..2cd8e02a77 100644
--- a/guides/source/command_line.md
+++ b/guides/source/command_line.md
@@ -645,13 +645,16 @@ $ cat config/database.yml
# Configure Using Gemfile
# gem 'pg'
#
-development:
+default: &default
adapter: postgresql
encoding: unicode
+ # For details on connection pooling, see Rails configuration guide
+ # http://guides.rubyonrails.org/configuring.html#database-pooling
+ pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+
+development:
+ <<: *default
database: gitapp_development
- pool: 5
- username: gitapp
- password:
...
...
```