diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-23 06:58:10 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-23 18:45:12 -0300 |
commit | d29399061e54092fdbf57780c38e19dd1921f45d (patch) | |
tree | 9f7622ff464de62454531ba6fcb329e34450fc4e /activerecord/test/cases | |
parent | f8c4805a8247a62594d29c5f3ef634d57d2abbf1 (diff) | |
download | rails-d29399061e54092fdbf57780c38e19dd1921f45d.tar.gz rails-d29399061e54092fdbf57780c38e19dd1921f45d.tar.bz2 rails-d29399061e54092fdbf57780c38e19dd1921f45d.zip |
Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many
Fix the `:primary_key` option for `has_many` associations.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/associations/has_many_association.rb
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/associations/has_many_associations_test.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb index 869ec1e4b8..8fd9de07c9 100644 --- a/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_associations_test.rb @@ -1492,6 +1492,14 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert_equal david.essays, Essay.find_all_by_writer_id("David") end + def test_has_many_assignment_with_custom_primary_key + david = people(:david) + + assert_equal ["A Modest Proposal"], david.essays.map(&:name) + david.essays = [Essay.create!(name: "Remote Work" )] + assert_equal ["Remote Work"], david.essays.map(&:name) + end + def test_blank_custom_primary_key_on_new_record_should_not_run_queries author = Author.new assert !author.essays.loaded? |