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

[release/9.0] Take into account store-generated values when ordering update commands #34626

Merged
merged 1 commit into from
Sep 9, 2024
Merged

[release/9.0] Take into account store-generated values when ordering update commands #34626

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
18 changes: 15 additions & 3 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 @@ -993,18 +993,30 @@ private static bool IsModified(IReadOnlyList<IColumn> columns, IReadOnlyModifica
var entry = command.Entries[entryIndex];
var columnMapping = column.FindColumnMapping(entry.EntityType);
var property = columnMapping?.Property;
if (property != null
&& (property.GetAfterSaveBehavior() == PropertySaveBehavior.Save
|| (!property.IsPrimaryKey() && entry.EntityState != EntityState.Modified)))
if (property != null)
{
switch (entry.EntityState)
{
case EntityState.Added:
currentValue = entry.GetCurrentProviderValue(property);
if (entry.SharedIdentityEntry != null)
{
var sharedProperty = entry.SharedIdentityEntry.EntityType == entry.EntityType
? property
: column.FindColumnMapping(entry.SharedIdentityEntry.EntityType)?.Property;

if (sharedProperty != null)
{
originalValue ??= entry.SharedIdentityEntry.GetOriginalProviderValue(sharedProperty);
}
}

break;
case EntityState.Deleted:
case EntityState.Unchanged:
originalValue ??= entry.GetOriginalProviderValue(property);
Check.DebugAssert(entry.SharedIdentityEntry == null, "entry.SharedIdentityEntry != null");

break;
case EntityState.Modified:
if (entry.IsModified(property))
Expand Down
43 changes: 41 additions & 2 deletions test/EFCore.Relational.Specification.Tests/Update/UpdatesRelationalTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,43 @@ public virtual Task Swap_filtered_unique_index_values()
});
}

[ConditionalFact] // Issue #33023
public virtual Task Swap_computed_unique_index_values()
{
var productId1 = new Guid("984ade3c-2f7b-4651-a351-642e92ab7146");
var productId2 = new Guid("0edc9136-7eed-463b-9b97-bdb9648ab877");

return ExecuteWithStrategyInTransactionAsync(
async context =>
{
var product1 = (await context.Products.FindAsync(productId1))!;
var product2 = (await context.Products.FindAsync(productId2))!;

product1.IsPrimary = false;
product2.Name = product1.Name;
product2.IsPrimary = true;

await context.SaveChangesAsync();
}, async context =>
{
var product1 = (await context.Products.FindAsync(productId1))!;
var product2 = (await context.Products.FindAsync(productId2))!;

product1.Name = "Apple Cobler";
product1.IsPrimary = true;
product2.IsPrimary = false;

await context.SaveChangesAsync();
}, async context =>
{
var product1 = (await context.Products.FindAsync(productId1))!;
var product2 = (await context.Products.FindAsync(productId2))!;

Assert.True(product1.IsPrimary);
Assert.False(product2.IsPrimary);
});
}

[ConditionalFact]
public virtual Task Update_non_indexed_values()
{
Expand All @@ -197,13 +234,15 @@ public virtual Task Update_non_indexed_values()
{
Id = productId1,
Name = "",
Price = 1.49M
Price = 1.49M,
IsPrimary = true
};
var product2 = new Product
{
Id = productId2,
Name = "",
Price = 1.49M
Price = 1.49M,
IsPrimary = false
};

context.Attach(product1).Property(p => p.DependentId).IsModified = true;
Expand Down
4 changes: 4 additions & 0 deletions test/EFCore.Specification.Tests/TestModels/UpdatesModel/Product.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,9 @@ public class Product : ProductBase
[ConcurrencyCheck]
public decimal Price { get; set; }

public bool IsPrimary { get; set; }

public bool? IsPrimaryNormalized { get => IsPrimary ? true : null; set { } }

public ICollection<ProductCategory> ProductCategories { get; set; } = null!;
}
6 changes: 4 additions & 2 deletions test/EFCore.Specification.Tests/TestModels/UpdatesModel/UpdatesContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,17 @@ public static Task SeedAsync(UpdatesContext context)
Id = productId1,
Name = "Apple Cider",
Price = 1.49M,
DependentId = 778
DependentId = 778,
IsPrimary = true
});
context.Add(
new Product
{
Id = productId2,
Name = "Apple Cobler",
Price = 2.49M,
DependentId = 778
DependentId = 778,
IsPrimary = false
});

