diff options
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index b987104dd0..f8931677ed 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,6 +1,18 @@ ## Rails 4.0.0 (unreleased) ## -* Relation#merge now only overwrites where values on the LHS of the +* 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: left = Person.where(age: [13, 14, 15]) @@ -59,7 +71,7 @@ Example: - relation.uniq.count # => SELECT COUNT(DISTINCT *) + relation.uniq.count # => SELECT COUNT(DISTINCT *) *Yves Senn + Kaspar Schiess* |