<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -116,6 +116,13 @@ class EagerAssociationTest &lt; ActiveRecord::TestCase
     assert_equal 2, posts.first.comments.size
   end
 
+  def test_loading_from_an_association_that_has_a_hash_of_conditions
+    assert_nothing_raised do
+      Author.find(:all, :include =&gt; :hello_posts_with_hash_conditions)
+    end
+    assert !Author.find(authors(:david).id, :include =&gt; :hello_posts_with_hash_conditions).hello_posts.empty?
+  end
+
   def test_loading_with_no_associations
     assert_nil Post.find(posts(:authorless).id, :include =&gt; :author).author
   end</diff>
      <filename>activerecord/test/cases/associations/eager_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>8c105ee0c888a63cdbf593f0bfe688065b3e09e2</id>
    </parent>
  </parents>
  <author>
    <name>Will Bryant</name>
    <email>will.bryant@gmail.com</email>
  </author>
  <url>http://github.com/rails/rails/commit/8233f8314ba00838e8ef6b2d95cdfb7d58c8dece</url>
  <id>8233f8314ba00838e8ef6b2d95cdfb7d58c8dece</id>
  <committed-date>2008-09-29T08:49:44-07:00</committed-date>
  <authored-date>2008-09-23T21:44:56-07:00</authored-date>
  <message>wrote a test showing eager loading's misbehavior (sanitizing against the wrong table) when the association has a :conditions hash

Signed-off-by: Michael Koziarski &lt;michael@koziarski.com&gt;</message>
  <tree>ca3cbb3d6c168f5d9dc705f2b5c973977de4080a</tree>
  <committer>
    <name>Michael Koziarski</name>
    <email>michael@koziarski.com</email>
  </committer>
</commit>
