Refactor && simplify count_records.

9f357992 · Emilio Tagua · Aaron Patterson · e2bad8a2 · 9f357992
隐藏空白更改
内联并排

Showing with 1 addition and 5 deletion

activerecord/lib/active_record/associations/has_many_association.rb ...rd/lib/active_record/associations/has_many_association.rb +1 -5

未找到文件。
--- a/activerecord/lib/active_record/associations/has_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_association.rb
@@ -42,11 +42,7 @@ def count_records
          # documented side-effect of the method that may avoid an extra SELECT.
          @target ||= [] and loaded if count == 0

-          if @reflection.options[:limit]
-            count = [ @reflection.options[:limit], count ].min
-          end
-
-          count
+          @reflection.options[:limit] ? [@reflection.options[:limit], count].min : count
        end

        def has_cached_counter?