diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-17 17:30:47 -0800 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-02-17 17:30:47 -0800 |
| commit | 00b62719b4ff4fe4e60b00ba46c03cc6209b1f40 (patch) | |
| tree | 097f2f59be8ee7e7cf49529dd8e71fadbb1f7a54 /activerecord | |
| parent | 330c6af05c8b188eb072afa56c07d5fe15767c3c (diff) | |
| parent | af6a6e2e7b5794eb3bb35124a07f4d02d485d79f (diff) | |
| download | rails-00b62719b4ff4fe4e60b00ba46c03cc6209b1f40.tar.gz rails-00b62719b4ff4fe4e60b00ba46c03cc6209b1f40.tar.bz2 rails-00b62719b4ff4fe4e60b00ba46c03cc6209b1f40.zip | |
Merge pull request #23747 from kamipo/add_accidentally_removed_sharp
Add accidentally removed `#` [ci skip]
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index ba1280443d..641e9195c6 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -5,12 +5,12 @@ 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)) + # => 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. @@ -23,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 @@ -46,7 +46,7 @@ * Allow `joins` to be unscoped. - Closes #13775. + Fixes #13775. *Takashi Kokubun* |