mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Mark the arguments needed by activerecord-deprecated_finders with a TODO
This commit is contained in:
parent
e1ce005942
commit
929c2261cd
4 changed files with 20 additions and 2 deletions
|
@ -194,6 +194,8 @@ module ActiveRecord
|
|||
# Count all records using SQL. Construct options and pass them with
|
||||
# scope to the target class's +count+.
|
||||
def count(column_name = nil, count_options = {})
|
||||
# TODO: Remove count_options argument as soon we remove support to
|
||||
# activerecord-deprecated_finders.
|
||||
column_name, count_options = nil, column_name if column_name.is_a?(Hash)
|
||||
|
||||
relation = scope
|
||||
|
|
|
@ -670,6 +670,8 @@ module ActiveRecord
|
|||
# # #<Pet id: 3, name: "Choo-Choo", person_id: 1>
|
||||
# # ]
|
||||
def count(column_name = nil, options = {})
|
||||
# TODO: Remove options argument as soon we remove support to
|
||||
# activerecord-deprecated_finders.
|
||||
@association.count(column_name, options)
|
||||
end
|
||||
|
||||
|
|
|
@ -50,8 +50,10 @@ module ActiveRecord
|
|||
0
|
||||
end
|
||||
|
||||
def calculate(_operation, _column_name, _options = {})
|
||||
if _operation == :count
|
||||
def calculate(operation, _column_name, _options = {})
|
||||
# TODO: Remove _options argument as soon we remove support to
|
||||
# activerecord-deprecated_finders.
|
||||
if operation == :count
|
||||
0
|
||||
else
|
||||
nil
|
||||
|
|
|
@ -20,6 +20,8 @@ module ActiveRecord
|
|||
# Person.group(:city).count
|
||||
# # => { 'Rome' => 5, 'Paris' => 3 }
|
||||
def count(column_name = nil, options = {})
|
||||
# TODO: Remove options argument as soon we remove support to
|
||||
# activerecord-deprecated_finders.
|
||||
column_name, options = nil, column_name if column_name.is_a?(Hash)
|
||||
calculate(:count, column_name, options)
|
||||
end
|
||||
|
@ -29,6 +31,8 @@ module ActiveRecord
|
|||
#
|
||||
# Person.average(:age) # => 35.8
|
||||
def average(column_name, options = {})
|
||||
# TODO: Remove options argument as soon we remove support to
|
||||
# activerecord-deprecated_finders.
|
||||
calculate(:average, column_name, options)
|
||||
end
|
||||
|
||||
|
@ -38,6 +42,8 @@ module ActiveRecord
|
|||
#
|
||||
# Person.minimum(:age) # => 7
|
||||
def minimum(column_name, options = {})
|
||||
# TODO: Remove options argument as soon we remove support to
|
||||
# activerecord-deprecated_finders.
|
||||
calculate(:minimum, column_name, options)
|
||||
end
|
||||
|
||||
|
@ -47,6 +53,8 @@ module ActiveRecord
|
|||
#
|
||||
# Person.maximum(:age) # => 93
|
||||
def maximum(column_name, options = {})
|
||||
# TODO: Remove options argument as soon we remove support to
|
||||
# activerecord-deprecated_finders.
|
||||
calculate(:maximum, column_name, options)
|
||||
end
|
||||
|
||||
|
@ -91,6 +99,8 @@ module ActiveRecord
|
|||
#
|
||||
# Person.sum("2 * age")
|
||||
def calculate(operation, column_name, options = {})
|
||||
# TODO: Remove options argument as soon we remove support to
|
||||
# activerecord-deprecated_finders.
|
||||
if column_name.is_a?(Symbol) && attribute_alias?(column_name)
|
||||
column_name = attribute_alias(column_name)
|
||||
end
|
||||
|
@ -182,6 +192,8 @@ module ActiveRecord
|
|||
end
|
||||
|
||||
def perform_calculation(operation, column_name, options = {})
|
||||
# TODO: Remove options argument as soon we remove support to
|
||||
# activerecord-deprecated_finders.
|
||||
operation = operation.to_s.downcase
|
||||
|
||||
# If #count is used with #distinct / #uniq it is considered distinct. (eg. relation.distinct.count)
|
||||
|
|
Loading…
Reference in a new issue