Move attribute_types_cached_by_default into attribute methods reading concern

1 files changed, 11 insertions, 0 deletions

diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb
index 1178c713b4..bea332ef26 100644
--- a/activerecord/lib/active_record/attribute_methods/read.rb
+++ b/activerecord/lib/active_record/attribute_methods/read.rb
@@ -3,8 +3,15 @@ module ActiveRecord
     module Read
       extend ActiveSupport::Concern
 
+      ATTRIBUTE_TYPES_CACHED_BY_DEFAULT = [:datetime, :timestamp, :time, :date]
+
       included do
         attribute_method_suffix ""
+
+        cattr_accessor :attribute_types_cached_by_default, :instance_writer => false
+        self.attribute_types_cached_by_default = ATTRIBUTE_TYPES_CACHED_BY_DEFAULT
+
+        # Undefine id so it can be used as an attribute name
         undef_method :id
       end
 
@@ -35,6 +42,10 @@ module ActiveRecord
             else
               define_read_method(attr_name.to_sym, attr_name, columns_hash[attr_name])
             end
+
+            if attr_name == primary_key && attr_name != "id"
+              define_read_method(:id, attr_name, columns_hash[attr_name])
+            end
           end
 
         private