1 files changed, 3 insertions, 37 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
index cdf0cbe218..5a0efe49c7 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
@@ -1,5 +1,3 @@
-require 'ipaddr'
-
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
     # The goal of this module is to move Adapter specific column
@@ -20,19 +18,12 @@ module ActiveRecord
       def prepare_column_options(column, types)
         spec = {}
         spec[:name]      = column.name.inspect
-
-        # AR has an optimization which handles zero-scale decimals as integers. This
-        # code ensures that the dumper still dumps the column as a decimal.
-        spec[:type]      = if column.type == :integer && /^(numeric|decimal)/ =~ column.sql_type
-                             'decimal'
-                           else
-                             column.type.to_s
-                           end
-        spec[:limit]     = column.limit.inspect if column.limit != types[column.type][:limit] && spec[:type] != 'decimal'
+        spec[:type]      = column.type.to_s
+        spec[:limit]     = column.limit.inspect if column.limit != types[column.type][:limit]
         spec[:precision] = column.precision.inspect if column.precision
         spec[:scale]     = column.scale.inspect if column.scale
         spec[:null]      = 'false' unless column.null
-        spec[:default]   = default_string(column.default) if column.has_default?
+        spec[:default]   = column.type_cast_for_schema(column.default) if column.has_default?
         spec
       end
 
@@ -40,31 +31,6 @@ module ActiveRecord
       def migration_keys
         [:name, :limit, :precision, :scale, :default, :null]
       end
-
-      private
-
-        def default_string(value)
-          case value
-          when BigDecimal
-            value.to_s
-          when Date, DateTime, Time
-            "'#{value.to_s(:db)}'"
-          when Range
-            # infinity dumps as Infinity, which causes uninitialized constant error
-            value.inspect.gsub('Infinity', '::Float::INFINITY')
-          when IPAddr
-            subnet_mask = value.instance_variable_get(:@mask_addr)
-
-            # If the subnet mask is equal to /32, don't output it
-            if subnet_mask == (2**32 - 1)
-              "\"#{value.to_s}\""
-            else
-              "\"#{value.to_s}/#{subnet_mask.to_s(2).count('1')}\""
-            end
-          else
-            value.inspect
-          end
-        end
     end
   end
 end