diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-11-15 13:25:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 13:25:51 -0500 |
| commit | 6e692e6e5bb90fbaf1524429139daa9bd1c4f990 (patch) | |
| tree | f139b8e8dce590499be4d45fa0ccac22f37d93bd /activerecord | |
| parent | 3a558aa2bc8ce3834ee79ff3346bcf5d7debbbd0 (diff) | |
| parent | 7c1b14f04158102f68610128ae230941e85263a3 (diff) | |
| download | rails-6e692e6e5bb90fbaf1524429139daa9bd1c4f990.tar.gz rails-6e692e6e5bb90fbaf1524429139daa9bd1c4f990.tar.bz2 rails-6e692e6e5bb90fbaf1524429139daa9bd1c4f990.zip | |
Merge pull request #27054 from kamipo/null_relation_calculate
Refactor `NullRelation#calculate`
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/null_relation.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb index 254550c378..2bb7ed6d5e 100644 --- a/activerecord/lib/active_record/null_relation.rb +++ b/activerecord/lib/active_record/null_relation.rb @@ -41,12 +41,11 @@ module ActiveRecord end def calculate(operation, _column_name) - if [:count, :sum].include? operation + case operation + when :count, :sum group_values.any? ? Hash.new : 0 - elsif [:average, :minimum, :maximum].include?(operation) && group_values.any? - Hash.new - else - nil + when :average, :minimum, :maximum + group_values.any? ? Hash.new : nil end end |