1 files changed, 9 insertions, 72 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/cast.rb b/activerecord/lib/active_record/connection_adapters/postgresql/cast.rb
index 551a9289c3..bb54de05c8 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/cast.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/cast.rb
@@ -1,41 +1,12 @@
 module ActiveRecord
   module ConnectionAdapters
-    class PostgreSQLColumn < Column
-      module Cast
-        def point_to_string(point)
+    module PostgreSQL
+      module Cast # :nodoc:
+        def point_to_string(point) # :nodoc:
           "(#{point[0]},#{point[1]})"
         end
 
-        def string_to_point(string)
-          if string[0] == '(' && string[-1] == ')'
-            string = string[1...-1]
-          end
-          string.split(',').map{ |v| Float(v) }
-        end
-
-        def string_to_time(string)
-          return string unless String === string
-
-          case string
-          when 'infinity'; Float::INFINITY
-          when '-infinity'; -Float::INFINITY
-          when / BC$/
-            super("-" + string.sub(/ BC$/, ""))
-          else
-            super
-          end
-        end
-
-        def string_to_bit(value)
-          case value
-          when /^0x/i
-            value[2..-1].hex.to_s(2) # Hexadecimal notation
-          else
-            value                    # Bit-string notation
-          end
-        end
-
-        def hstore_to_string(object, array_member = false)
+        def hstore_to_string(object, array_member = false) # :nodoc:
           if Hash === object
             string = object.map { |k, v| "#{escape_hstore(k)}=>#{escape_hstore(v)}" }.join(',')
             string = escape_hstore(string) if array_member
@@ -45,7 +16,7 @@ module ActiveRecord
           end
         end
 
-        def string_to_hstore(string)
+        def string_to_hstore(string) # :nodoc:
           if string.nil?
             nil
           elsif String === string
@@ -59,7 +30,7 @@ module ActiveRecord
           end
         end
 
-        def json_to_string(object)
+        def json_to_string(object) # :nodoc:
           if Hash === object || Array === object
             ActiveSupport::JSON.encode(object)
           else
@@ -67,7 +38,7 @@ module ActiveRecord
           end
         end
 
-        def array_to_string(value, column, adapter)
+        def array_to_string(value, column, adapter) # :nodoc:
           casted_values = value.map do |val|
             if String === val
               if val == "NULL"
@@ -82,13 +53,13 @@ module ActiveRecord
           "{#{casted_values.join(',')}}"
         end
 
-        def range_to_string(object)
+        def range_to_string(object) # :nodoc:
           from = object.begin.respond_to?(:infinite?) && object.begin.infinite? ? '' : object.begin
           to   = object.end.respond_to?(:infinite?) && object.end.infinite? ? '' : object.end
           "[#{from},#{to}#{object.exclude_end? ? ')' : ']'}"
         end
 
-        def string_to_json(string)
+        def string_to_json(string) # :nodoc:
           if String === string
             ActiveSupport::JSON.decode(string)
           else
@@ -96,32 +67,6 @@ module ActiveRecord
           end
         end
 
-        def string_to_cidr(string)
-          if string.nil?
-            nil
-          elsif String === string
-            begin
-              IPAddr.new(string)
-            rescue ArgumentError
-              nil
-            end
-          else
-            string
-          end
-        end
-
-        def cidr_to_string(object)
-          if IPAddr === object
-            "#{object.to_s}/#{object.instance_variable_get(:@mask_addr).to_s(2).count('1')}"
-          else
-            object
-          end
-        end
-
-        def string_to_array(string, oid)
-          parse_pg_array(string).map {|val| type_cast_array(oid, val)}
-        end
-
         private
 
           HstorePair = begin
@@ -154,14 +99,6 @@ module ActiveRecord
               "\"#{value}\""
             end
           end
-
-          def type_cast_array(oid, value)
-            if ::Array === value
-              value.map {|item| type_cast_array(oid, item)}
-            else
-              oid.type_cast value
-            end
-          end
       end
     end
   end