0
@@ -1,5 +1,7 @@
0
 * SVN*
0
 
0
+* Fixed that using :include together with :conditions array in Base.find would cause NoMethodError #2887 [Paul Hammmond]
0
+
0
 * PostgreSQL: more robust sequence name discovery.  #3087 [Rick Olson]
0
 
0
 * Oracle: use syntax compatible with Oracle 8.  #3131 [Michael Schoen]

0
@@ -980,9 +980,10 @@
0
         end
0
 
0
         def include_eager_conditions?(options)
0
-          return false unless options[:conditions]
0
-          
0
-          options[:conditions].scan(/ ([^.]+)\.[^.]+ /).flatten.any? do |condition_table_name| 
0
+          conditions = options[:conditions]
0
+          return false unless conditions
0
+          conditions = conditions.first if conditions.is_a?(Array)
0
+          conditions.scan(/(\w+)\.\w+/).flatten.any? do |condition_table_name|
0
             condition_table_name != table_name
0
           end
0
         end

0
@@ -83,6 +83,12 @@
0
     assert_equal [6,7,8], comments.collect { |c| c.id }
0
   end
0
   
0
+  def test_eager_association_loading_with_belongs_to_and_limit_and_offset_and_conditions_array
0
+    comments = Comment.find(:all, :include => :post, :conditions => ['post_id = ?',4], :limit => 3, :offset => 1, :order => 'comments.id')
0
+    assert_equal 3, comments.length
0
+    assert_equal [6,7,8], comments.collect { |c| c.id }
0
+  end
0
+
0
   def test_eager_association_loading_with_belongs_to_and_limit_and_multiple_associations
0
     posts = Post.find(:all, :include => [:author, :very_special_comment], :limit => 1)
0
     assert_equal 1, posts.length
0
@@ -99,6 +105,24 @@
0
     posts = Post.find(:all, :order => 'posts.id asc', :include => [ :author, :comments ], :limit => 2)
0
     assert_equal 2, posts.size
0
     assert_equal 3, posts.inject(0) { |sum, post| sum += post.comments.size }
0
+  end
0
+
0
+  def test_eager_with_has_many_and_limit_and_conditions
0
+    posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :conditions => "posts.body = 'hello'", :order => "posts.id")
0
+    assert_equal 2, posts.size
0
+    assert_equal [4,5], posts.collect { |p| p.id }
0
+  end
0
+
0
+  def test_eager_with_has_many_and_limit_and_conditions_array
0
+    posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :conditions => [ "posts.body = ?", 'hello' ], :order => "posts.id")
0
+    assert_equal 2, posts.size
0
+    assert_equal [4,5], posts.collect { |p| p.id }    
0
+  end
0
+
0
+  def test_eager_with_has_many_and_limit_and_conditions_array_on_the_eagers
0
+    assert_raises(ArgumentError) do
0
+      posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :conditions => [ "authors.name = ?", 'David' ])
0
+    end
0
   end
0
 
0
   def test_eager_with_has_many_and_limit_with_no_results