1 files changed, 10 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/serialization.rb b/activerecord/lib/active_record/attribute_methods/serialization.rb
index c3466153d6..47c6f94ba7 100644
--- a/activerecord/lib/active_record/attribute_methods/serialization.rb
+++ b/activerecord/lib/active_record/attribute_methods/serialization.rb
@@ -65,6 +65,8 @@ module ActiveRecord
       end
 
       class Type # :nodoc:
+        delegate :type, :type_cast_for_database, to: :@column
+
         def initialize(column)
           @column = column
         end
@@ -77,10 +79,6 @@ module ActiveRecord
           end
         end
 
-        def type
-          @column.type
-        end
-
         def accessor
           ActiveRecord::Store::IndifferentHashAccessor
         end
@@ -142,6 +140,14 @@ module ActiveRecord
           end
         end
 
+        def raw_type_cast_attribute_for_write(column, value)
+          if column && coder = self.class.serialized_attributes[column.name]
+            Attribute.new(coder, value, :serialized)
+          else
+            super
+          end
+        end
+
         def _field_changed?(attr, old, value)
           if self.class.serialized_attributes.include?(attr)
             old != value