diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-08-14 17:43:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-14 17:43:26 -0400 |
| commit | 8244a45e3ed083b0a9ef239a48095b3ddd81da11 (patch) | |
| tree | 4b38a2a75a0a56a4dea287582963d8bc36935756 /activerecord/lib/active_record/reflection.rb | |
| parent | efad56a0d93c51d7ebce5007a80df522335430bd (diff) | |
| parent | b23e86967c4dfa5aa4f007291458c48dd39b179a (diff) | |
| download | rails-8244a45e3ed083b0a9ef239a48095b3ddd81da11.tar.gz rails-8244a45e3ed083b0a9ef239a48095b3ddd81da11.tar.bz2 rails-8244a45e3ed083b0a9ef239a48095b3ddd81da11.zip | |
Merge pull request #27609 from kamipo/fix_association_primary_key
Fix `reflection.association_primary_key` for `has_many` association
Diffstat (limited to 'activerecord/lib/active_record/reflection.rb')
| -rw-r--r-- | activerecord/lib/active_record/reflection.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index 7f1601805c..564dbcb342 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -715,6 +715,10 @@ module ActiveRecord Associations::HasManyAssociation end end + + def association_primary_key(klass = nil) + primary_key(klass || self.klass) + end end class HasOneReflection < AssociationReflection # :nodoc: |