diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-15 13:00:53 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-15 13:00:53 -0200 |
| commit | 7f4975ffc618bc3125039c565507a385c1187183 (patch) | |
| tree | 2f5e8dece8f9be3fc1e7c6d20d00815ac5bf0e29 /activerecord/test/cases/associations | |
| parent | de83b017a90e9fe68da1359a97ac5b58b7c0f3fe (diff) | |
| download | rails-7f4975ffc618bc3125039c565507a385c1187183.tar.gz rails-7f4975ffc618bc3125039c565507a385c1187183.tar.bz2 rails-7f4975ffc618bc3125039c565507a385c1187183.zip | |
Revert "Merge pull request #9252 from senny/8423_hmt_preloading_bug"
This reverts commit c5451777b038c5e48567f69256986ae42a2cde48.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/cases/associations')
| -rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index 5d07ffa241..20c6b691fc 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -1112,10 +1112,4 @@ class EagerAssociationTest < ActiveRecord::TestCase Post.includes(:comments).order(nil).where(:comments => {:body => "Thank you for the welcome"}).first end end - - test "preloading does not cache has many association subset when preloaded with a through association" do - author = Author.includes(:comments_with_order_and_conditions, :posts).first - assert_no_queries { assert_equal 2, author.comments_with_order_and_conditions.size } - assert_no_queries { assert_equal 5, author.posts.size, "should not cache a subset of the association" } - end end |