diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-04-25 17:42:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 17:42:44 -0700 |
| commit | a3c7fe06be9d5e69656a4f196f6de6f1cd623f96 (patch) | |
| tree | baf7fa62450c0b77d1dc3d4a330714734bfc16fd /activerecord/lib/active_record/relation/delegation.rb | |
| parent | c7ee244644903da5045c54f72e25a8ee6eb3bd68 (diff) | |
| parent | 22fa48f2fc1c4d71d42eaed41ea1ef9af618d585 (diff) | |
| download | rails-a3c7fe06be9d5e69656a4f196f6de6f1cd623f96.tar.gz rails-a3c7fe06be9d5e69656a4f196f6de6f1cd623f96.tar.bz2 rails-a3c7fe06be9d5e69656a4f196f6de6f1cd623f96.zip | |
Merge pull request #28828 from kamipo/fix_extending_modules_on_association
Mixin `CollectionProxy::DelegateExtending` after `ClassSpecificRelation`
Diffstat (limited to 'activerecord/lib/active_record/relation/delegation.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/delegation.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb index 8b4dd25689..257ae04ff4 100644 --- a/activerecord/lib/active_record/relation/delegation.rb +++ b/activerecord/lib/active_record/relation/delegation.rb @@ -25,6 +25,8 @@ module ActiveRecord def inherited(child_class) child_class.initialize_relation_delegate_cache + delegate = child_class.relation_delegate_class(ActiveRecord::Associations::CollectionProxy) + delegate.include ActiveRecord::Associations::CollectionProxy::DelegateExtending super end end |