Add IPNetwork to cidr mapping (#5889)

vonzshik · web-flow · commit ec6de9cf1d1c · 2024-10-17T22:23:56.000+03:00
Closes #5821
diff --git a/src/Npgsql/Internal/Converters/Networking/IPNetworkConverter.cs b/src/Npgsql/Internal/Converters/Networking/IPNetworkConverter.cs
@@ -0,0 +1,26 @@
+﻿#if NET8_0_OR_GREATER
+
+using System.Net;
+
+// ReSharper disable once CheckNamespace
+namespace Npgsql.Internal.Converters;
+
+sealed class IPNetworkConverter : PgBufferedConverter<IPNetwork>
+{
+    public override bool CanConvert(DataFormat format, out BufferRequirements bufferRequirements)
+        => CanConvertBufferedDefault(format, out bufferRequirements);
+
+    public override Size GetSize(SizeContext context, IPNetwork value, ref object? writeState)
+        => NpgsqlInetConverter.GetSizeImpl(context, value.BaseAddress, ref writeState);
+
+    protected override IPNetwork ReadCore(PgReader reader)
+    {
+        var (ip, netmask) = NpgsqlInetConverter.ReadImpl(reader, shouldBeCidr: true);
+        return new(ip, netmask);
+    }
+
+    protected override void WriteCore(PgWriter writer, IPNetwork value)
+        => NpgsqlInetConverter.WriteImpl(writer, (value.BaseAddress, (byte)value.PrefixLength), isCidr: true);
+}
+
+#endif
diff --git a/src/Npgsql/Internal/ResolverFactories/NetworkTypeInfoResolverFactory.cs b/src/Npgsql/Internal/ResolverFactories/NetworkTypeInfoResolverFactory.cs
@@ -51,6 +51,11 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
             mappings.AddStructType<NpgsqlCidr>(DataTypeNames.Cidr,
                 static (options, mapping, _) => mapping.CreateInfo(options, new NpgsqlCidrConverter()), isDefault: true);
 
+#if NET8_0_OR_GREATER
+            mappings.AddStructType<IPNetwork>(DataTypeNames.Cidr,
+                static (options, mapping, _) => mapping.CreateInfo(options, new IPNetworkConverter()));
+#endif
+
             return mappings;
         }
     }
@@ -76,6 +81,10 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
             // cidr
             mappings.AddStructArrayType<NpgsqlCidr>(DataTypeNames.Cidr);
 
+#if NET8_0_OR_GREATER
+            mappings.AddStructArrayType<IPNetwork>(DataTypeNames.Cidr);
+#endif
+
             return mappings;
         }
     }
diff --git a/test/Npgsql.Tests/Types/NetworkTypeTests.cs b/test/Npgsql.Tests/Types/NetworkTypeTests.cs
@@ -61,6 +61,16 @@ public Task Cidr()
             NpgsqlDbType.Cidr,
             isDefaultForWriting: false);
 
+    [Test]
+    public Task IPNetwork_as_cidr()
+        => AssertType(
+            new IPNetwork(IPAddress.Parse("192.168.1.0"), 24),
+            "192.168.1.0/24",
+            "cidr",
+            NpgsqlDbType.Cidr,
+            isDefaultForWriting: false,
+            isDefaultForReading: false);
+
     [Test]
     public Task Inet_v4_as_NpgsqlInet()
         => AssertType(

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,11 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)`
`51`	`51`	`mappings.AddStructType<NpgsqlCidr>(DataTypeNames.Cidr,`
`52`	`52`	`static (options, mapping, _) => mapping.CreateInfo(options, new NpgsqlCidrConverter()), isDefault: true);`
`53`	`53`
	`54`	`+#if NET8_0_OR_GREATER`
	`55`	`+ mappings.AddStructType<IPNetwork>(DataTypeNames.Cidr,`
	`56`	`+ static (options, mapping, _) => mapping.CreateInfo(options, new IPNetworkConverter()));`
	`57`	`+#endif`
	`58`	`+`
`54`	`59`	`return mappings;`
`55`	`60`	`}`
`56`	`61`	`}`
`@@ -76,6 +81,10 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)`
`76`	`81`	`// cidr`
`77`	`82`	`mappings.AddStructArrayType<NpgsqlCidr>(DataTypeNames.Cidr);`
`78`	`83`
	`84`	`+#if NET8_0_OR_GREATER`
	`85`	`+ mappings.AddStructArrayType<IPNetwork>(DataTypeNames.Cidr);`
	`86`	`+#endif`
	`87`	`+`
`79`	`88`	`return mappings;`
`80`	`89`	`}`
`81`	`90`	`}`