diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-23 01:18:42 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-23 01:18:42 -0300 |
| commit | 7c08e1ac6d4fe9952b2753cfc17bc16a6a84e14d (patch) | |
| tree | 7300f9f3fa4d780bf7848552bb3fe777e38c50d1 /activerecord/lib | |
| parent | 624253f1d12e34b8781ce6e11595b43cdccaa66a (diff) | |
| parent | 0f6d47d88f1ba771e8c463dcf12ee53cb875454d (diff) | |
| download | rails-7c08e1ac6d4fe9952b2753cfc17bc16a6a84e14d.tar.gz rails-7c08e1ac6d4fe9952b2753cfc17bc16a6a84e14d.tar.bz2 rails-7c08e1ac6d4fe9952b2753cfc17bc16a6a84e14d.zip | |
Merge pull request #21725 from yui-knk/fix/ar_sum
Fix arguments of `AR::Calculations#sum`
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index 0f6015fa93..922cbc05eb 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -70,9 +70,9 @@ module ActiveRecord # +calculate+ for examples with options. # # Person.sum(:age) # => 4562 - def sum(*args) - return super if block_given? - calculate(:sum, *args) + def sum(column_name = nil, &block) + return super &block if block_given? + calculate(:sum, column_name) end # This calculates aggregate values in the given column. Methods for count, sum, average, |