See the CHANGELOG for details.

Fixes #950.

This reverts commit c99d507f.

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

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)

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)

Support for :primary_key option on the source reflection of a through association, where the source is a has_one or has_many

Add a commented, failing test for using a habtm in a has many through association. I want to refactor how aliasing works first.

Add support for table aliasing, with a test that needs aliasing in order to work correctly. This test incidentally provides a more complicated test case (4 inner joins, 2 using polymorphism).

Prevent test_has_many_through_a_has_many_through_association_on_through_reflection failing for me due to ordering of the results

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#922 state:resovled]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJoshua Peek <josh@joshpeek.com>

Enable has_many :through for going through a has_one association on the join model [#2719 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

[#765 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Ensure JoinAssociation uses aliased table name when multiple associations have hash conditions on the same table

Add :having option to find, to use in combination with grouped finds. Also added to has_many and has_and_belongs_to_many associations.
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#1028 state:committed]

explicitly including child associations that are also included in the parent association definition should not result in double records in the collection/double loads (#1110)
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#1110 state:committed]

Revert "Add :accessible option to Associations for allowing mass assignments using hash. [#474 state:resolved]"

This reverts commit e0750d6a.

Conflicts:

	activerecord/CHANGELOG
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/association_collection.rb

Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Add :accessible option to Associations for allowing mass assignments using hash. [#474 state:resolved]

Allows nested Hashes (i.e. from nested forms) to hydrate the appropriate
ActiveRecord models.

class Post < ActiveRecord::Base
  belongs_to :author,   :accessible => true
  has_many   :comments, :accessible => true
end

post = Post.create({
  :title    => 'Accessible Attributes',
  :author   => { :name => 'David Dollar' },
  :comments => [
    { :body => 'First Post!' },
    { :body => 'Nested Hashes are great!' }
  ]
})

post.comments << { :body => 'Another Comment' }
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>