Skip to content

[rc2] Add a test for default owned collection mapping #36663

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 27, 2025
Merged

[rc2] Add a test for default owned collection mapping #36663

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
2 changes: 1 addition & 1 deletion test/EFCore.Relational.Specification.Tests/Query/PrecompiledQueryRelationalTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Microsoft.EntityFrameworkCore.Query;
/// See also <see cref="PrecompiledSqlPregenerationQueryRelationalTestBase" /> for tests specifically related to SQL pregeneration.
/// </summary>
[Collection("PrecompiledQuery")]
public class PrecompiledQueryRelationalTestBase
public abstract class PrecompiledQueryRelationalTestBase
{
public PrecompiledQueryRelationalTestBase(PrecompiledQueryRelationalFixture fixture, ITestOutputHelper testOutputHelper)
{
Expand Down
2 changes: 1 addition & 1 deletion ...elational.Specification.Tests/Query/PrecompiledSqlPregenerationQueryRelationalTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Microsoft.EntityFrameworkCore.Query;
/// SQL pregeneration.
/// </summary>
[Collection("PrecompiledQuery")]
public class PrecompiledSqlPregenerationQueryRelationalTestBase
public abstract class PrecompiledSqlPregenerationQueryRelationalTestBase
{
public PrecompiledSqlPregenerationQueryRelationalTestBase(
PrecompiledSqlPregenerationQueryRelationalFixture fixture,
Expand Down
68 changes: 47 additions & 21 deletions test/EFCore.SqlServer.FunctionalTests/ModelBuilding/SqlServerModelBuilderTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,6 +1099,53 @@ public virtual void Owned_type_collections_can_be_mapped_to_different_tables()
Assert.Null(owned.GetSchema());
}

[ConditionalFact]
public virtual void Owned_type_collections_are_mapped_to_same_tables_by_default()
{
var modelBuilder = CreateModelBuilder();

modelBuilder.Entity<JsonEntityWithNesting>(b =>
{
b.OwnsOne(x => x.OwnedReference1, bb =>
{
bb.OwnsOne(x => x.Reference1);
bb.OwnsOne(x => x.Reference2);
bb.OwnsMany(x => x.Collection1);
bb.OwnsMany(x => x.Collection2);
});

b.OwnsOne(x => x.OwnedReference2, bb =>
{
bb.OwnsOne(x => x.Reference1);
bb.OwnsOne(x => x.Reference2);
bb.OwnsMany(x => x.Collection1);
bb.OwnsMany(x => x.Collection2);
});

b.OwnsMany(x => x.OwnedCollection1, bb =>
{
bb.OwnsOne(x => x.Reference1);
bb.OwnsOne(x => x.Reference2);
bb.OwnsMany(x => x.Collection1);
bb.OwnsMany(x => x.Collection2);
});

b.OwnsMany(x => x.OwnedCollection2, bb =>
{
bb.OwnsOne(x => x.Reference1);
bb.OwnsOne(x => x.Reference2);
bb.OwnsMany(x => x.Collection1);
bb.OwnsMany(x => x.Collection2);
});
});

Assert.Equal(RelationalStrings.IncompatibleTableNoRelationship(
"JsonEntityWithNesting_Collection1",
"JsonEntityWithNesting.OwnedReference2#OwnedEntityExtraLevel.Collection1#OwnedEntity",
"JsonEntityWithNesting.OwnedReference1#OwnedEntityExtraLevel.Collection1#OwnedEntity"),
Assert.Throws<InvalidOperationException>(() => modelBuilder.FinalizeModel()).Message);
}

[ConditionalFact]
public virtual void Owned_type_collections_can_be_mapped_to_a_view()
{
Expand Down Expand Up @@ -2007,27 +2054,6 @@ public virtual void Json_entity_with_custom_property_names()
Assert.Equal("InnerEnum", ownedEntity.GetProperty("Enum").GetJsonPropertyName());
}
}

[ConditionalFact]
public virtual void Json_entity_and_normal_owned_can_exist_side_to_side_on_same_entity()
{
var modelBuilder = CreateModelBuilder();

modelBuilder.Entity<JsonEntity>(b =>
{
b.OwnsOne(x => x.OwnedReference1);
b.OwnsOne(x => x.OwnedReference2, bb => bb.ToJson("reference"));
b.OwnsMany(x => x.OwnedCollection1);
b.OwnsMany(x => x.OwnedCollection2, bb => bb.ToJson("collection"));
});

var model = modelBuilder.FinalizeModel();

var ownedEntities = model.FindEntityTypes(typeof(OwnedEntity));
Assert.Equal(4, ownedEntities.Count());
Assert.Equal(2, ownedEntities.Where(e => e.IsMappedToJson()).Count());
Assert.Equal(2, ownedEntities.Where(e => e.IsOwned() && !e.IsMappedToJson()).Count());
}
}

public class SqlServerModelBuilderFixture : RelationalModelBuilderFixture
Expand Down
Loading