提交 42d3d3c2 编写于 作者: V Vipul A M

Stop accepting `options` for `Relation#average`, `Relation#minimum`,...

Stop accepting `options` for `Relation#average`, `Relation#minimum`, `Relation#maximum`, `Relation#calculate`, `perform_calculation`, `NullRelation#calculate` as they isn't used anymore.
上级 4ce643db
......@@ -50,7 +50,7 @@ def sum(*)
0
end
def calculate(_operation, _column_name, _options = {})
def calculate(_operation, _column_name)
if _operation == :count
0
else
......
......@@ -27,8 +27,8 @@ def count(column_name = nil)
# no row. See +calculate+ for examples with options.
#
# Person.average(:age) # => 35.8
def average(column_name, options = {})
calculate(:average, column_name, options)
def average(column_name)
calculate(:average, column_name)
end
# Calculates the minimum value on a given column. The value is returned
......@@ -36,8 +36,8 @@ def average(column_name, options = {})
# +calculate+ for examples with options.
#
# Person.minimum(:age) # => 7
def minimum(column_name, options = {})
calculate(:minimum, column_name, options)
def minimum(column_name)
calculate(:minimum, column_name)
end
# Calculates the maximum value on a given column. The value is returned
......@@ -45,8 +45,8 @@ def minimum(column_name, options = {})
# +calculate+ for examples with options.
#
# Person.maximum(:age) # => 93
def maximum(column_name, options = {})
calculate(:maximum, column_name, options)
def maximum(column_name)
calculate(:maximum, column_name)
end
# Calculates the sum of values on a given column. The value is returned
......@@ -89,15 +89,15 @@ def sum(*args)
# Person.group(:last_name).having("min(age) > 17").minimum(:age)
#
# Person.sum("2 * age")
def calculate(operation, column_name, options = {})
def calculate(operation, column_name)
if column_name.is_a?(Symbol) && attribute_alias?(column_name)
column_name = attribute_alias(column_name)
end
if has_include?(column_name)
construct_relation_for_association_calculations.calculate(operation, column_name, options)
construct_relation_for_association_calculations.calculate(operation, column_name)
else
perform_calculation(operation, column_name, options)
perform_calculation(operation, column_name)
end
end
......@@ -180,7 +180,7 @@ def has_include?(column_name)
eager_loading? || (includes_values.present? && (column_name || references_eager_loaded_tables?))
end
def perform_calculation(operation, column_name, options = {})
def perform_calculation(operation, column_name)
operation = operation.to_s.downcase
# If #count is used with #distinct / #uniq it is considered distinct. (eg. relation.distinct.count)
......
......@@ -295,7 +295,7 @@ def test_null_relation_content_size_methods
def test_null_relation_calculations_methods
assert_no_queries do
assert_equal 0, Developer.none.count
assert_equal 0, Developer.none.calculate(:count, nil, {})
assert_equal 0, Developer.none.calculate(:count, nil)
assert_equal nil, Developer.none.calculate(:average, 'salary')
end
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册