diff options
| author | Ben Woosley <ben.woosley@gmail.com> | 2013-05-10 20:45:09 +0200 |
|---|---|---|
| committer | Ben Woosley <ben.woosley@gmail.com> | 2013-05-10 20:45:09 +0200 |
| commit | a2e607e1055dcede27970ccd7f5b89a1ddee8c32 (patch) | |
| tree | 595e27bae9bb51850f61e8be53f083fd82cce52b /activerecord/lib/active_record/null_relation.rb | |
| parent | 86cc141ed5fd51ec752c956febfa436d1c816532 (diff) | |
| download | rails-a2e607e1055dcede27970ccd7f5b89a1ddee8c32.tar.gz rails-a2e607e1055dcede27970ccd7f5b89a1ddee8c32.tar.bz2 rails-a2e607e1055dcede27970ccd7f5b89a1ddee8c32.zip | |
Make NullRelation a bit more like a real relation by returning 0 for #calculate(:count)
Diffstat (limited to 'activerecord/lib/active_record/null_relation.rb')
| -rw-r--r-- | activerecord/lib/active_record/null_relation.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb index 5d801fa705..d166f0dd66 100644 --- a/activerecord/lib/active_record/null_relation.rb +++ b/activerecord/lib/active_record/null_relation.rb @@ -55,7 +55,11 @@ module ActiveRecord end def calculate(_operation, _column_name, _options = {}) - nil + if _operation == :count + 0 + else + nil + end end def exists?(_id = false) |