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/lib | |
| 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/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_proxy.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb index eba688866c..5b71ed163e 100644 --- a/activerecord/lib/active_record/associations/collection_proxy.rb +++ b/activerecord/lib/active_record/associations/collection_proxy.rb @@ -860,6 +860,10 @@ module ActiveRecord !!@association.include?(record) end + def arel + scope.arel + end + def proxy_association @association end |