From e466fc45cade7cbc0ee5a0e7181e377dd3780043 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 8 Dec 2005 04:44:54 +0000 Subject: Fixed that using :include together with :conditions array in Base.find would cause NoMethodError (closes #2887) [Paul Hammmond] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3240 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/associations.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 2fcce6348e..c50750352f 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1029,9 +1029,10 @@ module ActiveRecord end def include_eager_conditions?(options) - return false unless options[:conditions] - - options[:conditions].scan(/ ([^.]+)\.[^.]+ /).flatten.any? do |condition_table_name| + conditions = options[:conditions] + return false unless conditions + conditions = conditions.first if conditions.is_a?(Array) + conditions.scan(/(\w+)\.\w+/).flatten.any? do |condition_table_name| condition_table_name != table_name end end -- cgit v1.2.3