aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-06-18 05:28:59 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-06-18 05:28:59 +0000
commita2f26b971bf61263582604ad7e1af14b9566949e (patch)
tree1ca5aff6b73e2bd334277a53aaaf438ace7cd51f /activerecord/lib
parent4f00d181d5a6c01aeb1c19f8ab002153a39c8a17 (diff)
downloadrails-a2f26b971bf61263582604ad7e1af14b9566949e.tar.gz
rails-a2f26b971bf61263582604ad7e1af14b9566949e.tar.bz2
rails-a2f26b971bf61263582604ad7e1af14b9566949e.zip
Fixed that adding a record to a has_and_belongs_to collection would always save it -- now it only saves if its a new record #1203 [Alisdair McDiarmid]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1453 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 42a4f3495d..b34574161f 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -104,7 +104,9 @@ module ActiveRecord
end
def insert_record(record)
- return false unless record.save
+ if record.new_record?
+ return false unless record.save
+ end
if @options[:insert_sql]
@owner.connection.execute(interpolate_sql(@options[:insert_sql], record))