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 06:58:10 -0700 |
| commit | 030d30d64cd8d8e376f9db25a3fe3e11358731cf (patch) | |
| tree | 6584d98b81430685a2cd57b507ea507dfa7ab884 /activerecord/lib/active_record | |
| parent | 9e5b8e3831552a103b2dcf8de75fb6a2337d42ba (diff) | |
| parent | ef99c1147592e91bb256952986470592ea0e5f6c (diff) | |
| download | rails-030d30d64cd8d8e376f9db25a3fe3e11358731cf.tar.gz rails-030d30d64cd8d8e376f9db25a3fe3e11358731cf.tar.bz2 rails-030d30d64cd8d8e376f9db25a3fe3e11358731cf.zip | |
Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many
Fix the `:primary_key` option for `has_many` associations.
Diffstat (limited to 'activerecord/lib/active_record')
| -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 29fae809da..cf8a589496 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -115,8 +115,7 @@ module ActiveRecord if records == :all scope = self.scope else - keys = records.map { |r| r[reflection.association_primary_key] } - scope = self.scope.where(reflection.association_primary_key => keys) + scope = self.scope.where(reflection.klass.primary_key => records) end if method == :delete_all |