Skip to content

Fixup navigations to/from join entity when new many-to-many relationship is created #26853

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
ajcvickers merged 3 commits into from
Dec 9, 2021
Merged

Fixup navigations to/from join entity when new many-to-many relationship is created #26853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d26094a
Fixup navigations to/from join entity when new many-to-many relations…
ajcvickers Nov 30, 2021
6d27417
Review feedback:
ajcvickers Dec 8, 2021
61f8450
Don't null danglers.
ajcvickers Dec 9, 2021
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
25 changes: 2 additions & 23 deletions src/EFCore/ChangeTracking/Internal/ChangeDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ public class ChangeDetector : IChangeDetector
{
private readonly IDiagnosticsLogger<DbLoggerCategory.ChangeTracking> _logger;
private readonly ILoggingOptions _loggingOptions;
private bool _suspended;

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
Expand All @@ -33,24 +32,6 @@ public ChangeDetector(
_loggingOptions = loggingOptions;
}

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public virtual void Suspend()
=> _suspended = true;

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
public virtual void Resume()
=> _suspended = false;

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
Expand All @@ -59,8 +40,7 @@ public virtual void Resume()
/// </summary>
public virtual void PropertyChanged(InternalEntityEntry entry, IPropertyBase propertyBase, bool setModified)
{
if (_suspended
|| entry.EntityState == EntityState.Detached
if (entry.EntityState == EntityState.Detached
|| propertyBase is IServiceProperty)
{
return;
Expand Down Expand Up @@ -103,8 +83,7 @@ private static void ThrowIfKeyChanged(InternalEntityEntry entry, IProperty prope
/// </summary>
public virtual void PropertyChanging(InternalEntityEntry entry, IPropertyBase propertyBase)
{
if (_suspended
|| entry.EntityState == EntityState.Detached
if (entry.EntityState == EntityState.Detached
|| propertyBase is IServiceProperty)
{
return;
Expand Down
16 changes: 0 additions & 16 deletions src/EFCore/ChangeTracking/Internal/IChangeDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,4 @@ public interface IChangeDetector
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
void DetectChanges(InternalEntityEntry entry);

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
void Suspend();

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
void Resume();
}
6 changes: 3 additions & 3 deletions src/EFCore/ChangeTracking/Internal/INavigationFixer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ public interface INavigationFixer
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
void BeginAttachGraph();
bool BeginDelayedFixup();

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
void CompleteAttachGraph();
void CompleteDelayedFixup();

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
void AbortAttachGraph();
void AbortDelayedFixup();

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
Expand Down
Loading