Apply pre-convention value converters on nullable types

Fixes #25896
dotnet · Sep 10, 2021 · 243bce0 · 243bce0
1 parent 9f863be
commit 243bce0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/EFCore/Metadata/Internal/PropertyConfiguration.cs b/src/EFCore/Metadata/Internal/PropertyConfiguration.cs
@@ -74,14 +74,14 @@ public virtual void Apply(IMutableProperty property)
 
                         break;
                     case CoreAnnotationNames.ValueConverterType:
-                        if (ClrType == property.ClrType)
+                        if (ClrType.UnwrapNullableType() == property.ClrType.UnwrapNullableType())
                         {
                             property.SetValueConverter((Type?)annotation.Value);
                         }
 
                         break;
                     case CoreAnnotationNames.ValueComparerType:
-                        if (ClrType == property.ClrType)
+                        if (ClrType.UnwrapNullableType() == property.ClrType.UnwrapNullableType())
                         {
                             property.SetValueComparer((Type?)annotation.Value);
                         }

diff --git a/test/EFCore.Tests/ModelBuilding/NonRelationshipTestBase.cs b/test/EFCore.Tests/ModelBuilding/NonRelationshipTestBase.cs
@@ -979,6 +979,27 @@ public virtual void Properties_can_have_value_converter_configured_by_type()
                 Assert.IsType<ValueComparer<WrappedString>>(wrappedProperty.GetValueComparer());
             }
 
+            [ConditionalFact]
+            public virtual void Value_converter_configured_on_non_nullable_type_is_applied()
+            {
+                var modelBuilder = CreateModelBuilder(c =>
+                {
+                    c.Properties<int>().HaveConversion<NumberToStringConverter<int>>();
+                });
+
+                modelBuilder.Entity<Quarks>(
+                    b =>
+                    {
+                        b.Property<int?>("Wierd");
+                    });
+
+                var model = modelBuilder.FinalizeModel();
+                var entityType = model.FindEntityType(typeof(Quarks));
+
+                Assert.IsType<NumberToStringConverter<int>>(entityType.FindProperty("Id").GetValueConverter());
+                Assert.IsType<NumberToStringConverter<int>>(entityType.FindProperty("Wierd").GetValueConverter());
+            }
+
             [ConditionalFact]
             public virtual void Value_converter_configured_on_base_type_is_not_applied()
             {