Revert "Makes AR use AMo to_key implementation"

This reverts commit 36a84a4f15f29b41c7cac2f8de410055006a8a8d.

2 files changed, 7 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/attribute_methods/primary_key.rb b/activerecord/lib/active_record/attribute_methods/primary_key.rb
index 365fdeb55a..82d94b848a 100644
--- a/activerecord/lib/active_record/attribute_methods/primary_key.rb
+++ b/activerecord/lib/active_record/attribute_methods/primary_key.rb
@@ -3,6 +3,12 @@ module ActiveRecord
     module PrimaryKey
       extend ActiveSupport::Concern
 
+      # Returns this record's primary key value wrapped in an Array
+      # or nil if the record is a new_record?
+      def to_key
+        new_record? ? nil : [ id ]
+      end
+
       module ClassMethods
         # Defines the primary key field -- can be overridden in subclasses. Overwriting will negate any effect of the
         # primary_key_prefix_type setting, though.
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index 5cdcb05902..1e44237e0a 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -26,7 +26,7 @@ class PrimaryKeysTest < ActiveRecord::TestCase
   def test_to_key_with_primary_key_after_destroy
     topic = Topic.find(1)
     topic.destroy
-    assert_equal nil, topic.to_key
+    assert_equal [1], topic.to_key
   end
 
   def test_integer_key