From 7500a5469231665e5d65f47ff75e55097f096e09 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 15 Dec 2004 15:09:44 +0000 Subject: Added automatic transaction block around AssociationCollection.<<, AssociationCollection.delete, and AssociationCollection.destroy_all git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@171 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../associations/association_collection.rb | 25 +++++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 00758aa66c..5c7770e739 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -37,11 +37,14 @@ module ActiveRecord # Add +records+ to this association. Returns +self+ so method calls may be chained. # Since << flattens its argument list and inserts each record, +push+ and +concat+ behave identically. def <<(*records) - flatten_deeper(records).each do |record| - raise_on_type_mismatch(record) - insert_record(record) - @collection << record if loaded? + @owner.transaction do + flatten_deeper(records).each do |record| + raise_on_type_mismatch(record) + insert_record(record) + @collection << record if loaded? + end end + self end @@ -51,13 +54,19 @@ module ActiveRecord # Remove +records+ from this association. Does not destroy +records+. def delete(*records) records = flatten_deeper(records) - records.each { |record| raise_on_type_mismatch(record) } - delete_records(records) - records.each { |record| @collection.delete(record) } if loaded? + + @owner.transaction do + records.each { |record| raise_on_type_mismatch(record) } + delete_records(records) + records.each { |record| @collection.delete(record) } if loaded? + end end def destroy_all - each { |record| record.destroy } + @owner.transaction do + each { |record| record.destroy } + end + @collection = [] end -- cgit v1.2.3