charleseff · October 21, 2011 23:45 · grosser · Aug 2, 2012 · grosser · Aug 3, 2012
diff --git a/after_commit_with_transactional_fixtures.rb b/after_commit_with_transactional_fixtures.rb
 module ActiveRecord
  module ConnectionAdapters
    module DatabaseStatements
      #
      # Run the normal transaction method; when it's done, check to see if there
      # is exactly one open transaction. If so, that's the transactional
      # fixtures transaction; from the model's standpoint, the completed
      # transaction is the real deal. Send commit callbacks to models.
      #
      # If the transaction block raises a Rollback, we need to know, so we don't
      # call the commit hooks. Other exceptions don't need to be explicitly
      # accounted for since they will raise uncaught through this method and
      # prevent the code after the hook from running.
      #
      def transaction_with_transactional_fixtures(options = {}, &block)
        return transaction_without_transactional_fixtures(options, &block) unless RSpec.configuration.use_transactional_fixtures

        return_value = nil
        rolled_back  = false

        transaction_without_transactional_fixtures(options) do
          begin
            return_value = yield
          rescue ActiveRecord::Rollback => e
            rolled_back = true
            raise e
          end
        end

        commit_transaction_records(false) if !rolled_back && open_transactions == 1

        return_value

      end

      alias_method_chain :transaction, :transactional_fixtures

      #
      # The @_current_transaction_records is a stack of arrays, each one
      # containing the records associated with the corresponding transaction
      # in the transaction stack. This is used by the
      # `rollback_transaction_records` method (to only send a rollback hook to
      # models attached to the transaction being rolled back) but is usually
      # ignored by the `commit_transaction_records` method. Here we
      # monkey-patch it to temporarily replace the array with only the records
      # for the top-of-stack transaction, so the real
      # `commit_transaction_records` method only sends callbacks to those.
      #
      def commit_transaction_records_with_transactional_fixtures(commit = true)
        return commit_transaction_records_without_transactional_fixtures if !RSpec.configuration.use_transactional_fixtures || commit

        real_current_transaction_records = @_current_transaction_records.clone
        @_current_transaction_records = @_current_transaction_records.pop || []

        begin
          commit_transaction_records_without_transactional_fixtures
        ensure
          @_current_transaction_records = real_current_transaction_records
        end
      end

      alias_method_chain :commit_transaction_records, :transactional_fixtures

    end
  end
 end
	module ActiveRecord
	module ConnectionAdapters
	module DatabaseStatements
	#
	# Run the normal transaction method; when it's done, check to see if there
	# is exactly one open transaction. If so, that's the transactional
	# fixtures transaction; from the model's standpoint, the completed
	# transaction is the real deal. Send commit callbacks to models.
	#
	# If the transaction block raises a Rollback, we need to know, so we don't
	# call the commit hooks. Other exceptions don't need to be explicitly
	# accounted for since they will raise uncaught through this method and
	# prevent the code after the hook from running.
	#
	def transaction_with_transactional_fixtures(options = {}, &block)
	return transaction_without_transactional_fixtures(options, &block) unless RSpec.configuration.use_transactional_fixtures

	return_value = nil
	rolled_back = false

	transaction_without_transactional_fixtures(options) do
	begin
	return_value = yield
	rescue ActiveRecord::Rollback => e
	rolled_back = true
	raise e
	end
	end

	commit_transaction_records(false) if !rolled_back && open_transactions == 1

	return_value

	end

	alias_method_chain :transaction, :transactional_fixtures

	#
	# The @_current_transaction_records is a stack of arrays, each one
	# containing the records associated with the corresponding transaction
	# in the transaction stack. This is used by the
	# `rollback_transaction_records` method (to only send a rollback hook to
	# models attached to the transaction being rolled back) but is usually
	# ignored by the `commit_transaction_records` method. Here we
	# monkey-patch it to temporarily replace the array with only the records
	# for the top-of-stack transaction, so the real
	# `commit_transaction_records` method only sends callbacks to those.
	#
	def commit_transaction_records_with_transactional_fixtures(commit = true)
	return commit_transaction_records_without_transactional_fixtures if !RSpec.configuration.use_transactional_fixtures \|\| commit

	real_current_transaction_records = @_current_transaction_records.clone
	@_current_transaction_records = @_current_transaction_records.pop \|\| []

	begin
	commit_transaction_records_without_transactional_fixtures
	ensure
	@_current_transaction_records = real_current_transaction_records
	end
	end

	alias_method_chain :commit_transaction_records, :transactional_fixtures

	end
	end
	end