From 421c81bd1875eb4e163bea8ce18b1ae9c2224e7d Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 14 Nov 2013 14:43:14 -0800 Subject: Fix that eager loading of polymorphic associations did not work with association empty?/any? predicates any more (there is still a problem when select is applied to a relation, or if you try association#exists? -- but its easier to work around) --- activerecord/lib/active_record/relation.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 60f2726a6e..0227c21489 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -244,9 +244,17 @@ module ActiveRecord def empty? return @records.empty? if loaded? - limit_value == 0 ? true : !exists? + if limit_value == 0 + true + else + # FIXME: This count is not compatible with #select('authors.*') or other select narrows + c = count + c.respond_to?(:zero?) ? c.zero? : c.empty? + end end + + # Returns true if there are any records. def any? if block_given? -- cgit v1.2.3