Browse files

Revert "Merge pull request #9252 from senny/8423_hmt_preloading_bug"

This reverts commit c545177.

Conflicts:
	activerecord/CHANGELOG.md
  • Loading branch information...
1 parent de83b01 commit 7f4975ffc618bc3125039c565507a385c1187183 @rafaelfranca rafaelfranca committed Feb 15, 2013
View
22 activerecord/CHANGELOG.md
@@ -1,27 +1,5 @@
## unreleased ##
-* Preloading `has_many :through` associations with conditions won't
- cache the `:through` association. This will prevent invalid
- subsets to be cached.
- Fixes #8423.
-
- Example:
-
- class User
- has_many :posts
- has_many :recent_comments, -> { where('created_at > ?', 1.week.ago) }, :through => :posts
- end
-
- a_user = User.includes(:recent_comments).first
-
- # this is preloaded
- a_user.recent_comments
-
- # fetching the recent_comments through the posts association won't preload it.
- a_user.posts
-
- *Yves Senn*
-
* Fix counter cache columns not updated when replacing `has_many :through`
associations.
Backport #8400.
View
3 activerecord/lib/active_record/associations/preloader/through_association.rb
@@ -37,8 +37,7 @@ def through_records_by_owner
through_records = Array.wrap(owner.send(through_reflection.name))
# Dont cache the association - we would only be caching a subset
- if (through_scope != through_reflection.klass.unscoped) ||
- (reflection.options[:source_type] && through_reflection.collection?)
+ if reflection.options[:source_type] && through_reflection.collection?
owner.association(through_reflection.name).reset
end
View
6 activerecord/test/cases/associations/eager_test.rb
@@ -1112,10 +1112,4 @@ def test_join_eager_with_nil_order_should_generate_valid_sql
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

0 comments on commit 7f4975f

Please sign in to comment.