diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-11 13:29:21 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-11 13:29:21 -0200 |
| commit | e1ce005942f20c4f64cf78a0dc15e662e0353f3b (patch) | |
| tree | 1f40a153a4e33722bd7f842b66ae3d8229517c0c /activerecord/lib/active_record/null_relation.rb | |
| parent | 4c0cddc92c680490f8cafc889a92541ac80dde39 (diff) | |
| download | rails-e1ce005942f20c4f64cf78a0dc15e662e0353f3b.tar.gz rails-e1ce005942f20c4f64cf78a0dc15e662e0353f3b.tar.bz2 rails-e1ce005942f20c4f64cf78a0dc15e662e0353f3b.zip | |
Revert "Merge pull request #12518 from vipulnsward/remove_count_options"
It is needed for activerecord-depecated_finders
This reverts commit dcff027a5242b20c0c90eb062dddb22ccf51aed9, reversing
changes made to 3a2093984ff49d86db1efeff0c7581e788ecfb9f.
Diffstat (limited to 'activerecord/lib/active_record/null_relation.rb')
| -rw-r--r-- | activerecord/lib/active_record/null_relation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb index 080b20134d..62c6bbc413 100644 --- a/activerecord/lib/active_record/null_relation.rb +++ b/activerecord/lib/active_record/null_relation.rb @@ -50,7 +50,7 @@ module ActiveRecord 0 end - def calculate(_operation, _column_name) + def calculate(_operation, _column_name, _options = {}) if _operation == :count 0 else |