1 files changed, 4 insertions, 3 deletions
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