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/5.0] Don't compare values from different keys for deleted entities #24244

Merged
merged 2 commits into from
Mar 10, 2021
Merged

[release/5.0] Don't compare values from different keys for deleted entities #24244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f465216
Don't compare values from different keys in for deleted entities
AndriySvyryd Feb 23, 2021
7485ea7
Add quirk mode for #24221
AndriySvyryd Feb 23, 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
22 changes: 14 additions & 8 deletions src/EFCore.Relational/Update/Internal/CommandBatchPreparer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,14 +625,14 @@ private void AddForeignKeyEdges(
}
}

private static void AddMatchingPredecessorEdge(
Dictionary<IKeyValueIndex, List<ModificationCommand>> predecessorsMap,
IKeyValueIndex dependentKeyValue,
private static void AddMatchingPredecessorEdge<T>(
Dictionary<T, List<ModificationCommand>> predecessorsMap,
T keyValue,
Multigraph<ModificationCommand, IAnnotatable> commandGraph,
ModificationCommand command,
IAnnotatable edge)
{
if (predecessorsMap.TryGetValue(dependentKeyValue, out var predecessorCommands))
if (predecessorsMap.TryGetValue(keyValue, out var predecessorCommands))
{
foreach (var predecessor in predecessorCommands)
{
Expand All @@ -647,7 +647,7 @@ private static void AddMatchingPredecessorEdge(
private void AddUniqueValueEdges(Multigraph<ModificationCommand, IAnnotatable> commandGraph)
{
Dictionary<IIndex, Dictionary<object[], ModificationCommand>> indexPredecessorsMap = null;
var keyPredecessorsMap = new Dictionary<IKeyValueIndex, List<ModificationCommand>>();
var keyPredecessorsMap = new Dictionary<(IKey, IKeyValueIndex), List<ModificationCommand>>();
foreach (var command in commandGraph.Vertices)
{
if (command.EntityState != EntityState.Modified
Expand Down Expand Up @@ -697,10 +697,10 @@ private void AddUniqueValueEdges(Multigraph<ModificationCommand, IAnnotatable> c

if (principalKeyValue != null)
{
if (!keyPredecessorsMap.TryGetValue(principalKeyValue, out var predecessorCommands))
if (!keyPredecessorsMap.TryGetValue((GetKey(key), principalKeyValue), out var predecessorCommands))
{
predecessorCommands = new List<ModificationCommand>();
keyPredecessorsMap.Add(principalKeyValue, predecessorCommands);
keyPredecessorsMap.Add((GetKey(key), principalKeyValue), predecessorCommands);
}

predecessorCommands.Add(command);
Expand Down Expand Up @@ -761,12 +761,18 @@ private void AddUniqueValueEdges(Multigraph<ModificationCommand, IAnnotatable> c
if (principalKeyValue != null)
{
AddMatchingPredecessorEdge(
keyPredecessorsMap, principalKeyValue, commandGraph, command, key);
keyPredecessorsMap, (GetKey(key), principalKeyValue), commandGraph, command, key);
}
}
}
}
}
}

private static readonly bool _useOldKeyComparison =
AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue24221", out var enabled) && enabled;

private IKey GetKey(IKey key)
=> _useOldKeyComparison ? null : key;
}
}
64 changes: 64 additions & 0 deletions test/EFCore.SqlServer.FunctionalTests/SqlServerEndToEndTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,70 @@ private class BNum
public string TheWalrus { get; set; }
}

[ConditionalFact]
public async Task Can_add_and_remove_entities_with_keys_of_different_type()
{
using var testDatabase = SqlServerTestStore.CreateInitialized(DatabaseName);

var options = Fixture.CreateOptions(testDatabase);
using (var context = new CompositeKeysDbContext(options))
{
context.Database.EnsureCreatedResiliently();
var first = new Int32CompositeKeys
{
Id1 = 1, Id2 = 2
};

context.Add(first);

var second = new Int64CompositeKeys
{
Id1 = 1,
Id2 = 2
};

context.Add(second);
await context.SaveChangesAsync();
}

using (var context = new CompositeKeysDbContext(options))
{
var first = context.Set<Int32CompositeKeys>().Single();
context.Remove(first);

var second = context.Set<Int64CompositeKeys>().Single();
context.Remove(second);

await context.SaveChangesAsync();
}
}

private class CompositeKeysDbContext : DbContext
{
public CompositeKeysDbContext(DbContextOptions options)
: base(options)
{
}

protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<Int32CompositeKeys>().HasKey(i => new { i.Id1, i.Id2 });
modelBuilder.Entity<Int64CompositeKeys>().HasKey(l => new { l.Id1, l.Id2 });
}
}

private class Int32CompositeKeys
{
public int Id1 { get; set; }
public int Id2 { get; set; }
}

private class Int64CompositeKeys
{
public long Id1 { get; set; }
public long Id2 { get; set; }
}

[ConditionalFact]
public void Can_insert_non_owner_principal_for_owned()
{
Expand Down