Revert "Merge pull request #6226 from gnufied/master"

This reverts commit 9bf1a0db4acbbf9e8e6f707250269185224e7efe, reversing
changes made to fed97091b9546d369a240d10b184793d49247dd3.

Conflicts:
	activerecord/test/cases/transaction_callbacks_test.rb

Reason: This fix introduces another issue described at #8937, so we are
reverting it to restore the behavior of 3-2-stable.

We will fix both issues when we come out with a better solution

2 files changed, 6 insertions, 34 deletions

diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb
index 4dbd668fcf..a5955ccba4 100644
--- a/activerecord/lib/active_record/transactions.rb
+++ b/activerecord/lib/active_record/transactions.rb
@@ -339,8 +339,12 @@ module ActiveRecord
     # Save the new record state and id of a record so it can be restored later if a transaction fails.
     def remember_transaction_record_state #:nodoc:
       @_start_transaction_state[:id] = id if has_attribute?(self.class.primary_key)
-      @_start_transaction_state[:new_record] = @new_record
-      @_start_transaction_state[:destroyed] = @destroyed
+      unless @_start_transaction_state.include?(:new_record)
+        @_start_transaction_state[:new_record] = @new_record
+      end
+      unless @_start_transaction_state.include?(:destroyed)
+        @_start_transaction_state[:destroyed] = @destroyed
+      end
       @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) + 1
       @_start_transaction_state[:frozen?] = @attributes.frozen?
     end
diff --git a/activerecord/test/cases/transaction_callbacks_test.rb b/activerecord/test/cases/transaction_callbacks_test.rb
index 766a5c0c90..9485de88a6 100644
--- a/activerecord/test/cases/transaction_callbacks_test.rb
+++ b/activerecord/test/cases/transaction_callbacks_test.rb
@@ -281,38 +281,6 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
   end
 end
 
-
-class SaveFromAfterCommitBlockTest < ActiveRecord::TestCase
-  self.use_transactional_fixtures = false
-
-  class TopicWithSaveInCallback < ActiveRecord::Base
-    self.table_name = :topics
-    after_commit :cache_topic, :on => :create
-    after_commit :call_update, :on => :update
-    attr_accessor :cached, :record_updated
-
-    def call_update
-      self.record_updated = true
-    end
-
-    def cache_topic
-      unless cached
-        self.cached = true
-        self.save
-      else
-        self.cached = false
-      end
-    end
-  end
-
-  def test_after_commit_in_save
-    topic = TopicWithSaveInCallback.new()
-    topic.save
-    assert_equal true, topic.cached
-    assert_equal true, topic.record_updated
-  end
-end
-
 class CallbacksOnMultipleActionsTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false