Refactored ActiveRecord first method to get rid of duplication.

rails · Jun 9, 2013 · d5450a6 · d5450a6
1 parent 7a32c63
commit d5450a6
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -81,11 +81,7 @@ def take!
     #   Person.first(3) # returns the first three objects fetched by SELECT * FROM people LIMIT 3
     def first(limit = nil)
       if limit
-        if order_values.empty? && primary_key
+        find_first_records(order_values, limit)
-          order(arel_table[primary_key].asc).limit(limit).to_a
-        else
-          limit(limit).to_a
-        end
       else
         find_first
       end
@@ -307,12 +303,15 @@ def find_first
       if loaded?
         @records.first
       else
-        @first ||=
+        @first ||= find_first_records(with_default_scope.order_values, 1).first
-          if with_default_scope.order_values.empty? && primary_key
+      end
-            order(arel_table[primary_key].asc).limit(1).to_a.first
+    end
-          else
+
-            limit(1).to_a.first
+    def find_first_records(order_values, limit)
-          end
+      if order_values.empty? && primary_key
+        order(arel_table[primary_key].asc).limit(limit).to_a
+      else
+        limit(limit).to_a
       end
     end