From e33d304975f5b20b0ba819ab644a2a8f80ff3743 Mon Sep 17 00:00:00 2001 From: Ernie Miller Date: Wed, 28 Apr 2010 23:14:05 -0400 Subject: Fix eager loading of associations causing table name collisions [#4463 state:committed] Signed-off-by: Jeremy Kemper --- activerecord/lib/active_record/relation/finder_methods.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'activerecord/lib/active_record/relation/finder_methods.rb') 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 -- cgit v1.2.3