0
@@ -118,6 +118,19 @@ module ActiveRecord
0
         @connection
0
       end
0
 
0
+      def open_transactions
0
+        @open_transactions ||= 0
0
+      end
0
+
0
+      def increment_open_transactions
0
+        @open_transactions ||= 0
0
+        @open_transactions += 1
0
+      end
0
+
0
+      def decrement_open_transactions
0
+        @open_transactions -= 1
0
+      end
0
+
0
       def log_info(sql, name, runtime)
0
         if @logger && @logger.debug?
0
           name = "#{name.nil? ? "SQL" : name} (#{sprintf("%f", runtime)})"

0
@@ -515,7 +515,7 @@ class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash)
0
 
0
           all_loaded_fixtures.update(fixtures_map)
0
 
0
-          connection.transaction(Thread.current['open_transactions'].to_i == 0) do
0
+          connection.transaction(connection.open_transactions.zero?) do
0
             fixtures.reverse.each { |fixture| fixture.delete_existing_fixtures }
0
             fixtures.each { |fixture| fixture.insert_fixtures }
0
 
0
@@ -930,7 +930,7 @@ module Test #:nodoc:
0
             load_fixtures
0
             @@already_loaded_fixtures[self.class] = @loaded_fixtures
0
           end
0
-          ActiveRecord::Base.send :increment_open_transactions
0
+          ActiveRecord::Base.connection.increment_open_transactions
0
           ActiveRecord::Base.connection.begin_db_transaction
0
         # Load fixtures for every test.
0
         else
0
@@ -951,9 +951,9 @@ module Test #:nodoc:
0
         end
0
 
0
         # Rollback changes if a transaction is active.
0
-        if use_transactional_fixtures? && Thread.current['open_transactions'] != 0
0
+        if use_transactional_fixtures? && ActiveRecord::Base.connection.open_transactions != 0
0
           ActiveRecord::Base.connection.rollback_db_transaction
0
-          Thread.current['open_transactions'] = 0
0
+          ActiveRecord::Base.connection.decrement_open_transactions
0
         end
0
         ActiveRecord::Base.verify_active_connections!
0
       end

0
@@ -73,25 +73,14 @@ module ActiveRecord
0
     # trigger a ROLLBACK when raised, but not be re-raised by the transaction block.
0
     module ClassMethods
0
       def transaction(&block)
0
-        increment_open_transactions
0
+        connection.increment_open_transactions
0
 
0
         begin
0
-          connection.transaction(Thread.current['start_db_transaction'], &block)
0
+          connection.transaction(connection.open_transactions == 1, &block)
0
         ensure
0
-          decrement_open_transactions
0
+          connection.decrement_open_transactions
0
         end
0
       end
0
-
0
-      private
0
-        def increment_open_transactions #:nodoc:
0
-          open = Thread.current['open_transactions'] ||= 0
0
-          Thread.current['start_db_transaction'] = open.zero?
0
-          Thread.current['open_transactions'] = open + 1
0
-        end
0
-
0
-        def decrement_open_transactions #:nodoc:
0
-          Thread.current['open_transactions'] -= 1
0
-        end
0
     end
0
 
0
     def transaction(&block)

0
@@ -461,11 +461,11 @@ class FixturesBrokenRollbackTest < ActiveRecord::TestCase
0
   alias_method :teardown, :blank_teardown
0
 
0
   def test_no_rollback_in_teardown_unless_transaction_active
0
-    assert_equal 0, Thread.current['open_transactions']
0
+    assert_equal 0, ActiveRecord::Base.connection.open_transactions
0
     assert_raise(RuntimeError) { ar_setup_fixtures }
0
-    assert_equal 0, Thread.current['open_transactions']
0
+    assert_equal 0, ActiveRecord::Base.connection.open_transactions
0
     assert_nothing_raised { ar_teardown_fixtures }
0
-    assert_equal 0, Thread.current['open_transactions']
0
+    assert_equal 0, ActiveRecord::Base.connection.open_transactions
0
   end
0
 
0
   private

0
@@ -57,4 +57,29 @@ class MultipleDbTest < ActiveRecord::TestCase
0
 
0
     assert Course.connection
0
   end
0
+
0
+  def test_transactions_across_databases
0
+    c1 = Course.find(1)
0
+    e1 = Entrant.find(1)
0
+
0
+    begin
0
+      Course.transaction do
0
+        Entrant.transaction do
0
+          c1.name = "Typo"
0
+          e1.name = "Typo"
0
+          c1.save
0
+          e1.save
0
+          raise "No I messed up."
0
+        end
0
+      end
0
+    rescue
0
+      # Yup caught it
0
+    end
0
+
0
+    assert_equal "Typo", c1.name
0
+    assert_equal "Typo", e1.name
0
+
0
+    assert_equal "Ruby Development", Course.find(1).name
0
+    assert_equal "Ruby Developer", Entrant.find(1).name
0
+  end
0
 end