aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorJefferson Lai <jeffersonlai@Jeffersons-MacBook-Pro.local>2014-04-01 20:18:16 -0700
committerJefferson Lai <jeffersonlai@Jeffersons-MacBook-Pro.local>2014-04-02 13:43:26 -0700
commit1b187caaa1e1aa1bd0f440052b4df09a5ddaa4bf (patch)
tree19924a4d2f929162f23f2c8c426fd14689ea2aa0 /activerecord/CHANGELOG.md
parentf159b0a5a8e0c43942e8d60eb27a51f2679afa3e (diff)
downloadrails-1b187caaa1e1aa1bd0f440052b4df09a5ddaa4bf.tar.gz
rails-1b187caaa1e1aa1bd0f440052b4df09a5ddaa4bf.tar.bz2
rails-1b187caaa1e1aa1bd0f440052b4df09a5ddaa4bf.zip
CollectionProxy uses the arel of its association's scope.
CollectionProxy should be able to reuse the behavior (methods) of its parent class, but with its own state. This change allows CollectionProxy to use the arel object corresponding to its association's scope.
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 1aeba4f856..d31551d606 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,12 @@
+* `to_sql` on an association now matches the query that is actually executed, where it
+ could previously have incorrectly accrued additional conditions (e.g. as a result of
+ a previous query). CollectionProxy now always defers to the association scope's
+ `arel` method so the (incorrect) inherited one should be entirely concealed.
+
+ Fixes #14003.
+
+ *Jefferson Lai*
+
* The PostgreSQL adapter supports custom domains. Fixes #14305.
*Yves Senn*