Fix PostgreSQL Cidr#change?: comparing '0.0.0.0'/'::' to nil

Co-authored-by: Rafał Brize <[email protected]>

Author: 2 people

activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb

@@ -31,7 +31,7 @@ def serialize(value)
           # TODO: Remove when IPAddr#== compares IPAddr#prefix. See
           # https://github.com/ruby/ipaddr/issues/21
           def changed?(old_value, new_value, _new_value_before_type_cast)
-            super || !old_value.nil? && old_value.prefix != new_value.prefix
+            !old_value.eql?(new_value) || !old_value.nil? && old_value.prefix != new_value.prefix
           end
 
           def cast_value(value)

activerecord/test/cases/adapters/postgresql/cidr_test.rb

@@ -29,6 +29,14 @@ class CidrTest < ActiveRecord::PostgreSQLTestCase
           assert type.changed?("192.168.0.0/24", nil, "")
           assert type.changed?(nil, "192.168.0.0/24", "")
           assert type.changed?("192.168.0.0/24", "192.168.0.0/25", "")
+          assert type.changed?(IPAddr.new("192.168.0.0/24"), nil, "")
+          assert type.changed?(nil, IPAddr.new("192.168.0.0/24"), "")
+          assert type.changed?(IPAddr.new("192.168.0.0/24"), IPAddr.new("192.168.0.0/25"), "")
+
+          assert type.changed?(IPAddr.new("0.0.0.0"), nil, "")
+          assert type.changed?(nil, IPAddr.new("0.0.0.0"), "")
+          assert type.changed?(IPAddr.new("::"), nil, "")
+          assert type.changed?(nil, IPAddr.new("::"), "")
         end
       end
     end