diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-02-18 10:47:47 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-02-18 10:47:47 -0800 |
commit | fb8d01f1ef7da0a3c8c0173d6c3da59afe9d1ca5 (patch) | |
tree | 258d75655ddcd9aacd2df0b74bb6c58404e3de9b /activerecord/CHANGELOG.md | |
parent | e4c3225b2c9475ebfac474c7196dec2feb290e5a (diff) | |
parent | 3bd9fe1708018e4e82f5d836cc6e047d9d9b5b55 (diff) | |
download | rails-fb8d01f1ef7da0a3c8c0173d6c3da59afe9d1ca5.tar.gz rails-fb8d01f1ef7da0a3c8c0173d6c3da59afe9d1ca5.tar.bz2 rails-fb8d01f1ef7da0a3c8c0173d6c3da59afe9d1ca5.zip |
Merge branch 'master' into treewip
* master: (27 commits)
move digest cache on to the DetailsKey object
remove object `hash` cache
[ci skip] fix suggested change-replace 'an' with 'the in Rails engine guide'
Missing documentation about hash algorithm option for MessageVerifier [ci skip]
set `skip_listen` option to dummy appplication
Fix the language in engines guide
Add accidentally removed `#` [ci skip]
fields_for_style needs to test for AC::Parameters
Fix indentation for code block in changelog
Remove accidentally duplicated change log title [ci skip]
partially revert 69009f4473637a44ade26d954ef5ddea6ff903f2
Remove needless `case_insensitive_comparison` in mysql2 adapter
modify to `error` also abort when specify fail fast option
Implement ActionController::Parameters#inspect
remove unused method
Remove unused Journey code
Add Action Cable CHANGELOG in release notes [ci skip]
Show proper error message when a non-relation object is passed to AR::Relation#or
Fix semantics of test names for finish option in batches_test
Fix typo
...
Conflicts:
actionview/lib/action_view/digestor.rb
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r-- | activerecord/CHANGELOG.md | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 70549243a8..641e9195c6 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,16 @@ +* Fixed `where` for polymorphic associations when passed an array containing different types. + + Fixes #17011. + + Example: + + PriceEstimate.where(estimate_of: [Treasure.find(1), Car.find(2)]) + # => SELECT "price_estimates".* FROM "price_estimates" + WHERE (("price_estimates"."estimate_of_type" = 'Treasure' AND "price_estimates"."estimate_of_id" = 1) + OR ("price_estimates"."estimate_of_type" = 'Car' AND "price_estimates"."estimate_of_id" = 2)) + + *Philippe Huibonhoa* + * Fix a bug where using `t.foreign_key` twice with the same `to_table` within the same table definition would only create one foreign key. @@ -10,7 +23,7 @@ *Bogdan Gusiev*, *Jon Hinson* -* Rework `ActiveRecord::Relation#last` +* Rework `ActiveRecord::Relation#last`. 1. Never perform additional SQL on loaded relation 2. Use SQL reverse order instead of loading relation if relation doesn't have limit @@ -33,7 +46,7 @@ * Allow `joins` to be unscoped. - Closes #13775. + Fixes #13775. *Takashi Kokubun* |