diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-23 15:04:58 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-23 15:04:58 -0300 |
| commit | cb7f03f061264ae1d4626369bf7f1264d0914a2b (patch) | |
| tree | 216d89972d35896028900362dc2b1d5e4155dc10 /activerecord/lib/active_record | |
| parent | b4cce0760af85119a7953953a6219833c3d06260 (diff) | |
| parent | 9dc8e7739c749484a70a99b0b058883f529e3a99 (diff) | |
| download | rails-cb7f03f061264ae1d4626369bf7f1264d0914a2b.tar.gz rails-cb7f03f061264ae1d4626369bf7f1264d0914a2b.tar.bz2 rails-cb7f03f061264ae1d4626369bf7f1264d0914a2b.zip | |
Merge pull request #15265 from danielmbarlow/master
Added force_reload to Auto-generated methods doc
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 727ee5f65f..8d77fad2d5 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -202,12 +202,13 @@ module ActiveRecord # For instance, +attributes+ and +connection+ would be bad choices for association names. # # == Auto-generated methods + # See also Instance Public methods below for more details. # # === Singular associations (one-to-one) # | | belongs_to | # generated methods | belongs_to | :polymorphic | has_one # ----------------------------------+------------+--------------+--------- - # other | X | X | X + # other(force_reload=false) | X | X | X # other=(other) | X | X | X # build_other(attributes={}) | X | | X # create_other(attributes={}) | X | | X @@ -217,7 +218,7 @@ module ActiveRecord # | | | has_many # generated methods | habtm | has_many | :through # ----------------------------------+-------+----------+---------- - # others | X | X | X + # others(force_reload=false) | X | X | X # others=(other,other,...) | X | X | X # other_ids | X | X | X # other_ids=(id,id,...) | X | X | X |