diff options
author | schneems <richard.schneeman@gmail.com> | 2013-12-30 11:26:28 -0500 |
---|---|---|
committer | schneems <richard.schneeman@gmail.com> | 2013-12-30 12:21:14 -0500 |
commit | 5b96027ef6ac6e507ec9caf9973069345ce6a7cd (patch) | |
tree | 6d71bcbc0c3031cc2aa2336024e873b931f1eec1 /actionpack/test/journey | |
parent | 16e93561e2695afb6e0f264905e35ffd9381123d (diff) | |
download | rails-5b96027ef6ac6e507ec9caf9973069345ce6a7cd.tar.gz rails-5b96027ef6ac6e507ec9caf9973069345ce6a7cd.tar.bz2 rails-5b96027ef6ac6e507ec9caf9973069345ce6a7cd.zip |
Allow "url" sub key in database.yml configuration
Currently a developer can pass in a YAML configuration that fully specifies connection information:
```
production:
database: triage_production
adapter: password
pool: 5
```
They can also pass in a string that specifies a connection URL directly to an environment key:
```
production: postgresql://localhost/foo
```
This PR allows the use of both a connection url and specifying connection attributes via YAML through the use of the "url" sub key:
```
production:
url: postgresql://localhost/foo
pool: 3
```
This will allow developers to inherit Active Record options such as `pool` from `&defaults` and still use a secure connection url such as `<%= ENV['DATABASE_URL'] %>`. The URL is expanded into a hash and then merged back into the YAML hash. If there are any conflicts, the values from the connection URL are preferred.
Talked this over with @josevalim
Diffstat (limited to 'actionpack/test/journey')
0 files changed, 0 insertions, 0 deletions