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/lib | |
| 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/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 059e6c77bc..dab57bab88 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -89,8 +89,7 @@ module ActiveRecord records.each { |r| r.destroy } update_counter(-records.length) unless inverse_updates_counter_cache? else - keys = records.map { |r| r[reflection.association_primary_key] } - scope = scoped.where(reflection.association_primary_key => keys) + scope = self.scope.where(reflection.klass.primary_key => records) if method == :delete_all update_counter(-scope.delete_all) |