From dfe1aeb776ed9a7da8b431c7933c858d155a13c7 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Tue, 23 Aug 2005 11:05:04 +0000 Subject: Saving a record with two unsaved belongs_to associations pointing to the same object fails #2023 [Tobias Luetke] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2040 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/associations.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index ffb0d5679b..d0db4469e2 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -445,10 +445,12 @@ module ActiveRecord module_eval do before_save <<-EOF association = instance_variable_get("@#{association_name}") - if not association.nil? and association.new_record? - association.save(true) + if not association.nil? + if association.new_record? + association.save(true) + association.send(:construct_sql) + end self["#{association_class_primary_key_name}"] = association.id - association.send(:construct_sql) end EOF end -- cgit v1.2.3