mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #5289 from rafaelfranca/fix-through-associations
Fix has_many through associations when mass_assignment_sanitizer is strict
This commit is contained in:
commit
104eebb4cc
6 changed files with 43 additions and 8 deletions
|
@ -73,7 +73,9 @@ module ActiveRecord
|
|||
# association
|
||||
def build_through_record(record)
|
||||
@through_records[record.object_id] ||= begin
|
||||
through_record = through_association.build(construct_join_attributes(record))
|
||||
ensure_mutable
|
||||
|
||||
through_record = through_association.build
|
||||
through_record.send("#{source_reflection.name}=", record)
|
||||
through_record
|
||||
end
|
||||
|
|
|
@ -37,9 +37,7 @@ module ActiveRecord
|
|||
# situation it is more natural for the user to just create or modify their join records
|
||||
# directly as required.
|
||||
def construct_join_attributes(*records)
|
||||
if source_reflection.macro != :belongs_to
|
||||
raise HasManyThroughCantAssociateThroughHasOneOrManyReflection.new(owner, reflection)
|
||||
end
|
||||
ensure_mutable
|
||||
|
||||
join_attributes = {
|
||||
source_reflection.foreign_key =>
|
||||
|
@ -73,6 +71,12 @@ module ActiveRecord
|
|||
!owner[through_reflection.foreign_key].nil?
|
||||
end
|
||||
|
||||
def ensure_mutable
|
||||
if source_reflection.macro != :belongs_to
|
||||
raise HasManyThroughCantAssociateThroughHasOneOrManyReflection.new(owner, reflection)
|
||||
end
|
||||
end
|
||||
|
||||
def ensure_not_nested
|
||||
if reflection.nested?
|
||||
raise HasManyThroughNestedAssociationsAreReadonly.new(owner, reflection)
|
||||
|
|
|
@ -44,17 +44,33 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
|
|||
end
|
||||
|
||||
def test_associate_existing
|
||||
posts(:thinking); people(:david) # Warm cache
|
||||
post = posts(:thinking)
|
||||
person = people(:david)
|
||||
|
||||
assert_queries(1) do
|
||||
posts(:thinking).people << people(:david)
|
||||
post.people << person
|
||||
end
|
||||
|
||||
assert_queries(1) do
|
||||
assert posts(:thinking).people.include?(people(:david))
|
||||
assert post.people.include?(person)
|
||||
end
|
||||
|
||||
assert posts(:thinking).reload.people(true).include?(people(:david))
|
||||
assert post.reload.people(true).include?(person)
|
||||
end
|
||||
|
||||
def test_associate_existing_with_strict_mass_assignment_sanitizer
|
||||
SecureReader.mass_assignment_sanitizer = :strict
|
||||
|
||||
SecureReader.new
|
||||
|
||||
post = posts(:thinking)
|
||||
person = people(:david)
|
||||
|
||||
assert_queries(1) do
|
||||
post.secure_people << person
|
||||
end
|
||||
ensure
|
||||
SecureReader.mass_assignment_sanitizer = :logger
|
||||
end
|
||||
|
||||
def test_associate_existing_record_twice_should_add_to_target_twice
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
class Person < ActiveRecord::Base
|
||||
has_many :readers
|
||||
has_many :secure_readers
|
||||
has_one :reader
|
||||
|
||||
has_many :posts, :through => :readers
|
||||
has_many :secure_posts, :through => :secure_readers
|
||||
has_many :posts_with_no_comments, :through => :readers, :source => :post, :include => :comments,
|
||||
:conditions => 'comments.id is null', :references => :comments
|
||||
|
||||
|
|
|
@ -115,8 +115,10 @@ class Post < ActiveRecord::Base
|
|||
has_many :named_categories, :through => :standard_categorizations
|
||||
|
||||
has_many :readers
|
||||
has_many :secure_readers
|
||||
has_many :readers_with_person, :include => :person, :class_name => "Reader"
|
||||
has_many :people, :through => :readers
|
||||
has_many :secure_people, :through => :secure_readers
|
||||
has_many :single_people, :through => :readers
|
||||
has_many :people_with_callbacks, :source=>:person, :through => :readers,
|
||||
:before_add => lambda {|owner, reader| log(:added, :before, reader.first_name) },
|
||||
|
|
|
@ -3,3 +3,12 @@ class Reader < ActiveRecord::Base
|
|||
belongs_to :person, :inverse_of => :readers
|
||||
belongs_to :single_person, :class_name => 'Person', :foreign_key => :person_id, :inverse_of => :reader
|
||||
end
|
||||
|
||||
class SecureReader < ActiveRecord::Base
|
||||
self.table_name = "readers"
|
||||
|
||||
belongs_to :secure_post, :class_name => "Post", :foreign_key => "post_id"
|
||||
belongs_to :secure_person, :inverse_of => :secure_readers, :class_name => "Person", :foreign_key => "person_id"
|
||||
|
||||
attr_accessible nil
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue