diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-04-03 15:43:59 -0700 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-04-03 15:43:59 -0700 |
commit | e59f3809efd8905183056c0a965b93df52a6f62e (patch) | |
tree | 40398a91874dab8027482c5bed24f16e280232e7 /activerecord/lib | |
parent | 2c22376fe04b89e8f34620139720b85a85ce3428 (diff) | |
parent | 453c7d6c47be01c9938af14962279e4cb2d6e506 (diff) | |
download | rails-e59f3809efd8905183056c0a965b93df52a6f62e.tar.gz rails-e59f3809efd8905183056c0a965b93df52a6f62e.tar.bz2 rails-e59f3809efd8905183056c0a965b93df52a6f62e.zip |
Merge pull request #7792 from seejee/chained_scopes_preload_properly
Fixes Issue #7490: Chained scopes will preload properly
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/relation/spawn_methods.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb index c25570d758..b8e384c2f3 100644 --- a/activerecord/lib/active_record/relation/spawn_methods.rb +++ b/activerecord/lib/active_record/relation/spawn_methods.rb @@ -17,14 +17,14 @@ module ActiveRecord if method == :includes merged_relation = merged_relation.includes(value) else - merged_relation.send(:"#{method}_values=", value) + merge_relation_method(merged_relation, method, value) end end end (Relation::MULTI_VALUE_METHODS - [:joins, :where, :order]).each do |method| value = r.send(:"#{method}_values") - merged_relation.send(:"#{method}_values=", merged_relation.send(:"#{method}_values") + value) if value.present? + merge_relation_method(merged_relation, method, value) if value.present? end merged_relation.joins_values += r.joins_values @@ -144,5 +144,10 @@ module ActiveRecord relation end + private + + def merge_relation_method(relation, method, value) + relation.send(:"#{method}_values=", relation.send(:"#{method}_values") + value) + end end end |