diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-04 13:31:10 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-04 13:31:10 -0300 |
| commit | 5f1346b0c7cde53bb849dad89778c80ef1ed6571 (patch) | |
| tree | bb54fe628c88cc9ec6385f2813734360cef087e2 /activerecord/CHANGELOG.md | |
| parent | edb6f7db5495e6f683764e5bf5089cecab9cf7cd (diff) | |
| parent | 1b187caaa1e1aa1bd0f440052b4df09a5ddaa4bf (diff) | |
| download | rails-5f1346b0c7cde53bb849dad89778c80ef1ed6571.tar.gz rails-5f1346b0c7cde53bb849dad89778c80ef1ed6571.tar.bz2 rails-5f1346b0c7cde53bb849dad89778c80ef1ed6571.zip | |
Merge pull request #14562 from jefflai2/collection_proxy
CollectionProxy uses the arel of its association's scope.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 98fe0fbd62..fff66f21fb 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* + * Block a few default Class methods as scope name. For instance, this will raise: |