Skip to content

[rc2] Fix complex collection type in model snapshot #36620

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
AndriySvyryd merged 1 commit into from
Aug 21, 2025
Merged

[rc2] Fix complex collection type in model snapshot #36620

Show file tree
Hide file tree
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
8 changes: 7 additions & 1 deletion src/EFCore.Design/Migrations/Design/CSharpSnapshotGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,11 +565,17 @@ protected virtual void GenerateComplexProperty(
var complexType = complexProperty.ComplexType;
var complexTypeBuilderName = GenerateNestedBuilderName(builderName);

var propertyType = Code.Reference(Model.DefaultPropertyBagType);
if (complexProperty.IsCollection)
{
propertyType = $"List<{propertyType}>";
}

stringBuilder
.AppendLine()
.Append(builderName)
.Append(complexProperty.IsCollection ? ".ComplexCollection(" : ".ComplexProperty(")
.Append($"typeof({Code.Reference(Model.DefaultPropertyBagType)}), ")
.Append($"typeof({propertyType}), ")
.Append($"{Code.Literal(complexProperty.Name)}, {Code.Literal(complexType.Name)}, ")
.Append(complexTypeBuilderName)
.AppendLine(" =>");
Expand Down
3 changes: 2 additions & 1 deletion test/EFCore.Design.Tests/Migrations/Design/CSharpMigrationsGeneratorTest.ModelSnapshot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6201,7 +6201,7 @@ public virtual void Complex_types_mapped_to_json_are_stored_in_snapshot()
{
b2.Property<string>("Id");

b2.ComplexCollection(typeof(Dictionary<string, object>), "Properties", "Microsoft.EntityFrameworkCore.Migrations.Design.CSharpMigrationsGeneratorTest+EntityWithOneProperty.EntityWithTwoProperties#EntityWithTwoProperties.EntityWithStringKey#EntityWithStringKey.Properties#EntityWithStringProperty", b3 =>
b2.ComplexCollection(typeof(List<Dictionary<string, object>>), "Properties", "Microsoft.EntityFrameworkCore.Migrations.Design.CSharpMigrationsGeneratorTest+EntityWithOneProperty.EntityWithTwoProperties#EntityWithTwoProperties.EntityWithStringKey#EntityWithStringKey.Properties#EntityWithStringProperty", b3 =>
{
b3.Property<int>("Id");

Expand Down Expand Up @@ -6256,6 +6256,7 @@ public virtual void Complex_types_mapped_to_json_are_stored_in_snapshot()
entityWithStringKeyComplexType.FindComplexProperty(nameof(EntityWithStringKey.Properties));
Assert.True(propertiesComplexCollection.IsCollection);
Assert.Equal("JsonProps", propertiesComplexCollection.GetJsonPropertyName());
Assert.Equal(typeof(List<Dictionary<string, object>>), propertiesComplexCollection.ClrType);
});

#endregion
Expand Down
Loading