From 022eadddbac826cf663630d58b689ccdcb5e3777 Mon Sep 17 00:00:00 2001
From: Brian Christian <brchristian@gmail.com>
Date: Wed, 9 Mar 2016 19:40:23 -0800
Subject: don't impose primary key order if limit() is defined

---
 activerecord/lib/active_record/relation/finder_methods.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index c5562c1ff0..93f3b67686 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -550,7 +550,7 @@ module ActiveRecord
       end
 
       def ordered_relation
-        if order_values.empty? && primary_key
+        if order_values.empty? && primary_key && limit_value.blank?
           order(arel_attribute(primary_key).asc)
         else
           self
-- 
cgit v1.2.3