Sync well known text types to actual mapping list (#5617)

NinoFloris · web-flow · commit 76ada6b85a18 · 2024-03-11T18:03:53.000+01:00
Fixes #5599
diff --git a/src/Npgsql.Json.NET/Internal/JsonNetPocoTypeInfoResolverFactory.cs b/src/Npgsql.Json.NET/Internal/JsonNetPocoTypeInfoResolverFactory.cs
@@ -73,7 +73,7 @@ static void AddUserMappings(TypeInfoMappingCollection mappings, bool jsonb, Type
         protected override DynamicMappingCollection? GetMappings(Type? type, DataTypeName dataTypeName, PgSerializerOptions options)
         {
             // Match all types except null, object and text types as long as DataTypeName (json/jsonb) is present.
-            if (type is null || type == typeof(object) || Array.IndexOf(PgSerializerOptions.WellKnownTextTypes, type) != -1
+            if (type is null || type == typeof(object) || PgSerializerOptions.IsWellKnownTextType(type)
                              || dataTypeName != JsonbDataTypeName && dataTypeName != JsonDataTypeName)
                 return null;
 
diff --git a/src/Npgsql/Internal/PgSerializerOptions.cs b/src/Npgsql/Internal/PgSerializerOptions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Runtime.CompilerServices;
 using System.Text;
 using Npgsql.Internal.Postgres;
@@ -57,11 +58,15 @@ public IPgTypeInfoResolver TypeInfoResolver
     public ArrayNullabilityMode ArrayNullabilityMode { get; init; } = ArrayNullabilityMode.Never;
     public INpgsqlNameTranslator DefaultNameTranslator { get; init; } = NpgsqlSnakeCaseNameTranslator.Instance;
 
-    public static Type[] WellKnownTextTypes { get; } = {
-        typeof(string), typeof(char[]), typeof(byte[]),
-        typeof(ArraySegment<char>), typeof(ArraySegment<char>?),
-        typeof(char), typeof(char?)
-    };
+    public static bool IsWellKnownTextType(Type type)
+    {
+        type = type.IsValueType ? Nullable.GetUnderlyingType(type) ?? type : type;
+        return Array.IndexOf([
+            typeof(string), typeof(char),
+            typeof(char[]), typeof(ReadOnlyMemory<char>), typeof(ArraySegment<char>),
+            typeof(byte[]), typeof(ReadOnlyMemory<byte>)
+        ], type) != -1 || typeof(Stream).IsAssignableFrom(type);
+    }
 
     internal bool RangesEnabled => _resolverChain.RangesEnabled;
     internal bool MultirangesEnabled => _resolverChain.MultirangesEnabled;
diff --git a/src/Npgsql/Internal/ResolverFactories/AdoTypeInfoResolverFactory.cs b/src/Npgsql/Internal/ResolverFactories/AdoTypeInfoResolverFactory.cs
@@ -75,6 +75,7 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
                 static (options, mapping, _) => mapping.CreateInfo(options, new MoneyConverter<decimal>()), MatchRequirement.DataTypeName);
 
             // Text
+            // Update PgSerializerOptions.IsWellKnownTextType(Type) after any changes to this list.
             mappings.AddType<string>(DataTypeNames.Text,
                 static (options, mapping, _) => mapping.CreateInfo(options, new StringTextConverter(options.TextEncoding), preferredFormat: DataFormat.Text), isDefault: true);
             mappings.AddStructType<char>(DataTypeNames.Text,
diff --git a/src/Npgsql/Internal/ResolverFactories/ExtraConversionsTypeInfoResolverFactory.cs b/src/Npgsql/Internal/ResolverFactories/ExtraConversionsTypeInfoResolverFactory.cs
@@ -104,6 +104,7 @@ static TypeInfoMappingCollection AddInfos(TypeInfoMappingCollection mappings)
                 static (options, mapping, _) => mapping.CreateInfo(options, new StringBitStringConverter()));
 
             // Text
+            // Update PgSerializerOptions.IsWellKnownTextType(Type) after any changes to this list.
             mappings.AddType<char[]>(DataTypeNames.Text,
                 static (options, mapping, _) => mapping.CreateInfo(options, new CharArrayTextConverter(options.TextEncoding), preferredFormat: DataFormat.Text));
             mappings.AddStructType<ReadOnlyMemory<char>>(DataTypeNames.Text,
diff --git a/src/Npgsql/Internal/ResolverFactories/JsonDynamicTypeInfoResolverFactory.cs b/src/Npgsql/Internal/ResolverFactories/JsonDynamicTypeInfoResolverFactory.cs
@@ -121,7 +121,7 @@ void AddUserMappings(bool jsonb, Type[] clrTypes)
         protected override DynamicMappingCollection? GetMappings(Type? type, DataTypeName dataTypeName, PgSerializerOptions options)
         {
             // Match all types except null, object and text types as long as DataTypeName (json/jsonb) is present.
-            if (type is null || type == typeof(object) || Array.IndexOf(PgSerializerOptions.WellKnownTextTypes, type) != -1
+            if (type is null || type == typeof(object) || PgSerializerOptions.IsWellKnownTextType(type)
                                        || dataTypeName != DataTypeNames.Jsonb && dataTypeName != DataTypeNames.Json)
                 return null;
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ static void AddUserMappings(TypeInfoMappingCollection mappings, bool jsonb, Type`
`73`	`73`	`protected override DynamicMappingCollection? GetMappings(Type? type, DataTypeName dataTypeName, PgSerializerOptions options)`
`74`	`74`	`{`
`75`	`75`	`// Match all types except null, object and text types as long as DataTypeName (json/jsonb) is present.`
`76`		`- if (type is null \|\| type == typeof(object) \|\| Array.IndexOf(PgSerializerOptions.WellKnownTextTypes, type) != -1`
	`76`	`+ if (type is null \|\| type == typeof(object) \|\| PgSerializerOptions.IsWellKnownTextType(type)`
`77`	`77`	`\|\| dataTypeName != JsonbDataTypeName && dataTypeName != JsonDataTypeName)`
`78`	`78`	`return null;`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ void AddUserMappings(bool jsonb, Type[] clrTypes)`
`121`	`121`	`protected override DynamicMappingCollection? GetMappings(Type? type, DataTypeName dataTypeName, PgSerializerOptions options)`
`122`	`122`	`{`
`123`	`123`	`// Match all types except null, object and text types as long as DataTypeName (json/jsonb) is present.`
`124`		`- if (type is null \|\| type == typeof(object) \|\| Array.IndexOf(PgSerializerOptions.WellKnownTextTypes, type) != -1`
	`124`	`+ if (type is null \|\| type == typeof(object) \|\| PgSerializerOptions.IsWellKnownTextType(type)`
`125`	`125`	`\|\| dataTypeName != DataTypeNames.Jsonb && dataTypeName != DataTypeNames.Json)`
`126`	`126`	`return null;`
`127`	`127`