diff options
| author | Rick Olson <technoweenie@gmail.com> | 2007-12-28 18:01:22 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2007-12-28 18:01:22 +0000 |
| commit | 0e3a54a3b92c0f9a7bf95f8cb11ba2db89f6eecc (patch) | |
| tree | 3163c025f67e1960fcc390344c33f1923a62f28c /activerecord/lib/active_record/associations.rb | |
| parent | e8730713d2744ab0149ad03997ad05f336c31941 (diff) | |
| download | rails-0e3a54a3b92c0f9a7bf95f8cb11ba2db89f6eecc.tar.gz rails-0e3a54a3b92c0f9a7bf95f8cb11ba2db89f6eecc.tar.bz2 rails-0e3a54a3b92c0f9a7bf95f8cb11ba2db89f6eecc.zip | |
Don't unnecessarily load has_many associations in after_update callbacks. Closes #6822 [stopdropandrew, canadaduane]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8504 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 3b2c6b7a59..deadba7418 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1079,8 +1079,10 @@ module ActiveRecord if association.respond_to?(:loaded?) if new_record? association - else + elsif association.loaded? association.select { |record| record.new_record? } + else + association.target.select { |record| record.new_record? } end.each do |record| errors.add "#{association_name}" unless record.valid? end @@ -1097,6 +1099,8 @@ module ActiveRecord association elsif association.respond_to?(:loaded?) && association.loaded? association.select { |record| record.new_record? } + elsif association.respond_to?(:loaded?) && !association.loaded? + association.target.select { |record| record.new_record? } else [] end |