Specify the STI type condition using SQL IN rather than a whole load of ORs. Required a fix to ActiveRecord::Relation#merge for properly merging create_with_value. This also fixes a situation where the type condition was appearing twice in the resultant SQL query.

Verify that when has_many associated objects are destroyed via :dependent => :destroy, when the parent is destroyed, the callbacks are run

Refactor configure_dependency_for_has_many to use AssociationCollection#delete_all. It was necessary to change test_before_destroy in lifecycle_test.rb so that it checks topic.replies.size *before* doing the destroy, as afterwards it will now (correctly) be 0.

Verify that there is no unwanted implicit readonly set on Model.has_many_through.find(id) [#5442 state:resolved]

Raise an error for associations which try to go :through a polymorphic association [#6212 state:resolved]

If a has_many goes :through a belongs_to, and the foreign key of the belongs_to changes, then the has_many should be considered stale.

Improved strategy for updating a belongs_to association when the foreign key changes. Rather than resetting each affected association when the foreign key changes, we should lazily check for 'staleness' (where fk does not match target id) when the association is accessed.

Revert "Optimize <association>_ids for hm:t with belongs_to source". The optimisation has too many edge cases, such as when the reflection, source reflection, or through reflection has conditions, orders, etc. [#6153 state:resolved]

This reverts commit 373b053d.

Conflicts:

	activerecord/lib/active_record/associations.rb

Test demonstrating problem with foo.association_ids where it's a has_many :through with :conditions, with a belongs_to as the source reflection

When a has_many association is not :uniq, appending the same record multiple times should append it to the @target multiple times [#5964 state:resolved]

Fix creation of has_many through records with custom primary_key option on belongs_to [#2990 state:resolved]

This is additional fix for commit
ebc47465 Respect the default_scope on a join model when reading a through association
which otherwise was failing on Oracle (as it returned fixture comments in different order).

has_many associations with :dependent => :delete_all should update the counter cache when deleting records

Fix problem where wrong keys are used in JoinAssociation when an association goes :through a belongs_to [#2801 state:resolved]

Fix problem with duplicated records when a :uniq :through association is preloaded [#2447 state:resolved]

* rename method names (actually in tests)
* rename instance variable @_named_scopes_cache to @_scopes_cache
* rename references in doc comments
* don't touch CHANGELOG :)

Verify that creating a has_many through record where there is a default_scope on the join model works correctly (creates the join record with the default scope applied)