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

[release/7.0] Avoid infinite loop during foreign key discovery #29850

Merged
merged 1 commit into from
Jan 4, 2023
Merged

[release/7.0] Avoid infinite loop during foreign key discovery #29850

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
6 changes: 5 additions & 1 deletion src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ public class ForeignKeyPropertyDiscoveryConvention :
IPropertyFieldChangedConvention,
IModelFinalizingConvention
{
private static readonly bool QuirkEnabled29826
= AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue29826", out var enabled) && enabled;

/// <summary>
/// Creates a new instance of <see cref="ForeignKeyPropertyDiscoveryConvention" />.
/// </summary>
Expand Down Expand Up @@ -309,7 +312,8 @@ private IConventionForeignKeyBuilder ProcessForeignKey(
: relationshipBuilder;
}

if (conflictingFKCount == 0)
if ((!QuirkEnabled29826 && conflictingFKCount >= 0)
|| (QuirkEnabled29826 && conflictingFKCount == 0))
{
return ((ForeignKey)foreignKey).Builder.ReuniquifyImplicitProperties(false);
}
Expand Down
38 changes: 38 additions & 0 deletions test/EFCore.Tests/Metadata/Conventions/ForeignKeyPropertyDiscoveryConventionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,44 @@ public void Does_not_match_if_a_foreign_key_on_the_best_candidate_property_alrea
Assert.Throws<InvalidOperationException>(() => ValidateModel()).Message);
}

[ConditionalFact]
public void Does_not_match_if_a_foreign_key_on_the_best_candidate_property_already_configured_explicitly()
{
var dependentTypeBuilder = DependentType.Builder;
var fkProperty = dependentTypeBuilder.Property(DependentEntity.SomeNavPeEKaYProperty, ConfigurationSource.Convention).Metadata;
dependentTypeBuilder.Property(DependentEntity.PrincipalEntityIDProperty, ConfigurationSource.Convention);
dependentTypeBuilder.Property(DependentEntity.PrincipalEntityPeEKaYProperty, ConfigurationSource.Convention);
dependentTypeBuilder.Property(DependentEntity.PeEKaYProperty, ConfigurationSource.Convention);

var derivedTypeBuilder = _model.Entity(typeof(DerivedPrincipalEntity), ConfigurationSource.Convention);
derivedTypeBuilder.HasBaseType(PrincipalType, ConfigurationSource.Convention);

var relationshipBuilder = dependentTypeBuilder
.HasRelationship(derivedTypeBuilder.Metadata, new[] { fkProperty }, ConfigurationSource.Explicit);
var compositeRelationshipBuilder = dependentTypeBuilder
.HasRelationship(PrincipalTypeWithCompositeKey, new[] { fkProperty }, ConfigurationSource.Explicit);

var newRelationshipBuilder = dependentTypeBuilder.HasRelationship(
PrincipalType, "SomeNav", null, ConfigurationSource.Convention);

Assert.Equal(
"SomeNav" + nameof(PrincipalEntity.PeeKay),
newRelationshipBuilder.Metadata.Properties.Single().Name);

newRelationshipBuilder = RunConvention(newRelationshipBuilder);

var fk = (IReadOnlyForeignKey)relationshipBuilder.Metadata;
Assert.Same(fkProperty, fk.Properties.Single());
Assert.False(fk.IsUnique);

var newFk = newRelationshipBuilder.Metadata;
Assert.Equal(3, DependentType.GetForeignKeys().Count());
Assert.Equal("SomeNav" + nameof(PrincipalEntity.PeeKay), newFk.Properties.Single().Name);
Assert.Null(newFk.GetPropertiesConfigurationSource());

ValidateModel();
}

[ConditionalFact]
public void Logs_warning_if_foreign_key_property_names_are_order_dependent()
{
Expand Down