diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-09-22 16:28:19 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-09-22 16:28:19 -0300 |
commit | 53a8a7f9cb7ee93513c445302f25643423fea8e7 (patch) | |
tree | 44b84838d0582442db18962afe8d031f047fdb5e /activerecord | |
parent | f4595e624babf939788ec07aa9497b1650c54c6c (diff) | |
parent | 949deedf08ae6c08b0c45a73693e0fbda291e09f (diff) | |
download | rails-53a8a7f9cb7ee93513c445302f25643423fea8e7.tar.gz rails-53a8a7f9cb7ee93513c445302f25643423fea8e7.tar.bz2 rails-53a8a7f9cb7ee93513c445302f25643423fea8e7.zip |
Merge pull request #17012 from petedmarsh/clarify-association-primary-key-option-documentation
Clarify the documentation of the primary_key option for associations
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 18da28d480..12ca3a48a9 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1171,7 +1171,7 @@ module ActiveRecord # of this class in lower-case and "_id" suffixed. So a Person class that makes a +has_many+ # association will use "person_id" as the default <tt>:foreign_key</tt>. # [:primary_key] - # Specify the method that returns the primary key used for the association. By default this is +id+. + # Specify the name of the column to use as the primary key for the association. By default this is +id+. # [:dependent] # Controls what happens to the associated objects when # their owner is destroyed. Note that these are implemented as |