From 36a84a4f15f29b41c7cac2f8de410055006a8a8d Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 13 Aug 2010 22:15:15 -0300
Subject: [PATCH] Makes AR use AMo to_key implementation

[#5249]
---
 .../lib/active_record/attribute_methods/primary_key.rb      | 6 ------
 activerecord/test/cases/primary_keys_test.rb                | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/activerecord/lib/active_record/attribute_methods/primary_key.rb b/activerecord/lib/active_record/attribute_methods/primary_key.rb
index 82d94b848a1d1..365fdeb55aacf 100644
--- a/activerecord/lib/active_record/attribute_methods/primary_key.rb
+++ b/activerecord/lib/active_record/attribute_methods/primary_key.rb
@@ -3,12 +3,6 @@ module AttributeMethods
     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 1e44237e0ab3e..5cdcb05902a5e 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -26,7 +26,7 @@ def test_to_key_with_customized_primary_key
   def test_to_key_with_primary_key_after_destroy
     topic = Topic.find(1)
     topic.destroy
-    assert_equal [1], topic.to_key
+    assert_equal nil, topic.to_key
   end
 
   def test_integer_key