Undefine id and let it automatically be generated

1 files changed, 2 insertions, 11 deletions

diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb
index a3327dc083..2ea09499c5 100644
--- a/activerecord/lib/active_record/attribute_methods/read.rb
+++ b/activerecord/lib/active_record/attribute_methods/read.rb
@@ -5,6 +5,7 @@ module ActiveRecord
 
       included do
         attribute_method_suffix ""
+        undef_method :id
       end
 
       module ClassMethods
@@ -54,7 +55,7 @@ module ActiveRecord
             if cache_attribute?(attr_name)
               access_code = "@attributes_cache['#{attr_name}'] ||= (#{access_code})"
             end
-            evaluate_attribute_method attr_name, "def #{symbol}; #{access_code}; end", attr_name
+            evaluate_attribute_method attr_name, "def #{symbol}; #{access_code}; end", symbol
           end
       end
 
@@ -78,16 +79,6 @@ module ActiveRecord
         end
       end
 
-      # A model instance's primary key is always available as model.id
-      # whether you name it the default 'id' or set it to something else.
-      def id
-        attr_name = self.class.primary_key
-        column = column_for_attribute(attr_name)
-
-        self.class.send(:define_read_method, :id, attr_name, column)
-        id
-      end
-
       # Returns true if the attribute is of a text column and marked for serialization.
       def unserializable_attribute?(attr_name, column)
         column.text? && self.class.serialized_attributes[attr_name]