Merge branch 'master' into loofah

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/test/controller/integration_test.rb
	actionview/CHANGELOG.md

1 files changed, 102 insertions, 112 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
index bc4884b538..4a7f2aaca8 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
@@ -1,20 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
-    class Transaction #:nodoc:
-      attr_reader :connection
-
-      def initialize(connection)
-        @connection = connection
-        @state = TransactionState.new
-      end
-
-      def state
-        @state
-      end
-    end
-
     class TransactionState
-      attr_accessor :parent
+      attr_reader :parent
 
       VALID_STATES = Set.new([:committed, :rolledback, nil])
 
@@ -43,82 +30,24 @@ module ActiveRecord
       end
     end
 
-    class ClosedTransaction < Transaction #:nodoc:
-      def number
-        0
-      end
-
-      def begin(options = {})
-        RealTransaction.new(connection, self, options)
-      end
-
-      def closed?
-        true
-      end
-
-      def open?
-        false
-      end
-
-      def joinable?
-        false
-      end
-
-      # This is a noop when there are no open transactions
-      def add_record(record)
-      end
+    class NullTransaction #:nodoc:
+      def initialize; end
+      def closed?; true; end
+      def open?; false; end
+      def joinable?; false; end
+      def add_record(record); end
     end
 
-    class OpenTransaction < Transaction #:nodoc:
-      attr_reader :parent, :records
-      attr_writer :joinable
-
-      def initialize(connection, parent, options = {})
-        super connection
-
-        @parent    = parent
-        @records   = []
-        @finishing = false
-        @joinable  = options.fetch(:joinable, true)
-      end
-
-      # This state is necessary so that we correctly handle stuff that might
-      # happen in a commit/rollback. But it's kinda distasteful. Maybe we can
-      # find a better way to structure it in the future.
-      def finishing?
-        @finishing
-      end
-
-      def joinable?
-        @joinable && !finishing?
-      end
-
-      def number
-        if finishing?
-          parent.number
-        else
-          parent.number + 1
-        end
-      end
-
-      def begin(options = {})
-        if finishing?
-          parent.begin
-        else
-          SavepointTransaction.new(connection, self, options)
-        end
-      end
+    class Transaction #:nodoc:
 
-      def rollback
-        @finishing = true
-        perform_rollback
-        parent
-      end
+      attr_reader :connection, :state, :records, :savepoint_name
+      attr_writer :joinable
 
-      def commit
-        @finishing = true
-        perform_commit
-        parent
+      def initialize(connection, options)
+        @connection = connection
+        @state = TransactionState.new
+        @records = []
+        @joinable = options.fetch(:joinable, true)
       end
 
       def add_record(record)
@@ -129,19 +58,25 @@ module ActiveRecord
         end
       end
 
-      def rollback_records
+      def rollback
         @state.set_state(:rolledback)
+      end
+
+      def rollback_records
         records.uniq.each do |record|
           begin
-            record.rolledback!(parent.closed?)
+            record.rolledback! full_rollback?
           rescue => e
             record.logger.error(e) if record.respond_to?(:logger) && record.logger
           end
         end
       end
 
-      def commit_records
+      def commit
         @state.set_state(:committed)
+      end
+
+      def commit_records
         records.uniq.each do |record|
           begin
             record.committed!
@@ -151,19 +86,40 @@ module ActiveRecord
         end
       end
 
-      def closed?
-        false
+      def full_rollback?; true; end
+      def joinable?; @joinable; end
+      def closed?; false; end
+      def open?; !closed?; end
+    end
+
+    class SavepointTransaction < Transaction
+
+      def initialize(connection, savepoint_name, options)
+        super(connection, options)
+        if options[:isolation]
+          raise ActiveRecord::TransactionIsolationError, "cannot set transaction isolation in a nested transaction"
+        end
+        connection.create_savepoint(@savepoint_name = savepoint_name)
+      end
+
+      def rollback
+        super
+        connection.rollback_to_savepoint(savepoint_name)
+        rollback_records
       end
 
-      def open?
-        true
+      def commit
+        super
+        connection.release_savepoint(savepoint_name)
       end
+
+      def full_rollback?; false; end
     end
 
-    class RealTransaction < OpenTransaction #:nodoc:
-      def initialize(connection, parent, options = {})
-        super
+    class RealTransaction < Transaction
 
+      def initialize(connection, options)
+        super
         if options[:isolation]
           connection.begin_isolated_db_transaction(options[:isolation])
         else
@@ -171,37 +127,71 @@ module ActiveRecord
         end
       end
 
-      def perform_rollback
+      def rollback
+        super
         connection.rollback_db_transaction
         rollback_records
       end
 
-      def perform_commit
+      def commit
+        super
         connection.commit_db_transaction
         commit_records
       end
     end
 
-    class SavepointTransaction < OpenTransaction #:nodoc:
-      def initialize(connection, parent, options = {})
-        if options[:isolation]
-          raise ActiveRecord::TransactionIsolationError, "cannot set transaction isolation in a nested transaction"
-        end
+    class TransactionManager #:nodoc:
+      def initialize(connection)
+        @stack = []
+        @connection = connection
+      end
 
-        super
-        connection.create_savepoint
+      def begin_transaction(options = {})
+        transaction =
+          if @stack.empty?
+            RealTransaction.new(@connection, options)
+          else
+            SavepointTransaction.new(@connection, "active_record_#{@stack.size}", options)
+          end
+        @stack.push(transaction)
+        transaction
       end
 
-      def perform_rollback
-        connection.rollback_to_savepoint
-        rollback_records
+      def commit_transaction
+        @stack.pop.commit
       end
 
-      def perform_commit
-        @state.set_state(:committed)
-        @state.parent = parent.state
-        connection.release_savepoint
+      def rollback_transaction
+        @stack.pop.rollback
+      end
+
+      def within_new_transaction(options = {})
+        transaction = begin_transaction options
+        yield
+      rescue Exception => error
+        transaction.rollback if transaction
+        raise
+      ensure
+        begin
+          transaction.commit unless error
+        rescue Exception
+          transaction.rollback
+          raise
+        ensure
+          @stack.pop if transaction
+        end
       end
+
+      def open_transactions
+        @stack.size
+      end
+
+      def current_transaction
+        @stack.last || NULL_TRANSACTION
+      end
+
+      private
+        NULL_TRANSACTION = NullTransaction.new
     end
   end
 end