diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-16 03:50:51 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-16 03:51:10 +0530 |
| commit | 2ee130abec222342c6f7ade3b651840dc89c1bcd (patch) | |
| tree | f15fec0ac14e738ae966c322df7b7a6ba8de8ff1 /activerecord/lib/active_record/calculations.rb | |
| parent | 89082004b0381ec67b4a2782ef4d4f63853e586f (diff) | |
| download | rails-2ee130abec222342c6f7ade3b651840dc89c1bcd.tar.gz rails-2ee130abec222342c6f7ade3b651840dc89c1bcd.tar.bz2 rails-2ee130abec222342c6f7ade3b651840dc89c1bcd.zip | |
Remove scope related code from construct_join
Diffstat (limited to 'activerecord/lib/active_record/calculations.rb')
| -rw-r--r-- | activerecord/lib/active_record/calculations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index bbb5922e0e..cd7bd185c5 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -160,7 +160,7 @@ module ActiveRecord if includes.any? merge_with_joins = merge_with_relation ? merge_with_relation.joins_values : [] joins = (merge_with_joins + Array.wrap(options[:joins])).uniq - join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, includes, construct_join(joins, nil)) + join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, includes, construct_join(joins)) construct_calculation_arel_with_included_associations(options, join_dependency, merge_with_relation) else relation = active_relation. |