Skip to content

Fix ArgumentNullException when a foreign key references a key declared on a complex type property #38764

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

Open
Copilot wants to merge 4 commits into
base: main
Choose a base branch
from
+35 −4
Open

Fix ArgumentNullException when a foreign key references a key declared on a complex type property #38764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
777d619
Initial plan
Copilot Aug 7, 2026
176fa8b
Resolve complex-type properties when mapping keys/FKs/indexes in Runt…
Copilot Aug 7, 2026
5e12423
Add regression test for FK referencing key on complex type property
Copilot Aug 7, 2026
736ae17
Fix complex key regression test for Cosmos
Copilot Aug 7, 2026
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: 4 additions & 4 deletions src/EFCore/Metadata/Conventions/RuntimeModelConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ private RuntimeForeignKey Create(IForeignKey foreignKey, RuntimeEntityType runti
{
var principalEntityType = runtimeEntityType.Model.FindEntityType(foreignKey.PrincipalEntityType.Name)!;
return runtimeEntityType.AddForeignKey(
runtimeEntityType.FindProperties(foreignKey.Properties.Select(p => p.Name))!,
foreignKey.Properties.Select(p => FindRuntimeProperty(runtimeEntityType, p)).ToArray(),
GetKey(foreignKey.PrincipalKey, principalEntityType),
principalEntityType,
foreignKey.DeleteBehavior,
Expand Down Expand Up @@ -810,7 +810,7 @@ private RuntimeSkipNavigation Create(ISkipNavigation navigation, RuntimeEntityTy
/// <returns>The corresponding read-optimized foreign key.</returns>
protected virtual RuntimeForeignKey GetForeignKey(IForeignKey foreignKey, RuntimeEntityType entityType)
=> entityType.FindDeclaredForeignKeys(
entityType.FindProperties(foreignKey.Properties.Select(p => p.Name))!)
foreignKey.Properties.Select(p => FindRuntimeProperty(entityType, p)).ToArray())
.Single(fk => fk.PrincipalEntityType.Name == foreignKey.PrincipalEntityType.Name
&& fk.PrincipalKey.Properties.Select(p => p.Name).SequenceEqual(
foreignKey.PrincipalKey.Properties.Select(p => p.Name)));
Expand All @@ -822,7 +822,7 @@ protected virtual RuntimeForeignKey GetForeignKey(IForeignKey foreignKey, Runtim
/// <param name="entityType">The declaring entity type.</param>
/// <returns>The corresponding read-optimized key.</returns>
protected virtual RuntimeKey GetKey(IKey key, RuntimeEntityType entityType)
=> entityType.FindKey(entityType.FindProperties(key.Properties.Select(p => p.Name))!)!;
=> entityType.FindKey(key.Properties.Select(p => FindRuntimeProperty(entityType, p)).ToArray())!;

/// <summary>
/// Gets the corresponding index in the read-optimized model.
Expand All @@ -832,7 +832,7 @@ protected virtual RuntimeKey GetKey(IKey key, RuntimeEntityType entityType)
/// <returns>The corresponding read-optimized index.</returns>
protected virtual RuntimeIndex GetIndex(IIndex index, RuntimeEntityType entityType)
=> index.Name == null
? entityType.FindIndex(entityType.FindProperties(index.Properties.Select(p => p.Name))!)!
? entityType.FindIndex(index.Properties.Select(p => FindRuntimePropertyBase(entityType, p)).ToArray())!
: entityType.FindIndex(index.Name)!;

/// <summary>
Expand Down
31 changes: 31 additions & 0 deletions test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.ComplexType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2312,6 +2312,37 @@ public virtual void Can_define_alternate_key_on_complex_property_via_string_dott
Assert.Same(entityType, alternateKey.DeclaringEntityType);
}

[Fact]
public virtual void Can_use_alternate_key_on_complex_property_as_principal_key()
{
var modelBuilder = CreateModelBuilder();

modelBuilder
.Ignore<Order>()
.Ignore<IndexedClass>()
.Entity<ComplexProperties>(b =>
{
b.Ignore(e => e.Customer);
b.Ignore(e => e.CollectionQuarks);
b.Ignore(e => e.QuarksCollection);
b.Ignore(e => e.DoubleProperty);
b.HasAlternateKey(e => e.Quarks.Up);
b.HasMany(e => e.Customers).WithOne()
.HasForeignKey("ParentUp")
.HasPrincipalKey("Quarks.Up");
});

var model = modelBuilder.FinalizeModel();
Comment thread
AndriySvyryd marked this conversation as resolved.
var entityType = model.FindEntityType(typeof(ComplexProperties))!;
var quarksType = entityType.GetComplexProperties().Single(p => p.Name == nameof(ComplexProperties.Quarks))
.ComplexType;
var upProperty = quarksType.FindProperty(nameof(Quarks.Up))!;

var foreignKey = model.GetEntityTypes().Single(t => t.ClrType == typeof(Customer)).GetForeignKeys()
.Single(fk => fk.PrincipalEntityType == entityType);
Assert.Same(upProperty, foreignKey.PrincipalKey.Properties.Single());
}

[Fact]
public virtual void Can_define_index_on_complex_property_via_lambda()
{
Expand Down
Loading