Skip to content

Fix PendingModelChangesWarning for Unicode diacritics (NFC/NFD) on Linux #38197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TomasMoralesBarr wants to merge 7 commits into
base: main
Choose a base branch
from
+2,107 −2,016
Open

Fix PendingModelChangesWarning for Unicode diacritics (NFC/NFD) on Linux #38197

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c10116e
Fix PendingModelChangesWarning for Unicode diacritics (NFC/NFD) on Linux
TomasMoralesBarr Apr 30, 2026
b94608c
Make Unicode normalization form explicit (NormalizationForm.FormC)
TomasMoralesBarr Apr 30, 2026
a5fe96e
Add missing using directive for System.Text in MigrationsModelDiffer
TomasMoralesBarr Apr 30, 2026
c582302
Merge branch 'dotnet:main' into fix/unicode-normalization-seed-diff
TomasMoralesBarr May 2, 2026
2b20b9b
"Use InvariantCulture string comparer to handle NFC/NFD Unicode equiv…
TomasMoralesBarr May 4, 2026
e50e37e
"Fix IsDefault() check and update test baselines for DefaultStringVal…
TomasMoralesBarr May 4, 2026
a084003
Update compiled model baselines for DefaultStringValueComparer
TomasMoralesBarr May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2210,8 +2210,8 @@ protected virtual void DiffData(
continue;
}

var sourceValue = sourceColumnModification.OriginalValue;
var targetValue = targetColumnModification.Value;
var sourceValue = NormalizeStringValue(sourceColumnModification.OriginalValue);
var targetValue = NormalizeStringValue(targetColumnModification.Value);
var comparer = targetColumn.ProviderValueComparer;
if (sourceColumn.ProviderClrType == targetColumn.ProviderClrType
&& comparer.Equals(sourceValue, targetValue))
Comment thread
TomasMoralesBarr marked this conversation as resolved.
Outdated
Comment thread
TomasMoralesBarr marked this conversation as resolved.
Outdated
Expand Down Expand Up @@ -2519,6 +2519,9 @@ private static bool MultilineEquals(string? sourceString, string? targetString,
&& targetString is not null
&& string.Equals(sourceString.ReplaceLineEndings(), targetString.ReplaceLineEndings(), comparisonType));

private static object? NormalizeStringValue(object? value)
=> value is string s ? s.Normalize() : value;
Comment thread
TomasMoralesBarr marked this conversation as resolved.
Outdated

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
Expand Down
29 changes: 29 additions & 0 deletions test/EFCore.Relational.Tests/Migrations/Internal/MigrationsModelDifferTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8369,6 +8369,35 @@ public void Change_TPT_to_TPC_with_FKs_and_seed_data()
Assert.Equal(ReferentialAction.Cascade, operation.OnDelete);
}));

[ConditionalFact]
Comment thread
TomasMoralesBarr marked this conversation as resolved.
Outdated
public void Seed_data_with_NFD_vs_NFC_unicode_string_is_considered_unchanged()
{
var nfcString = "Caf\u00E9";
var nfdString = "Cafe\u0301";

Assert.NotEqual(nfcString, nfdString);
Assert.Equal(nfcString, nfdString.Normalize());
Comment thread
TomasMoralesBarr marked this conversation as resolved.
Outdated
Comment thread
TomasMoralesBarr marked this conversation as resolved.
Outdated

Execute(
source => source.Entity(
"BusinessType",
x =>
{
x.Property<int>("BusinessTypeId");
x.Property<string>("WebDescription");
x.HasData(new { BusinessTypeId = 28, WebDescription = nfcString });
}),
target => target.Entity(
"BusinessType",
x =>
{
x.Property<int>("BusinessTypeId");
x.Property<string>("WebDescription");
x.HasData(new { BusinessTypeId = 28, WebDescription = nfdString });
}),
operations => Assert.Empty(operations));
Comment thread
TomasMoralesBarr marked this conversation as resolved.
Outdated
Comment thread
TomasMoralesBarr marked this conversation as resolved.
Outdated
}
Comment thread
TomasMoralesBarr marked this conversation as resolved.

[ConditionalFact]
public void Change_TPT_to_TPC_with_excluded_base()
=> Execute(
Expand Down
Loading