diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 59b757eca9..38547843db 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Update association/method mapping table to refected latest collection methods for has_many :through. Closes #8772 [lifofifo] + * Explain semantics of having several different AR instances in a transaction block. Closes #9036 [jacobat, Marcel Molina] * Update Schema documentation to use updated sexy migration notation. Closes #10086 [sjgman9] diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index b250af47e8..fcc041beca 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -125,7 +125,7 @@ module ActiveRecord # ----------------------------------+-------+----------+---------- # #others | X | X | X # #others=(other,other,...) | X | X | - # #other_ids | X | X | + # #other_ids | X | X | X # #other_ids=(id,id,...) | X | X | # #others<< | X | X | X # #others.push | X | X | X @@ -133,15 +133,15 @@ module ActiveRecord # #others.build(attributes={}) | X | X | X # #others.create(attributes={}) | X | X | # #others.create!(attributes={}) | X | X | X - # #others.size | X | X | - # #others.length | X | X | - # #others.count | | X | + # #others.size | X | X | X + # #others.length | X | X | X + # #others.count | | X | X # #others.sum(args*,&block) | X | X | X - # #others.empty? | X | X | + # #others.empty? | X | X | X # #others.clear | X | X | # #others.delete(other,other,...) | X | X | X # #others.delete_all | X | X | - # #others.destroy_all | X | X | + # #others.destroy_all | X | X | X # #others.find(*args) | X | X | X # #others.find_first | X | | # #others.uniq | X | X | |