0
@@ -108,7 +108,7 @@ module ActiveRecord
0
         result = true
0
         load_target if @owner.new_record?
0
 
0
-        @owner.transaction do
0
+        transaction do
0
           flatten_deeper(records).each do |record|
0
             raise_on_type_mismatch(record)
0
             add_record_to_target_with_callbacks(record) do |r|
0
@@ -123,6 +123,21 @@ module ActiveRecord
0
       alias_method :push, :<<
0
       alias_method :concat, :<<
0
 
0
+      # Starts a transaction in the association class's database connection.
0
+      #
0
+      #   class Author < ActiveRecord::Base
0
+      #     has_many :books
0
+      #   end
0
+      #
0
+      #   Author.find(:first).books.transaction do
0
+      #     # same effect as calling Book.transaction
0
+      #   end
0
+      def transaction(*args)
0
+        @reflection.klass.transaction(*args) do
0
+          yield
0
+        end
0
+      end
0
+
0
       # Remove all records from this association
0
       def delete_all
0
         load_target
0
@@ -173,7 +188,7 @@ module ActiveRecord
0
         records = flatten_deeper(records)
0
         records.each { |record| raise_on_type_mismatch(record) }
0
         
0
-        @owner.transaction do
0
+        transaction do
0
           records.each { |record| callback(:before_remove, record) }
0
           
0
           old_records = records.reject {|r| r.new_record? }
0
@@ -200,7 +215,7 @@ module ActiveRecord
0
       end
0
       
0
       def destroy_all
0
-        @owner.transaction do
0
+        transaction do
0
           each { |record| record.destroy }
0
         end
0
 
0
@@ -292,7 +307,7 @@ module ActiveRecord
0
         other   = other_array.size < 100 ? other_array : other_array.to_set
0
         current = @target.size < 100 ? @target : @target.to_set
0
 
0
-        @owner.transaction do
0
+        transaction do
0
           delete(@target.select { |v| !other.include?(v) })
0
           concat(other_array.select { |v| !current.include?(v) })
0
         end

0
@@ -9,14 +9,14 @@ module ActiveRecord
0
       alias_method :new, :build
0
 
0
       def create!(attrs = nil)
0
-        @reflection.klass.transaction do
0
+        transaction do
0
           self << (object = attrs ? @reflection.klass.send(:with_scope, :create => attrs) { @reflection.create_association! } : @reflection.create_association!)
0
           object
0
         end
0
       end
0
 
0
       def create(attrs = nil)
0
-        @reflection.klass.transaction do
0
+        transaction do
0
           self << (object = attrs ? @reflection.klass.send(:with_scope, :create => attrs) { @reflection.create_association } : @reflection.create_association)
0
           object
0
         end

0
@@ -738,4 +738,13 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
0
     # Array#count in Ruby >=1.8.7, which would raise an ArgumentError
0
     assert_nothing_raised { david.projects.count(:all, :conditions => '1=1') }
0
   end
0
+
0
+  uses_mocha 'mocking Post.transaction' do
0
+    def test_association_proxy_transaction_method_starts_transaction_in_association_class
0
+      Post.expects(:transaction)
0
+      Category.find(:first).posts.transaction do
0
+        # nothing
0
+      end
0
+    end
0
+  end
0
 end

0
@@ -1071,4 +1071,13 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
0
     ActiveRecord::Base.store_full_sti_class = old
0
   end
0
 
0
+  uses_mocha 'mocking Comment.transaction' do
0
+    def test_association_proxy_transaction_method_starts_transaction_in_association_class
0
+      Comment.expects(:transaction)
0
+      Post.find(:first).comments.transaction do
0
+        # nothing
0
+      end
0
+    end
0
+  end
0
+
0
 end

0
@@ -220,4 +220,13 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
0
     assert_equal [posts(:welcome).id, posts(:authorless).id].sort, person.post_ids.sort
0
     assert !person.posts.loaded?
0
   end
0
+
0
+  uses_mocha 'mocking Tag.transaction' do
0
+    def test_association_proxy_transaction_method_starts_transaction_in_association_class
0
+      Tag.expects(:transaction)
0
+      Post.find(:first).tags.transaction do
0
+        # nothing
0
+      end
0
+    end
0
+  end
0
 end