Skip to content

Compare normalized type names #6011

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

Merged
NinoFloris merged 1 commit into from
Jul 4, 2025
Merged

Compare normalized type names #6011

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions src/Npgsql/Internal/TypeInfoMapping.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,27 @@ public readonly struct TypeInfoMapping(Type type, string dataTypeName, TypeInfoF
public Func<Type?, bool>? TypeMatchPredicate { get; init; }

public bool TypeEquals(Type type) => TypeMatchPredicate?.Invoke(type) ?? Type == type;
public bool DataTypeNameEquals(string dataTypeName)

private bool DataTypeNameEqualsCore(string dataTypeName)
{
var span = DataTypeName.AsSpan();
return Postgres.DataTypeName.IsFullyQualified(span)
? span.Equals(dataTypeName.AsSpan(), StringComparison.Ordinal)
: span.Equals(Postgres.DataTypeName.ValidatedName(dataTypeName).UnqualifiedNameSpan, StringComparison.Ordinal);
}

internal bool DataTypeNameEquals(DataTypeName dataTypeName)
{
var value = dataTypeName.Value;
return DataTypeNameEqualsCore(value);
}

public bool DataTypeNameEquals(string dataTypeName)
{
var normalized = Postgres.DataTypeName.NormalizeName(dataTypeName);
return DataTypeNameEqualsCore(normalized);
}

string DebuggerDisplay
{
get
Expand Down Expand Up @@ -125,7 +138,7 @@ public TypeInfoMappingCollection(IEnumerable<TypeInfoMapping> items)
{
var looseTypeMatch = mapping.TypeMatchPredicate is { } pred ? pred(type) : type is null || mapping.Type == type;
var typeMatch = type is not null && looseTypeMatch;
var dataTypeMatch = dataTypeName is not null && mapping.DataTypeNameEquals(dataTypeName.Value.Value);
var dataTypeMatch = dataTypeName is not null && mapping.DataTypeNameEquals(dataTypeName.Value);

var matchRequirement = mapping.MatchRequirement;
if (dataTypeMatch && typeMatch
Expand Down