TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #47565 from Shopify/fix-nullifying-association-with-composite-query-constraints

Browse Source 
Fix nullifying association with composite query constraints
This commit is contained in:
Eileen M. Uchitelle 2023-03-03 09:13:44 -05:00 committed by GitHub
commit 8200a3d678
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/associations/foreign_association.rb
View File

@ -12,7 +12,7 @@ def foreign_key_present?
def nullified_owner_attributes def nullified_owner_attributes
Hash.new.tap do |attrs| Hash.new.tap do |attrs|
attrs[reflection.foreign_key] = nil Array(reflection.foreign_key).each { |foreign_key| attrs[foreign_key] = nil }
attrs[reflection.type] = nil if reflection.type.present? attrs[reflection.type] = nil if reflection.type.present?
end end
end end

28
activerecord/test/cases/associations_test.rb
View File

@ -177,6 +177,21 @@ def test_append_composite_foreign_key_has_many_association
assert_equal(blog_post.blog_id, comment.blog_id) assert_equal(blog_post.blog_id, comment.blog_id)
end end
def test_nullify_composite_foreign_key_has_many_association
blog_post = sharded_blog_posts(:great_post_blog_one)
comment = sharded_comments(:great_comment_blog_post_one)
assert_not_empty(blog_post.comments)
blog_post.comments = []
comment = Sharded::Comment.find(comment.id)
assert_nil(comment.blog_post_id)
assert_nil(comment.blog_id)
assert_empty(blog_post.comments)
assert_empty(blog_post.reload.comments)
end
def test_assign_persisted_composite_foreign_key_belongs_to_association def test_assign_persisted_composite_foreign_key_belongs_to_association
comment = sharded_comments(:great_comment_blog_post_one) comment = sharded_comments(:great_comment_blog_post_one)
another_blog = sharded_blogs(:sharded_blog_two) another_blog = sharded_blogs(:sharded_blog_two)
@ -192,6 +207,19 @@ def test_assign_persisted_composite_foreign_key_belongs_to_association
assert_equal(comment.blog_post_id, blog_post.id) assert_equal(comment.blog_post_id, blog_post.id)
end end
def test_nullify_composite_foreign_key_belongs_to_association
comment = sharded_comments(:great_comment_blog_post_one)
assert_not_nil(comment.blog_post)
comment.blog_post = nil
assert_nil(comment.blog_id)
assert_nil(comment.blog_post_id)
comment.save
assert_nil(comment.blog_post)
assert_nil(comment.reload.blog_post)
end
def test_assign_composite_foreign_key_belongs_to_association def test_assign_composite_foreign_key_belongs_to_association
comment = sharded_comments(:great_comment_blog_post_one) comment = sharded_comments(:great_comment_blog_post_one)
another_blog = sharded_blogs(:sharded_blog_two) another_blog = sharded_blogs(:sharded_blog_two)