diff options
| author | Chris Oliver <excid3@gmail.com> | 2011-03-11 16:13:44 -0600 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2011-03-12 22:31:21 +0000 |
| commit | 015192560b7e81639430d7e46c410bf6a3cd9223 (patch) | |
| tree | bfae92c6e5577df2a82d59c81f35cd52ed6aaf15 /activerecord/lib/active_record/relation.rb | |
| parent | 1a3fe8ce42e202630e6b1d8cf7137002e270ebdb (diff) | |
| download | rails-015192560b7e81639430d7e46c410bf6a3cd9223.tar.gz rails-015192560b7e81639430d7e46c410bf6a3cd9223.tar.bz2 rails-015192560b7e81639430d7e46c410bf6a3cd9223.zip | |
Fixed a bug when empty? was called on a grouped Relation that wasn't loaded
[#5829 state:resolved]
Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 5af20bf38b..371403f510 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -110,7 +110,10 @@ module ActiveRecord # Returns true if there are no records. def empty? - loaded? ? @records.empty? : count.zero? + return @records.empty? if loaded? + + c = count + c.respond_to?(:zero?) ? c.zero? : c.empty? end def any? |