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/CHANGELOG.md | |
| 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/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index ebd1a3424a..29d218277f 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,5 +1,10 @@ ## unreleased ## +* Fix the `:primary_key` option for `has_many` associations. + Fixes #10693. + + *Yves Senn* + * fixes bug introduced by #3329. Now, when autosaving associations, deletions happen before inserts and saves. This prevents a 'duplicate unique value' database error that would occur if a record being created had |