Ticket #10212: multi_db_transaction_patch.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)@@ -124,6 +124,25 @@         end
       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
+      
+      
+
       protected
         def log(sql, name)
           if block_given?
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