Skip to content
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

Jump to bottom

Better detection of string store types on primitive collections #30920

Merged
merged 2 commits into from
May 18, 2023
Merged

Better detection of string store types on primitive collections #30920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
782f4b8
Better detection of string store types on primitive collections
ajcvickers May 18, 2023
1f95051
Add element mapping asserts.
ajcvickers May 18, 2023
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
8 changes: 6 additions & 2 deletions src/EFCore.SqlServer/Storage/Internal/SqlServerTypeMappingSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,16 +437,20 @@ public SqlServerTypeMappingSource(
return null;
}

switch (mappingInfo.StoreTypeNameBase)
switch (mappingInfo.StoreTypeNameBase?.ToLowerInvariant())
{
case "nvarchar":
case "varchar":
case "char varying":
case "char":
case "character varying":
case "character":
case "nchar":
case "national char varying":
case "national character varying":
case "national character":
case "varchar":
case "text":
case "ntext":
case null:
break;
default:
Expand Down
8 changes: 8 additions & 0 deletions test/EFCore.Relational.Tests/Storage/RelationalTypeMapperTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ protected IMutableEntityType CreateEntityType<TEntity>()
builder.Entity<MyPrecisionType>().Property(e => e.PrecisionOnly).HasPrecision(16);
builder.Entity<MyPrecisionType>().Property(e => e.PrecisionAndScale).HasPrecision(18, 7);
builder.Entity<MyTypeWithIndexAttribute>();
builder.Entity<MyTypeWithIndexAttributeOnCollection>();

return builder.Model.FindEntityType(typeof(TEntity));
}
Expand Down Expand Up @@ -203,4 +204,11 @@ protected class MyTypeWithIndexAttribute
public int Id { get; set; }
public string Name { get; set; }
}

[Index(nameof(Ints))]
protected class MyTypeWithIndexAttributeOnCollection
{
public int Id { get; set; }
public IEnumerable<int> Ints { get; set; }
}
}
Loading