return context.SaveChangesAsync();
Expand Down
4 changes: 4 additions & 0 deletions test/EFCore.Specification.Tests/Update/UpdatesTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
.HasForeignKey(e => e.DependentId)
.HasPrincipalKey(e => e.PrincipalId);

modelBuilder.Entity<Product>()
.HasIndex(e => new { e.Name, e.IsPrimaryNormalized })
.IsUnique();

modelBuilder.Entity<Person>(
pb =>
{
Expand Down
4 changes: 2 additions & 2 deletions test/EFCore.SqlServer.FunctionalTests/Update/UpdatesSqlServerTPCTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ FROM [SpecialCategory] AS [s]
"""
@__category_PrincipalId_0='778' (Nullable = true)

SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[Name], [p].[Price]
SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[IsPrimary], [p].[IsPrimaryNormalized], [p].[Name], [p].[Price]
FROM [ProductBase] AS [p]
WHERE [p].[Discriminator] = N'Product' AND [p].[DependentId] = @__category_PrincipalId_0
""",
Expand Down Expand Up @@ -81,7 +81,7 @@ FROM [SpecialCategory] AS [s]
"""
@__category_PrincipalId_0='778' (Nullable = true)

SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[Name], [p].[Price]
SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[IsPrimary], [p].[IsPrimaryNormalized], [p].[Name], [p].[Price]
FROM [ProductBase] AS [p]
WHERE [p].[Discriminator] = N'Product' AND [p].[DependentId] = @__category_PrincipalId_0
""");
Expand Down
4 changes: 2 additions & 2 deletions test/EFCore.SqlServer.FunctionalTests/Update/UpdatesSqlServerTPTTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ FROM [Categories] AS [c]
"""
@__category_PrincipalId_0='778' (Nullable = true)

SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[Name], [p].[Price]
SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[IsPrimary], [p].[IsPrimaryNormalized], [p].[Name], [p].[Price]
FROM [ProductBase] AS [p]
WHERE [p].[Discriminator] = N'Product' AND [p].[DependentId] = @__category_PrincipalId_0
""",
Expand All @@ -75,7 +75,7 @@ FROM [Categories] AS [c]
"""
@__category_PrincipalId_0='778' (Nullable = true)

SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[Name], [p].[Price]
SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[IsPrimary], [p].[IsPrimaryNormalized], [p].[Name], [p].[Price]
FROM [ProductBase] AS [p]
WHERE [p].[Discriminator] = N'Product' AND [p].[DependentId] = @__category_PrincipalId_0
""");
Expand Down
4 changes: 2 additions & 2 deletions test/EFCore.SqlServer.FunctionalTests/Update/UpdatesSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ FROM [Categories] AS [c]
"""
@__category_PrincipalId_0='778' (Nullable = true)

SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[Name], [p].[Price]
SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[IsPrimary], [p].[IsPrimaryNormalized], [p].[Name], [p].[Price]
FROM [ProductBase] AS [p]
WHERE [p].[Discriminator] = N'Product' AND [p].[DependentId] = @__category_PrincipalId_0
""",
Expand All @@ -68,7 +68,7 @@ FROM [Categories] AS [c]
"""
@__category_PrincipalId_0='778' (Nullable = true)

SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[Name], [p].[Price]
SELECT [p].[Id], [p].[Discriminator], [p].[DependentId], [p].[IsPrimary], [p].[IsPrimaryNormalized], [p].[Name], [p].[Price]
FROM [ProductBase] AS [p]
WHERE [p].[Discriminator] = N'Product' AND [p].[DependentId] = @__category_PrincipalId_0
""");
Expand Down
9 changes: 9 additions & 0 deletions test/EFCore.SqlServer.FunctionalTests/Update/UpdatesSqlServerTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,15 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
.Property(p => p.Id).HasDefaultValueSql("NEWID()");

modelBuilder.Entity<Product>().HasIndex(p => new { p.Name, p.Price }).HasFilter("Name IS NOT NULL");

modelBuilder.Entity<Product>()
.HasIndex(e => new { e.Name, e.IsPrimaryNormalized })
.IsUnique()
.HasFilter(null);

modelBuilder.Entity<Product>()
.Property(e => e.IsPrimaryNormalized)
.HasComputedColumnSql($"IIF(IsPrimary = 1, CONVERT(bit, 1), NULL)", stored: true);
}

public virtual async Task ResetIdentity()
Expand Down