diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-31 11:18:28 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-31 11:18:28 -0800 |
| commit | 45883a32963734e2e6741847307340d82ed72446 (patch) | |
| tree | cd4ecad2d5664b4ab5f4411a2141a32164e0d769 /activerecord/CHANGELOG.md | |
| parent | ee4a2bb23d46ee3e644293ba59b70fa7ecb3f7eb (diff) | |
| parent | 4b005fb371c2e7af80df7da63be94509b1db038c (diff) | |
| download | rails-45883a32963734e2e6741847307340d82ed72446.tar.gz rails-45883a32963734e2e6741847307340d82ed72446.tar.bz2 rails-45883a32963734e2e6741847307340d82ed72446.zip | |
Merge pull request #9041 from sodabrew/patch-1
Convert int, float, and bools from ENV['DATABASE_URL'] query args
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index b987104dd0..71de20a2b9 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,5 +1,17 @@ ## Rails 4.0.0 (unreleased) ## +* The DATABASE_URL environment variable now converts ints, floats, and + the strings true and false to Ruby types. For example, SQLite requires + that the timeout value is an integer, and PostgreSQL requires that the + prepared_statements option is a boolean. These now work as expected: + + Example: + + DATABASE_URL=sqlite3://localhost/test_db?timeout=500 + DATABASE_URL=postgresql://localhost/test_db?prepared_statements=false + + *Aaron Stone* + * Relation#merge now only overwrites where values on the LHS of the merge. Consider: |