Preserving :include options for hmt association with an order but wit…

…hout conditions [rails#5262 state:resolved]
JEG2 · Sep 28, 2010 · 0665182 · 0665182
1 parent 515917f
commit 0665182
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb
@@ -283,7 +283,7 @@ def preload_through_records(records, reflection, through_association)
           through_records.flatten!
         else
           options = {}
-          options[:include] = reflection.options[:include] || reflection.options[:source] if reflection.options[:conditions]
+          options[:include] = reflection.options[:include] || reflection.options[:source] if reflection.options[:conditions] || reflection.options[:order]
           options[:order] = reflection.options[:order]
           options[:conditions] = reflection.options[:conditions]
           records.first.class.preload_associations(records, through_association, options)