1 files changed, 23 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..42ea599a74 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
@@ -8,31 +6,35 @@ module ActiveRecord
     # We can then redefine how certain data types may be handled in the schema dumper on the
     # Adapter level by over-writing this code inside the database specific adapters
     module ColumnDumper
-      def column_spec(column, types)
-        spec = prepare_column_options(column, types)
-        (spec.keys - [:name, :type]).each{ |k| spec[k].insert(0, "#{k.to_s}: ")}
+      def column_spec(column)
+        spec = prepare_column_options(column)
+        (spec.keys - [:name, :type]).each{ |k| spec[k].insert(0, "#{k}: ")}
         spec
       end
 
+      def column_spec_for_primary_key(column)
+        return if column.type == :integer
+        spec = { id: column.type.inspect }
+        spec.merge!(prepare_column_options(column).delete_if { |key, _| [:name, :type].include?(key) })
+      end
+
       # This can be overridden on a Adapter level basis to support other
       # extended datatypes (Example: Adding an array option in the
       # PostgreSQLAdapter)
-      def prepare_column_options(column, types)
+      def prepare_column_options(column)
         spec = {}
         spec[:name]      = column.name.inspect
+        spec[:type]      = column.type.to_s
+        spec[:null]      = 'false' unless column.null
 
-        # 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'
+        limit = column.limit || native_database_types[column.type][:limit]
+        spec[:limit]     = limit.inspect if 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?
+
+        default = schema_default(column) if column.has_default?
+        spec[:default]   = default unless default.nil?
+
         spec
       end
 
@@ -43,28 +45,12 @@ module ActiveRecord
 
       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
+      def schema_default(column)
+        default = column.type_cast_from_database(column.default)
+        unless default.nil?
+          column.type_cast_for_schema(default)
         end
+      end
     end
   end
 end