1 files changed, 4 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
index f168282ea3..6149ac4906 100644
--- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
+++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
@@ -2,6 +2,8 @@ module ActiveRecord
   module AttributeMethods
     module TimeZoneConversion
       class Type # :nodoc:
+        delegate :type, :type_cast_for_database, to: :@column
+
         def initialize(column)
           @column = column
         end
@@ -10,10 +12,6 @@ module ActiveRecord
           value = @column.type_cast(value)
           value.acts_like?(:time) ? value.in_time_zone : value
         end
-
-        def type
-          @column.type
-        end
       end
 
       extend ActiveSupport::Concern
@@ -28,7 +26,7 @@ module ActiveRecord
 
       module ClassMethods
         protected
-        # Defined for all +datetime+ and +timestamp+ attributes when +time_zone_aware_attributes+ are enabled.
+        # Defined for all +datetime+ attributes when +time_zone_aware_attributes+ are enabled.
         # This enhanced write method will automatically convert the time passed to it to the zone stored in Time.zone.
         def define_method_attribute=(attr_name)
           if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name])
@@ -51,7 +49,7 @@ module ActiveRecord
         def create_time_zone_conversion_attribute?(name, column)
           time_zone_aware_attributes &&
             !self.skip_time_zone_conversion_for_attributes.include?(name.to_sym) &&
-            (:datetime == column.type || :timestamp == column.type)
+            (:datetime == column.type)
         end
       end
     end