From c66ac2102be2d7a53872c7bb96939f616275010e Mon Sep 17 00:00:00 2001 From: Florian Weber Date: Wed, 23 Nov 2005 21:03:25 +0000 Subject: Fixed bug where using update_attribute after pushing a record to a habtm association of the object caused duplicate rows in the join table. #2888 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3167 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/associations.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index d4b7f88907..70bc4a4d65 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -800,6 +800,7 @@ module ActiveRecord after_callback = <<-end_eval association = instance_variable_get("@#{association_name}") + if association.respond_to?(:loaded?) if @new_record_before_save records_to_save = association @@ -809,8 +810,11 @@ module ActiveRecord records_to_save.each { |record| association.send(:insert_record, record) } association.send(:construct_sql) # reconstruct the SQL queries now that we know the owner's id end + + @new_record_before_save = false + true end_eval - + # Doesn't use after_save as that would save associations added in after_create/after_update twice after_create(after_callback) after_update(after_callback) -- cgit v1.2.3