diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-10-21 14:29:41 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-10-21 14:29:41 +0100 |
| commit | fa09de351c8045c7e7a0f268188ccf80c827b079 (patch) | |
| tree | 529922eaddfb5575d026f214bb84b9cd5a022d23 /railties/configs/databases | |
| parent | d2f3bddaebc0d52fd4df1392c87c84333612c531 (diff) | |
| parent | a5cdb7a813515fa0cbee23101d2f911b4017ed90 (diff) | |
| download | rails-fa09de351c8045c7e7a0f268188ccf80c827b079.tar.gz rails-fa09de351c8045c7e7a0f268188ccf80c827b079.tar.bz2 rails-fa09de351c8045c7e7a0f268188ccf80c827b079.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/configs/databases')
| -rw-r--r-- | railties/configs/databases/mysql.yml | 3 | ||||
| -rw-r--r-- | railties/configs/databases/postgresql.yml | 3 | ||||
| -rw-r--r-- | railties/configs/databases/sqlite2.yml | 3 | ||||
| -rw-r--r-- | railties/configs/databases/sqlite3.yml | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/railties/configs/databases/mysql.yml b/railties/configs/databases/mysql.yml index 7fcadcdf2c..a4406e4923 100644 --- a/railties/configs/databases/mysql.yml +++ b/railties/configs/databases/mysql.yml @@ -18,6 +18,7 @@ development: adapter: mysql encoding: utf8 database: <%= app_name %>_development + pool: 5 username: root password: <% if socket -%> @@ -33,6 +34,7 @@ test: adapter: mysql encoding: utf8 database: <%= app_name %>_test + pool: 5 username: root password: <% if socket -%> @@ -45,6 +47,7 @@ production: adapter: mysql encoding: utf8 database: <%= app_name %>_production + pool: 5 username: root password: <% if socket -%> diff --git a/railties/configs/databases/postgresql.yml b/railties/configs/databases/postgresql.yml index 36f6e5ae49..f600e054cf 100644 --- a/railties/configs/databases/postgresql.yml +++ b/railties/configs/databases/postgresql.yml @@ -12,6 +12,7 @@ development: adapter: postgresql encoding: unicode database: <%= app_name %>_development + pool: 5 username: <%= app_name %> password: @@ -37,6 +38,7 @@ test: adapter: postgresql encoding: unicode database: <%= app_name %>_test + pool: 5 username: <%= app_name %> password: @@ -44,5 +46,6 @@ production: adapter: postgresql encoding: unicode database: <%= app_name %>_production + pool: 5 username: <%= app_name %> password: diff --git a/railties/configs/databases/sqlite2.yml b/railties/configs/databases/sqlite2.yml index fc48bd6753..46f01cb42c 100644 --- a/railties/configs/databases/sqlite2.yml +++ b/railties/configs/databases/sqlite2.yml @@ -3,6 +3,7 @@ development: adapter: sqlite database: db/development.sqlite2 + pool: 5 # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". @@ -10,7 +11,9 @@ development: test: adapter: sqlite database: db/test.sqlite2 + pool: 5 production: adapter: sqlite database: db/production.sqlite2 + pool: 5 diff --git a/railties/configs/databases/sqlite3.yml b/railties/configs/databases/sqlite3.yml index fff44a4124..025d62a8d8 100644 --- a/railties/configs/databases/sqlite3.yml +++ b/railties/configs/databases/sqlite3.yml @@ -3,6 +3,7 @@ development: adapter: sqlite3 database: db/development.sqlite3 + pool: 5 timeout: 5000 # Warning: The database defined as "test" will be erased and @@ -11,9 +12,11 @@ development: test: adapter: sqlite3 database: db/test.sqlite3 + pool: 5 timeout: 5000 production: adapter: sqlite3 database: db/production.sqlite3 + pool: 5 timeout: 5000 |