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

Fix to check skip navigations in when attaching a graph #21999

Merged
merged 1 commit into from
Aug 11, 2020
Merged

Fix to check skip navigations in when attaching a graph #21999

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: 3 additions & 3 deletions src/EFCore/ChangeTracking/EntityEntryGraphNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class EntityEntryGraphNode : IInfrastructure<InternalEntityEntry>
public EntityEntryGraphNode(
[NotNull] InternalEntityEntry entry,
[CanBeNull] InternalEntityEntry sourceEntry,
[CanBeNull] INavigation inboundNavigation)
[CanBeNull] INavigationBase inboundNavigation)
{
Check.NotNull(entry, nameof(entry));

Expand All @@ -47,7 +47,7 @@ public EntityEntryGraphNode(
/// <summary>
/// Gets the navigation property that is being traversed to reach this node in the graph.
/// </summary>
public virtual INavigation InboundNavigation { get; }
public virtual INavigationBase InboundNavigation { get; }

/// <summary>
/// Gets the entry tracking information about this entity.
Expand Down Expand Up @@ -77,7 +77,7 @@ public EntityEntryGraphNode(
public virtual EntityEntryGraphNode CreateNode(
[NotNull] EntityEntryGraphNode currentNode,
[NotNull] InternalEntityEntry internalEntityEntry,
[NotNull] INavigation reachedVia)
[NotNull] INavigationBase reachedVia)
{
Check.NotNull(currentNode, nameof(currentNode));
Check.NotNull(internalEntityEntry, nameof(internalEntityEntry));
Expand Down
4 changes: 2 additions & 2 deletions src/EFCore/ChangeTracking/EntityEntryGraphNode`.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public EntityEntryGraphNode(
[NotNull] InternalEntityEntry entry,
[CanBeNull] TState state,
[CanBeNull] InternalEntityEntry sourceEntry,
[CanBeNull] INavigation inboundNavigation)
[CanBeNull] INavigationBase inboundNavigation)
: base(entry, sourceEntry, inboundNavigation)
{
NodeState = state;
Expand All @@ -51,7 +51,7 @@ public EntityEntryGraphNode(
public override EntityEntryGraphNode CreateNode(
EntityEntryGraphNode currentNode,
InternalEntityEntry internalEntityEntry,
INavigation reachedVia)
INavigationBase reachedVia)
{
Check.NotNull(currentNode, nameof(currentNode));
Check.NotNull(internalEntityEntry, nameof(internalEntityEntry));
Expand Down
5 changes: 4 additions & 1 deletion src/EFCore/ChangeTracking/Internal/EntityEntryGraphIterator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using System.Threading;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.Extensions.DependencyInjection;

namespace Microsoft.EntityFrameworkCore.ChangeTracking.Internal
Expand Down Expand Up @@ -42,7 +43,9 @@ public virtual void TraverseGraph<TState>(
}

var internalEntityEntry = node.GetInfrastructure();
var navigations = internalEntityEntry.EntityType.GetNavigations();
var navigations = internalEntityEntry.EntityType.GetNavigations()
.Concat<INavigationBase>(internalEntityEntry.EntityType.GetSkipNavigations());

var stateManager = internalEntityEntry.StateManager;

foreach (var navigation in navigations)
Expand Down
1 change: 0 additions & 1 deletion src/EFCore/ChangeTracking/Internal/NavigationFixer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
Expand Down
154 changes: 138 additions & 16 deletions test/EFCore.Specification.Tests/ManyToManyTrackingTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,10 @@ public virtual void Can_update_many_to_many_composite_with_navs()
e.Key3 = new DateTime(7714, 1, 1);
}));

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

ValidateFixup(context, leftEntities, rightEntities, 24, 8, 39);

Expand Down Expand Up @@ -280,7 +283,10 @@ public virtual void Can_delete_with_many_to_many_composite_with_navs()

ValidateJoinNavigations(context);

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

Assert.Equal(refCountOnes, threes.SelectMany(e => e.CompositeKeySkipFull).Count(e => e == toRemoveOne));
Assert.Equal(refCountThrees, ones.SelectMany(e => e.RootSkipShared).Count(e => e == toRemoveThree));
Expand Down Expand Up @@ -521,7 +527,10 @@ public virtual void Can_update_many_to_many_composite_shared_with_navs()
e.Key3 = new DateTime(7714, 1, 1);
}));

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

ValidateFixup(context, leftEntities, rightEntities, 24, 24, 47);

Expand Down Expand Up @@ -618,7 +627,10 @@ public virtual void Can_delete_with_many_to_many_composite_shared_with_navs()
Assert.Equal(refCountOnes, threes.SelectMany(e => e.CompositeKeySkipShared).Count(e => e == toRemoveOne));
Assert.Equal(refCountThrees, ones.SelectMany(e => e.RootSkipShared).Count(e => e == toRemoveThree));

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

Assert.Equal(refCountOnes, threes.SelectMany(e => e.CompositeKeySkipShared).Count(e => e == toRemoveOne));
Assert.Equal(refCountThrees, ones.SelectMany(e => e.RootSkipShared).Count(e => e == toRemoveThree));
Expand Down Expand Up @@ -832,7 +844,10 @@ public virtual void Can_update_many_to_many_composite_additional_pk_with_navs()
e.Key3 = new DateTime(7714, 1, 1);
}));

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

ValidateFixup(context, leftEntities, rightEntities, 24, 24, 53);

Expand Down Expand Up @@ -954,7 +969,10 @@ public virtual void Can_delete_with_many_to_many_composite_additional_pk_with_na

ValidateJoinNavigations(context);

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

Assert.Equal(refCountOnes, threes.SelectMany(e => e.CompositeKeySkipFull).Count(e => e == toRemoveOne));
Assert.Equal(refCountThrees, ones.SelectMany(e => e.ThreeSkipFull).Count(e => e == toRemoveThree));
Expand Down Expand Up @@ -1163,7 +1181,10 @@ public virtual void Can_update_many_to_many_self()
rightEntities[3].SelfSkipSharedLeft.Remove(rightEntities[3].SelfSkipSharedLeft.Single(e => e.Id == 9));
rightEntities[3].SelfSkipSharedLeft.Add(context.EntityTwos.CreateInstance(e => e.Id = 7714));

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

ValidateFixup(context, leftEntities, rightEntities, 28, 42);

Expand Down Expand Up @@ -1332,7 +1353,10 @@ public virtual void Can_update_many_to_many_with_navs()
rightEntities[2].TwoSkipFull.Remove(rightEntities[2].TwoSkipFull.Single(e => e.Id == 6));
rightEntities[2].TwoSkipFull.Add(context.EntityTwos.CreateInstance(e => e.Id = 7714));

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

ValidateFixup(context, leftEntities, rightEntities, 24, 24, 60);

Expand Down Expand Up @@ -1504,7 +1528,10 @@ public virtual void Can_update_many_to_many_with_inheritance()
rightEntities[2].OneSkip.Remove(rightEntities[2].OneSkip.Single(e => e.Id == 8));
rightEntities[2].OneSkip.Add(context.EntityOnes.CreateInstance(e => e.Id = 7714));

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

ValidateFixup(context, leftEntities, rightEntities, 24, 14, 55);

Expand Down Expand Up @@ -1693,7 +1720,10 @@ public virtual void Can_update_many_to_many_self_with_payload()
rightEntities[4].SelfSkipPayloadLeft.Remove(rightEntities[4].SelfSkipPayloadLeft.Single(e => e.Id == 6));
rightEntities[4].SelfSkipPayloadLeft.Add(context.EntityOnes.CreateInstance(e => e.Id = 7714));

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

context.Find<JoinOneSelfPayload>(7712, 1).Payload = new DateTime(1973, 9, 3);
context.Find<JoinOneSelfPayload>(20, 16).Payload = new DateTime(1969, 8, 3);
Expand Down Expand Up @@ -1891,7 +1921,10 @@ public virtual void Can_update_many_to_many_shared_with_payload()
rightEntities[2].OneSkipPayloadFullShared.Remove(rightEntities[2].OneSkipPayloadFullShared.Single(e => e.Id == 13));
rightEntities[2].OneSkipPayloadFullShared.Add(context.EntityOnes.CreateInstance(e => e.Id = 7714));

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

context.Set<Dictionary<string, object>>("JoinOneToThreePayloadFullShared").Find(7712, 1)["Payload"] = "Set!";
context.Set<Dictionary<string, object>>("JoinOneToThreePayloadFullShared").Find(20, 16)["Payload"] = "Changed!";
Expand Down Expand Up @@ -2077,7 +2110,10 @@ public virtual void Can_update_many_to_many_shared()
rightEntities[2].OneSkipShared.Remove(rightEntities[2].OneSkipShared.Single(e => e.Id == 7));
rightEntities[2].OneSkipShared.Add(context.EntityOnes.CreateInstance(e => e.Id = 7714));

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

ValidateFixup(context, leftEntities, rightEntities, 24, 24, 53);

Expand Down Expand Up @@ -2253,11 +2289,19 @@ public virtual void Can_update_many_to_many_with_payload()
rightEntities[2].OneSkipPayloadFull.Remove(rightEntities[2].OneSkipPayloadFull.Single(e => e.Id == 8));
rightEntities[2].OneSkipPayloadFull.Add(context.EntityOnes.CreateInstance(e => e.Id = 7714));

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

context.Find<JoinOneToThreePayloadFull>(7712, 1).Payload = "Set!";
context.Find<JoinOneToThreePayloadFull>(20, 20).Payload = "Changed!";

if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

ValidateFixup(context, leftEntities, rightEntities, 24, 24, 123, postSave: false);

context.SaveChanges();
Expand Down Expand Up @@ -2389,7 +2433,10 @@ public virtual void Can_delete_with_many_to_many_with_navs()

ValidateJoinNavigations(context);

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

Assert.Equal(refCountOnes, threes.SelectMany(e => e.OneSkipPayloadFull).Count(e => e == toRemoveOne));
Assert.Equal(refCountThrees, ones.SelectMany(e => e.ThreeSkipPayloadFull).Count(e => e == toRemoveThree));
Expand Down Expand Up @@ -2565,7 +2612,10 @@ public virtual void Can_update_many_to_many()
rightEntities[2].OneSkip.Remove(rightEntities[2].OneSkip.Single(e => e.Id == 1));
rightEntities[2].OneSkip.Add(context.EntityOnes.CreateInstance(e => e.Id = 7714));

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

ValidateFixup(context, leftEntities, rightEntities, 24, 24, 120);

Expand Down Expand Up @@ -2664,7 +2714,10 @@ public virtual void Can_delete_with_many_to_many()
Assert.Equal(refCountOnes, twos.SelectMany(e => e.OneSkip).Count(e => e == toRemoveOne));
Assert.Equal(refCountTwos, ones.SelectMany(e => e.TwoSkip).Count(e => e == toRemoveTwo));

context.ChangeTracker.DetectChanges();
if (RequiresDetectChanges)
{
context.ChangeTracker.DetectChanges();
}

Assert.Equal(refCountOnes, twos.SelectMany(e => e.OneSkip).Count(e => e == toRemoveOne));
Assert.Equal(refCountTwos, ones.SelectMany(e => e.TwoSkip).Count(e => e == toRemoveTwo));
Expand Down Expand Up @@ -2795,6 +2848,65 @@ static void ValidateFixup(DbContext context, IList<ImplicitManyToManyA> leftEnti
}
}

[ConditionalFact]
public virtual void Initial_tracking_uses_skip_navigations()
{
ExecuteWithStrategyInTransaction(
context =>
{
var leftEntities = new[]
{
context.Set<ImplicitManyToManyA>().CreateInstance(e => e.Id = 7711),
context.Set<ImplicitManyToManyA>().CreateInstance(e => e.Id = 7712),
context.Set<ImplicitManyToManyA>().CreateInstance(e => e.Id = 7713)
};
var rightEntities = new[]
{
context.Set<ImplicitManyToManyB>().CreateInstance(e => e.Id = 7721),
context.Set<ImplicitManyToManyB>().CreateInstance(e => e.Id = 7722),
context.Set<ImplicitManyToManyB>().CreateInstance(e => e.Id = 7723)
};

leftEntities[0].Bs.Add(rightEntities[0]); // 11 - 21
leftEntities[0].Bs.Add(rightEntities[1]); // 11 - 22
leftEntities[0].Bs.Add(rightEntities[2]); // 11 - 23

context.AddRange(leftEntities[0], leftEntities[1], leftEntities[2]);

ValidateFixup(context, leftEntities, rightEntities);

context.SaveChanges();

ValidateFixup(context, leftEntities, rightEntities);
},
context =>
{
var results = context.Set<ImplicitManyToManyA>().Where(e => e.Id > 7700).Include(e => e.Bs).ToList();
Assert.Equal(3, results.Count);

var leftEntities = context.ChangeTracker.Entries<ImplicitManyToManyA>().Select(e => e.Entity).OrderBy(e => e.Id).ToList();
var rightEntities = context.ChangeTracker.Entries<ImplicitManyToManyB>().Select(e => e.Entity).OrderBy(e => e.Id).ToList();

ValidateFixup(context, leftEntities, rightEntities);
});

static void ValidateFixup(DbContext context, IList<ImplicitManyToManyA> leftEntities, IList<ImplicitManyToManyB> rightEntities)
{
Assert.Equal(9, context.ChangeTracker.Entries().Count());
Assert.Equal(3, context.ChangeTracker.Entries<ImplicitManyToManyA>().Count());
Assert.Equal(3, context.ChangeTracker.Entries<ImplicitManyToManyB>().Count());
Assert.Equal(3, context.ChangeTracker.Entries<Dictionary<string, object>>().Count());

Assert.Equal(3, leftEntities[0].Bs.Count);
Assert.Empty(leftEntities[1].Bs);
Assert.Empty(leftEntities[2].Bs);

Assert.Single(rightEntities[0].As);
Assert.Single(rightEntities[1].As);
Assert.Single(rightEntities[2].As);
}
}

[ConditionalTheory]
[InlineData(new[] { 1, 2, 3 })]
[InlineData(new[] { 2, 1, 3 })]
Expand Down Expand Up @@ -2915,8 +3027,18 @@ protected virtual void UseTransaction(DatabaseFacade facade, IDbContextTransacti

protected virtual bool SupportsDatabaseDefaults => true;

protected virtual bool RequiresDetectChanges => true;

public abstract class ManyToManyTrackingFixtureBase : ManyToManyQueryFixtureBase
{
public override ManyToManyContext CreateContext()
{
var context = base.CreateContext();
context.ChangeTracker.AutoDetectChangesEnabled = false;

return context;
}

protected override string StoreName { get; } = "ManyToManyTracking";
}
}
Expand Down
2 changes: 2 additions & 0 deletions test/EFCore.SqlServer.FunctionalTests/ManyToManyTrackingProxySqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ public ManyToManyTrackingProxySqlServerTest(ManyToManyTrackingProxySqlServerFixt
{
}

protected override bool RequiresDetectChanges => false;

public class ManyToManyTrackingProxySqlServerFixture : ManyToManyTrackingSqlServerFixtureBase
{
protected override string StoreName { get; } = "ManyToManyTrackingProxies";
Expand Down