3 files changed, 39 insertions, 14 deletions
diff --git a/activerecord/lib/active_record/type/binary.rb b/activerecord/lib/active_record/type/binary.rb
index bc93f6e1bf..3bf29b5026 100644
--- a/activerecord/lib/active_record/type/binary.rb
+++ b/activerecord/lib/active_record/type/binary.rb
@@ -9,7 +9,16 @@ module ActiveRecord
         true
       end
 
+      def type_cast(value)
+        if value.is_a?(Data)
+          value.to_s
+        else
+          super
+        end
+      end
+
       def type_cast_for_database(value)
+        return if value.nil?
         Data.new(super)
       end
 
diff --git a/activerecord/lib/active_record/type/serialized.rb b/activerecord/lib/active_record/type/serialized.rb
index 0866383de9..e6d84eadc0 100644
--- a/activerecord/lib/active_record/type/serialized.rb
+++ b/activerecord/lib/active_record/type/serialized.rb
@@ -9,7 +9,7 @@ module ActiveRecord
         super(subtype)
       end
 
-      def type_cast(value)
+      def type_cast_from_database(value)
         if is_default_value?(value)
           value
         else
@@ -17,15 +17,17 @@ module ActiveRecord
         end
       end
 
-      def type_cast_for_write(value)
+      def type_cast_from_user(value)
+        type_cast_from_database(type_cast_for_database(value))
+      end
+
+      def type_cast_for_database(value)
         return if value.nil?
         unless is_default_value?(value)
           super coder.dump(value)
         end
       end
 
-      alias type_cast_for_database type_cast_for_write
-
       def serialized?
         true
       end
@@ -34,6 +36,17 @@ module ActiveRecord
         ActiveRecord::Store::IndifferentHashAccessor
       end
 
+      def init_with(coder)
+        @subtype = coder['subtype']
+        @coder = coder['coder']
+        __setobj__(@subtype)
+      end
+
+      def encode_with(coder)
+        coder['subtype'] = @subtype
+        coder['coder'] = @coder
+      end
+
       private
 
       def is_default_value?(value)
diff --git a/activerecord/lib/active_record/type/value.rb b/activerecord/lib/active_record/type/value.rb
index 1c41b28646..efcdab1c0e 100644
--- a/activerecord/lib/active_record/type/value.rb
+++ b/activerecord/lib/active_record/type/value.rb
@@ -16,15 +16,16 @@ module ActiveRecord
       # must override this method.
       def type; end
 
-      # Takes an input from the database, or from attribute setters,
-      # and casts it to a type appropriate for this object. This method
-      # should not be overriden by subclasses. Instead, override `cast_value`.
-      def type_cast(value)
-        cast_value(value) unless value.nil?
+      def type_cast_from_database(value)
+        type_cast(value)
+      end
+
+      def type_cast_from_user(value)
+        type_cast(value)
       end
 
       def type_cast_for_database(value)
-        type_cast_for_write(value)
+        value
       end
 
       def type_cast_for_schema(value)
@@ -50,10 +51,6 @@ module ActiveRecord
       def klass # :nodoc:
       end
 
-      def type_cast_for_write(value) # :nodoc:
-        value
-      end
-
       # +old_value+ will always be type-cast.
       # +new_value+ will come straight from the database
       # or from assignment, so it could be anything. Types
@@ -64,6 +61,12 @@ module ActiveRecord
       end
 
       private
+      # Takes an input from the database, or from attribute setters,
+      # and casts it to a type appropriate for this object. This method
+      # should not be overriden by subclasses. Instead, override `cast_value`.
+      def type_cast(value) # :api: public
+        cast_value(value) unless value.nil?
+      end
 
       # Responsible for casting values from external sources to the appropriate
       # type. Called by `type_cast` for all values except `nil`.