aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/null_relation.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-11 20:27:52 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-02 12:06:24 -0300
commit78dab2a8569408658542e462a957ea5a35aa4679 (patch)
tree2560e30a39209010fb82aeed6c706b48b9698a68 /activerecord/lib/active_record/null_relation.rb
parente8615b99c6bced24f7e6866d37589588f3924cc1 (diff)
downloadrails-78dab2a8569408658542e462a957ea5a35aa4679.tar.gz
rails-78dab2a8569408658542e462a957ea5a35aa4679.tar.bz2
rails-78dab2a8569408658542e462a957ea5a35aa4679.zip
Remove support to activerecord-deprecated_finders
Diffstat (limited to 'activerecord/lib/active_record/null_relation.rb')
-rw-r--r--activerecord/lib/active_record/null_relation.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb
index 807c301596..b406da14dc 100644
--- a/activerecord/lib/active_record/null_relation.rb
+++ b/activerecord/lib/active_record/null_relation.rb
@@ -62,9 +62,7 @@ module ActiveRecord
calculate :maximum, nil
end
- def calculate(operation, _column_name, _options = {})
- # TODO: Remove _options argument as soon we remove support to
- # activerecord-deprecated_finders.
+ def calculate(operation, _column_name)
if [:count, :sum, :size].include? operation
group_values.any? ? Hash.new : 0
elsif [:average, :minimum, :maximum].include?(operation) && group_values.any?