kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Simply forward Calculations#count to Enumerable#count

Browse source 
Follow up of #24203.

Since b644964b `ActiveRecord::Relation` includes `Enumerable` so it is
enough to call `super` simply.
This commit is contained in:
Ryuta Kamizono 2017-03-10 22:25:00 +09:00
parent c8c1460f7a
commit c4c8d808d0
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
activerecord/lib/active_record/relation/calculations.rb
View file

@ -37,11 +37,8 @@ module ActiveRecord
# Note: not all valid {Relation#select}[rdoc-ref:QueryMethods#select] expressions are valid #count expressions. The specifics differ
# between databases. In invalid cases, an error from the database is thrown.
def count(column_name = nil)
if block_given?
to_a.count { |*block_args| yield(*block_args) }
else
calculate(:count, column_name)
end
return super() if block_given?
calculate(:count, column_name)
end
# Calculates the average value on a given column. Returns +nil+ if there's
@ -75,8 +72,8 @@ module ActiveRecord
# #calculate for examples with options.
#
# Person.sum(:age) # => 4562
def sum(column_name = nil, &block)
return super(&block) if block_given?
def sum(column_name = nil)
return super() if block_given?
calculate(:sum, column_name)
end