Ticket #10212: mutil_db_transaction_with_tests.txt

Index: C:/code_work/Edge Rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
===================================================================
--- C:/code_work/Edge Rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb      (revision 8167)
+++ C:/code_work/Edge Rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb      (working copy)
@@ -117,6 +117,23 @@
         @connection
       end
 
+      # Used to track the number of transactions currently running
+      # on a connection.
+      def open_transactions
+        @open_transactions ||= 0
+      end
+
+      # Increment the number of database transactions running by one.
+      def increment_open_transactions
+        @open_transactions ||= 0
+        @open_transactions += 1
+      end
+      
+      # Decrement the number of database transactions running by one.
+      def decrement_open_transactions
+        @open_transactions -= 1
+      end
+
       def log_info(sql, name, runtime)
         if @logger && @logger.debug?
           name = "#{name.nil? ? "SQL" : name} (#{sprintf("%f", runtime)})"
Index: C:/code_work/Edge Rails/activerecord/lib/active_record/transactions.rb
===================================================================
--- C:/code_work/Edge Rails/activerecord/lib/active_record/transactions.rb      (revision 8167)
+++ C:/code_work/Edge Rails/activerecord/lib/active_record/transactions.rb      (working copy)
@@ -84,12 +84,13 @@
     module ClassMethods
       def transaction(&block)
         previous_handler = trap('TERM') { raise TransactionError, "Transaction aborted" }
-        increment_open_transactions
+        trans_count = connection.increment_open_transactions
+        start_db_trans = (trans_count == 1)
 
         begin
-          connection.transaction(Thread.current['start_db_transaction'], &block)
+          connection.transaction(start_db_trans, &block)
         ensure
-          decrement_open_transactions
+          connection.decrement_open_transactions
           trap('TERM', previous_handler)
         end
       end
Index: C:/code_work/Edge Rails/activerecord/test/multiple_db_test.rb
===================================================================
--- C:/code_work/Edge Rails/activerecord/test/multiple_db_test.rb       (revision 8167)
+++ C:/code_work/Edge Rails/activerecord/test/multiple_db_test.rb       (working copy)
@@ -57,4 +57,29 @@
 
     assert Course.connection
   end
+  
+  def test_transactions_across_databases
+    c1 = Course.find(1)
+    e1 = Entrant.find(1)
+    
+    begin
+      Course.transaction do
+        Entrant.transaction do
+          c1.name = "Typo"
+          e1.name = "Typo"
+          c1.save
+          e1.save
+          raise "No I messed up."
+        end
+      end
+    rescue
+      # Yup caught it
+    end
+    
+    assert_equal "Typo", c1.name
+    assert_equal "Typo", e1.name
+    
+    assert_equal "Ruby Development", Course.find(1).name
+    assert_equal "Ruby Developer", Entrant.find(1).name
+  end
 end