aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorYoshiyuki Hirano <yhirano@me.com>2017-08-20 09:06:37 +0900
committerYoshiyuki Hirano <yhirano@me.com>2017-08-20 09:07:48 +0900
commite42e8319c08188700c5c45a6623ca0067ea1f1ed (patch)
tree0ad2f8dd2860ecd9ddb1ef4c8e180ea8b3bb28e5 /guides/source
parent0e7a5661dc6153a3726759588cd99cdf5e002c75 (diff)
downloadrails-e42e8319c08188700c5c45a6623ca0067ea1f1ed.tar.gz
rails-e42e8319c08188700c5c45a6623ca0067ea1f1ed.tar.bz2
rails-e42e8319c08188700c5c45a6623ca0067ea1f1ed.zip
Update database config in The Rails Comamnd Line of guide [ci skip]
Diffstat (limited to 'guides/source')
-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:
...
...
```