diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-06 19:23:40 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-06 19:23:40 +0000 |
| commit | 35670bbde59de9d0838027bd4fcd4cc04f928e3d (patch) | |
| tree | 838b2e56d702cf6b1f4ad78b956ea414510d19db /activerecord/lib/active_record/associations.rb | |
| parent | a27ccf176564db7293fba115a7d05087611ae84b (diff) | |
| download | rails-35670bbde59de9d0838027bd4fcd4cc04f928e3d.tar.gz rails-35670bbde59de9d0838027bd4fcd4cc04f928e3d.tar.bz2 rails-35670bbde59de9d0838027bd4fcd4cc04f928e3d.zip | |
Don't save has_one associations unnecessarily. Closes #5735.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4690 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | 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 192c7b7a5f..009153d1d2 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -584,7 +584,7 @@ module ActiveRecord module_eval do after_save <<-EOF association = instance_variable_get("@#{reflection.name}") - unless association.nil? + if !association.nil? && (new_record? || association.new_record? || association["#{reflection.primary_key_name}"] != id) association["#{reflection.primary_key_name}"] = id association.save(true) end |