From 10177d3a38fb441065ee5d664e880cdb403b1da7 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sun, 15 Aug 2010 11:37:50 -0300
Subject: [PATCH] Revert "Makes AR use AMo to_key implementation"

This reverts commit ccd4364a13d7a3af9eec7672e08d0682765f5b2f.
---
 .../lib/active_record/attribute_methods/primary_key.rb      | 6 ++++++
 activerecord/test/cases/primary_keys_test.rb                | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/attribute_methods/primary_key.rb b/activerecord/lib/active_record/attribute_methods/primary_key.rb
index 365fdeb55aacf..82d94b848a1d1 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 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 5cdcb05902a5e..1e44237e0ab3e 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 nil, topic.to_key
+    assert_equal [1], topic.to_key
   end
 
   def test_integer_key