preserve order on the RHS query

rails · Sep 21, 2013 · 8988f0b · 8988f0b
1 parent bc77cca
commit 8988f0b
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb
@@ -133,6 +133,14 @@ def build_scope
           scope.select!   preload_values[:select] || values[:select] || table[Arel.star]
           scope.includes! preload_values[:includes] || values[:includes]
 
+          if preload_values.key? :order
+            scope.order! preload_values[:order]
+          else
+            if values.key? :order
+              scope.order! values[:order]
+            end
+          end
+
           if options[:as]
             scope.where!(klass.table_name => { reflection.type => model.base_class.sti_name })
           end