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

Make On*Removed conventions run even if the declaring type was removed previously #29042

Merged
merged 1 commit into from
Sep 10, 2022
Merged

Make On*Removed conventions run even if the declaring type was removed previously #29042

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
3 changes: 2 additions & 1 deletion src/EFCore.Cosmos/Metadata/Conventions/CosmosDiscriminatorConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ public virtual void ProcessForeignKeyRemoved(
IConventionForeignKey foreignKey,
IConventionContext<IConventionForeignKey> context)
{
if (foreignKey.IsOwnership)
if (entityTypeBuilder.Metadata.IsInModel
&& foreignKey.IsOwnership)
{
ProcessEntityType(entityTypeBuilder);
}
Expand Down
8 changes: 7 additions & 1 deletion src/EFCore.Cosmos/Metadata/Conventions/StoreKeyConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ public virtual void ProcessForeignKeyRemoved(
IConventionForeignKey foreignKey,
IConventionContext<IConventionForeignKey> context)
{
if (foreignKey.IsOwnership)
if (entityTypeBuilder.Metadata.IsInModel
&& foreignKey.IsOwnership)
{
ProcessIdProperty(foreignKey.DeclaringEntityType.Builder);
}
Expand All @@ -209,6 +210,11 @@ public virtual void ProcessKeyRemoved(
IConventionKey key,
IConventionContext<IConventionKey> context)
{
if (!entityTypeBuilder.Metadata.IsInModel)
{
return;
}

if (entityTypeBuilder.Metadata.IsKeyless)
{
ProcessIdProperty(entityTypeBuilder);
Expand Down
3 changes: 2 additions & 1 deletion src/EFCore/Metadata/Conventions/BaseTypeDiscoveryConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ public virtual void ProcessForeignKeyRemoved(
IConventionForeignKey foreignKey,
IConventionContext<IConventionForeignKey> context)
{
if (foreignKey.IsOwnership
if (entityTypeBuilder.Metadata.IsInModel
&& foreignKey.IsOwnership
&& !entityTypeBuilder.Metadata.IsOwned())
{
ProcessEntityType(entityTypeBuilder);
Expand Down
19 changes: 18 additions & 1 deletion src/EFCore/Metadata/Conventions/ForeignKeyIndexConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,14 @@ public virtual void ProcessForeignKeyRemoved(
IConventionEntityTypeBuilder entityTypeBuilder,
IConventionForeignKey foreignKey,
IConventionContext<IConventionForeignKey> context)
=> OnForeignKeyRemoved(foreignKey.DeclaringEntityType, foreignKey.Properties);
{
if (!entityTypeBuilder.Metadata.IsInModel)
{
return;
}

OnForeignKeyRemoved(foreignKey.DeclaringEntityType, foreignKey.Properties);
}

/// <summary>
/// Called after the foreign key properties or principal key are changed.
Expand Down Expand Up @@ -139,6 +146,11 @@ public virtual void ProcessKeyRemoved(
IConventionKey key,
IConventionContext<IConventionKey> context)
{
if (!entityTypeBuilder.Metadata.IsInModel)
{
return;
}

foreach (var otherForeignKey in key.DeclaringEntityType.GetDerivedTypesInclusive()
.SelectMany(t => t.GetDeclaredForeignKeys())
.Where(fk => AreIndexedBy(fk.Properties, fk.IsUnique, key.Properties, coveringIndexUnique: true)))
Expand Down Expand Up @@ -223,6 +235,11 @@ public virtual void ProcessIndexRemoved(
IConventionIndex index,
IConventionContext<IConventionIndex> context)
{
if (!entityTypeBuilder.Metadata.IsInModel)
{
return;
}

foreach (var foreignKey in index.DeclaringEntityType.GetDerivedTypesInclusive()
.SelectMany(t => t.GetDeclaredForeignKeys())
.Where(fk => AreIndexedBy(fk.Properties, fk.IsUnique, index.Properties, index.IsUnique)))
Expand Down
12 changes: 12 additions & 0 deletions src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,11 @@ public virtual void ProcessKeyRemoved(
IConventionKey key,
IConventionContext<IConventionKey> context)
{
if (!entityTypeBuilder.Metadata.IsInModel)
{
return;
}

var foreignKeys = key.DeclaringEntityType.GetDerivedTypesInclusive()
.SelectMany(t => t.GetDeclaredForeignKeys()).ToList();
foreach (var foreignKey in foreignKeys)
Expand Down Expand Up @@ -785,6 +790,8 @@ public virtual void ProcessEntityTypePrimaryKeyChanged(
return;
}

var initialPrimaryKey = entityTypeBuilder.Metadata.FindPrimaryKey();

var foreignKeys = entityTypeBuilder.Metadata.GetDerivedTypesInclusive()
.SelectMany(t => t.GetDeclaredForeignKeys()).ToList();
foreach (var foreignKey in foreignKeys)
Expand All @@ -810,6 +817,11 @@ public virtual void ProcessEntityTypePrimaryKeyChanged(

DiscoverProperties(referencingForeignKey.Builder, context);
}

if (entityTypeBuilder.Metadata.FindPrimaryKey() != initialPrimaryKey)
{
context.StopProcessing();
}
}

/// <inheritdoc />
Expand Down
Loading