Rm `Type#type_cast`

This helper no longer makes sense as a separate method. Instead I'll
just have `deserialize` call `cast` by default. This led to a random
infinite loop in the `JSON` pg type, when it called `super` from
`deserialize`. Not really a great way to fix that other than not calling
super, or continuing to have the separate method, which makes the public
API differ from what we say it is.

5 files changed, 10 insertions, 18 deletions

diff --git a/activerecord/lib/active_record/type/binary.rb b/activerecord/lib/active_record/type/binary.rb
index 7d23cb5584..0baf8c63ad 100644
--- a/activerecord/lib/active_record/type/binary.rb
+++ b/activerecord/lib/active_record/type/binary.rb
@@ -9,7 +9,7 @@ module ActiveRecord
         true
       end
 
-      def type_cast(value)
+      def cast(value)
         if value.is_a?(Data)
           value.to_s
         else
diff --git a/activerecord/lib/active_record/type/float.rb b/activerecord/lib/active_record/type/float.rb
index 86e3c12258..d88482b85d 100644
--- a/activerecord/lib/active_record/type/float.rb
+++ b/activerecord/lib/active_record/type/float.rb
@@ -7,7 +7,7 @@ module ActiveRecord
         :float
       end
 
-      alias serialize type_cast
+      alias serialize cast
 
       private
 
diff --git a/activerecord/lib/active_record/type/helpers/numeric.rb b/activerecord/lib/active_record/type/helpers/numeric.rb
index b0d4f03117..a755a02a59 100644
--- a/activerecord/lib/active_record/type/helpers/numeric.rb
+++ b/activerecord/lib/active_record/type/helpers/numeric.rb
@@ -2,7 +2,7 @@ module ActiveRecord
   module Type
     module Helpers
       module Numeric # :nodoc:
-        def type_cast(value)
+        def cast(value)
           value = case value
                   when true then 1
                   when false then 0
diff --git a/activerecord/lib/active_record/type/integer.rb b/activerecord/lib/active_record/type/integer.rb
index a3e6cb215f..2a1b04ac7f 100644
--- a/activerecord/lib/active_record/type/integer.rb
+++ b/activerecord/lib/active_record/type/integer.rb
@@ -22,7 +22,7 @@ module ActiveRecord
       end
 
       def serialize(value)
-        result = type_cast(value)
+        result = cast(value)
         if result
           ensure_in_range(result)
         end
diff --git a/activerecord/lib/active_record/type/value.rb b/activerecord/lib/active_record/type/value.rb
index cdac1f9fa9..fc3ef5e83b 100644
--- a/activerecord/lib/active_record/type/value.rb
+++ b/activerecord/lib/active_record/type/value.rb
@@ -14,12 +14,12 @@ module ActiveRecord
 
       # Convert a value from database input to the appropriate ruby type. The
       # return value of this method will be returned from
-      # ActiveRecord::AttributeMethods::Read#read_attribute. See also
-      # Value#type_cast and Value#cast_value.
+      # ActiveRecord::AttributeMethods::Read#read_attribute. The default
+      # implementation just calls Value#cast.
       #
       # +value+ The raw input, as provided from the database.
       def deserialize(value)
-        type_cast(value)
+        cast(value)
       end
 
       # Type casts a value from user input (e.g. from a setter). This value may
@@ -29,11 +29,11 @@ module ActiveRecord
       #
       # The return value of this method will be returned from
       # ActiveRecord::AttributeMethods::Read#read_attribute. See also:
-      # Value#type_cast and Value#cast_value.
+      # Value#cast_value.
       #
       # +value+ The raw input, as provided to the attribute setter.
       def cast(value)
-        type_cast(value)
+        cast_value(value) unless value.nil?
       end
 
       # Cast a value from the ruby type to a type that the database knows how
@@ -93,16 +93,8 @@ module ActiveRecord
 
       private
 
-      # Convenience method. If you don't need separate behavior for
-      # Value#deserialize and Value#cast, you can override
-      # this method instead. The default behavior of both methods is to call
-      # this one. See also Value#cast_value.
-      def type_cast(value) # :doc:
-        cast_value(value) unless value.nil?
-      end
-
       # Convenience method for types which do not need separate type casting
-      # behavior for user and database inputs. Called by Value#type_cast for
+      # behavior for user and database inputs. Called by Value#cast for
       # values except +nil+.
       def cast_value(value) # :doc:
         value