Merge pull request #8010 from subwindow/postgres_inet_default_fix

Fix default output for postgres network address types

1 files changed, 11 insertions, 0 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 cc289d4a14..f587bf8140 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
@@ -1,3 +1,5 @@
+require 'ipaddr'
+
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
     # The goal of this module is to move Adapter specific column
@@ -50,6 +52,15 @@ module ActiveRecord
           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