aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/class_methods
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-01-24 20:57:11 +0000
committerJon Leighton <j@jonathanleighton.com>2011-01-30 11:56:41 +0000
commitaa86420be24d7df9c07379bcf6f33904d0d41adc (patch)
tree1ca85cc227bafdeda80e2ed234d26cbe2fa21ce5 /activerecord/lib/active_record/associations/class_methods
parentde05e2fb15ee4fd521aae202eb4517ae05114c28 (diff)
downloadrails-aa86420be24d7df9c07379bcf6f33904d0d41adc.tar.gz
rails-aa86420be24d7df9c07379bcf6f33904d0d41adc.tar.bz2
rails-aa86420be24d7df9c07379bcf6f33904d0d41adc.zip
Rename AssociationProxy#loaded to loaded! as it mutates the association
Diffstat (limited to 'activerecord/lib/active_record/associations/class_methods')
-rw-r--r--activerecord/lib/active_record/associations/class_methods/join_dependency.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/class_methods/join_dependency.rb b/activerecord/lib/active_record/associations/class_methods/join_dependency.rb
index cb3edafab1..fdd4fe8946 100644
--- a/activerecord/lib/active_record/associations/class_methods/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/class_methods/join_dependency.rb
@@ -210,7 +210,7 @@ module ActiveRecord
case macro
when :has_many, :has_and_belongs_to_many
collection = record.send(join_part.reflection.name)
- collection.loaded
+ collection.loaded!
collection.target.push(association)
collection.send(:set_inverse_instance, association)
when :belongs_to