diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-04-16 17:03:24 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-04-16 17:03:24 +0200 |
| commit | c1dc6470cbb2708b4bf1bf3bc0681e8f811341b2 (patch) | |
| tree | 491f78a36dabb65b5cdf8bfa8316f29b2c7a85d4 /activerecord/lib | |
| parent | 973a45230ab5ba0e096585ecd1403a13569a1348 (diff) | |
| parent | 93f852569efc4db62e2fed75b2c0bb1866f7065b (diff) | |
| download | rails-c1dc6470cbb2708b4bf1bf3bc0681e8f811341b2.tar.gz rails-c1dc6470cbb2708b4bf1bf3bc0681e8f811341b2.tar.bz2 rails-c1dc6470cbb2708b4bf1bf3bc0681e8f811341b2.zip | |
Merge pull request #14773 from eric-chahin/null_relation_fix
Changed the NullRelation so that when count is called with #group it wil...
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/null_relation.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb index 5b255c3fe5..05d0c41678 100644 --- a/activerecord/lib/active_record/null_relation.rb +++ b/activerecord/lib/active_record/null_relation.rb @@ -43,7 +43,7 @@ module ActiveRecord end def count(*) - 0 + calculate :count, nil end def sum(*) @@ -54,7 +54,7 @@ module ActiveRecord # TODO: Remove _options argument as soon we remove support to # activerecord-deprecated_finders. if operation == :count - 0 + group_values.any? ? Hash.new : 0 else nil end |