Skip to content

Add missing EFCore.PG Enum hack in non-generic MapEnum method #5627

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
roji merged 1 commit into from
Mar 15, 2024
Merged

Add missing EFCore.PG Enum hack in non-generic MapEnum method #5627

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
14 changes: 12 additions & 2 deletions src/Npgsql/TypeMapping/GlobalTypeMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,11 @@ public INpgsqlTypeMapper MapEnum([DynamicallyAccessedMembers(DynamicallyAccessed
try
{
_userTypeMapper.MapEnum(clrType, pgName, nameTranslator);

// Temporary hack for EFCore.PG enum mapping compat
if (_userTypeMapper.Items.FirstOrDefault(i => i.ClrType == clrType) is UserTypeMapping userTypeMapping)
HackyEnumTypeMappings.Add(new(clrType, userTypeMapping.PgTypeName, nameTranslator ?? DefaultNameTranslator));

ResetTypeMappingCache();
return this;
}
Expand All @@ -307,9 +312,14 @@ public bool UnmapEnum([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes
_lock.EnterWriteLock();
try
{
var result = _userTypeMapper.UnmapEnum(clrType, pgName, nameTranslator);
var removed = _userTypeMapper.UnmapEnum(clrType, pgName, nameTranslator);

// Temporary hack for EFCore.PG enum mapping compat
if (removed && ((List<UserTypeMapping>)_userTypeMapper.Items).FindIndex(m => m.ClrType == clrType) is > -1 and var index)
HackyEnumTypeMappings.RemoveAt(index);

ResetTypeMappingCache();
return result;
return removed;
}
finally
{
Expand Down