Ticket #3438: eager_loading_order_fix.diff

activerecord/lib/active_record/associations.rb

@@ -1148 +1148 @@
-          add_limited_ids_condition!(sql, options, join_dependency) if !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit])
-
-          sql << "ORDER BY #{options[:order]} " if options[:order]
+
+          if options[:include]
+            ordered_reflections = []
+            for association, reflection in reflections
+              ordered_reflections << reflection if options[:include].include?(association) && reflection.options[:order]
+            end
+            if ordered_reflections.any?
+              if options[:order]
+                sql << ", "
+              else
+                sql << "ORDER BY "
+              end
+              sql << "#{ordered_reflections.map{ |r| r.options[:order] }.join(', ')} " if ordered_reflections.any?
+            end
+          end
- 
-          add_limit!(sql, options, scope) if using_limitable_reflections?(join_dependency.reflections)
-