Skip to content

A platform for community discussion. Free, open, simple.

MT: Fix IP addresses being nulled by the converter

Gerhard Schlager4755cdbfe5d1
diff --git a/migrations/core/lib/migrations/database.rb b/migrations/core/lib/migrations/database.rb
index 2b468aad29b..1d82dc6838a 100644
--- a/migrations/core/lib/migrations/database.rb
+++ b/migrations/core/lib/migrations/database.rb
@@ -59,6 +59,9 @@ module Migrations
def self.format_ip_address(value)
return nil if value.blank?
+ # `PG::BasicTypeMapForResults` decodes `inet` columns into `IPAddr`
+ # objects, which `IPAddr.new` rejects
+ return value.to_s if value.is_a?(IPAddr)
IPAddr.new(value).to_s
rescue ArgumentError
nil
diff --git a/migrations/core/spec/lib/database_spec.rb b/migrations/core/spec/lib/database_spec.rb
index 69863d4b33d..08f4b48173e 100644
--- a/migrations/core/spec/lib/database_spec.rb
+++ b/migrations/core/spec/lib/database_spec.rb
@@ -129,6 +129,16 @@ RSpec.describe Migrations::Database do
it "returns nil for nil input" do
expect(described_class.format_ip_address(nil)).to be_nil
end
+
+ it "formats an IPv4 `IPAddr`" do
+ expect(described_class.format_ip_address(IPAddr.new("192.168.1.1"))).to eq("192.168.1.1")
+ end
+
+ it "formats an IPv6 `IPAddr`" do
+ expect(
+ described_class.format_ip_address(IPAddr.new("2001:0db8:85a3:0000:0000:8a2e:0370:7334")),
+ ).to eq("2001:db8:85a3::8a2e:370:7334")
+ end
end
describe ".to_blob" do