diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-01 02:23:47 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-01 02:23:47 -0700 |
| commit | efba1d4227514a6ce4880910a6531b0a6c3c75aa (patch) | |
| tree | daff4155b8c19b915125ac0b0da458279358e743 /activerecord/lib/active_record/relation/finder_methods.rb | |
| parent | 81807e0fe2879e08563c91ee6809ab6d1d0bd081 (diff) | |
| parent | 6c280f3398966ffba45069500ff43d632513fe44 (diff) | |
| download | rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.tar.gz rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.tar.bz2 rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.zip | |
Merge commit 'rails/master'
Conflicts:
railties/guides/source/index.html.erb
Diffstat (limited to 'activerecord/lib/active_record/relation/finder_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index 3514d0a259..d6144dc206 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -188,7 +188,6 @@ module ActiveRecord def construct_relation_for_association_calculations including = (@eager_load_values + @includes_values).uniq join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, including, arel.joins(arel)) - relation = except(:includes, :eager_load, :preload) apply_join_dependency(relation, join_dependency) end |