Skip to content

[release/8.0] Cosmos: persist non-shadow int keys on owned entity types #31933

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
Parent: [release/8.0-staging] Merge release/8.0 to release/8.0-staging
merged 1 commit into from
Oct 3, 2023
Merged

[release/8.0] Cosmos: persist non-shadow int keys on owned entity types #31933

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
1 change: 1 addition & 0 deletions src/EFCore.Cosmos/Extensions/CosmosPropertyExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ private static string GetDefaultJsonPropertyName(IReadOnlyProperty property)
var pk = property.FindContainingPrimaryKey();
if (pk != null
&& (property.ClrType == typeof(int) || ownership.Properties.Contains(property))
&& property.IsShadowProperty()
&& pk.Properties.Count == ownership.Properties.Count + (ownership.IsUnique ? 0 : 1)
&& ownership.Properties.All(fkProperty => pk.Properties.Contains(fkProperty)))
{
Expand Down
1 change: 1 addition & 0 deletions src/EFCore.Cosmos/Metadata/Conventions/CosmosValueGenerationConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public virtual void ProcessEntityTypeAnnotationChanged(
if (pk != null
&& !property.IsForeignKey()
&& pk.Properties.Count == ownership.Properties.Count + 1
&& property.IsShadowProperty()
&& ownership.Properties.All(fkProperty => pk.Properties.Contains(fkProperty)))
{
return ValueGenerated.OnAddOrUpdate;
Expand Down
8 changes: 4 additions & 4 deletions src/EFCore.Cosmos/Metadata/Internal/CosmosPropertyExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ public static bool IsOrdinalKeyProperty(this IReadOnlyProperty property)
{
Check.DebugAssert(
(property.DeclaringType as IEntityType)?.IsOwned() == true, $"Expected {property.DeclaringType.DisplayName()} to be owned.");
Check.DebugAssert(property.GetJsonPropertyName().Length == 0, $"Expected {property.Name} to be non-persisted.");

return property.FindContainingPrimaryKey() is { Properties.Count: > 1 }
return property.ClrType == typeof(int)
&& !property.IsForeignKey()
&& property.ClrType == typeof(int)
&& (property.ValueGenerated & ValueGenerated.OnAdd) != 0;
&& (property.ValueGenerated & ValueGenerated.OnAdd) != 0
&& property.FindContainingPrimaryKey() is { Properties.Count: > 1 }
&& property.GetJsonPropertyName().Length == 0;
}
}
24 changes: 16 additions & 8 deletions test/EFCore.Cosmos.FunctionalTests/EmbeddedDocumentsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public virtual async Task Can_manipulate_embedded_collections(bool useIds)
{
existingAddress1Person2.IdNotes = new List<NoteWithId>
{
new() { Content = "First note" }, new() { Content = "Second note" }
new() { Id = 4, Content = "First note" }, new() { Id = 3, Content = "Second note" }
};
}
else
Expand Down Expand Up @@ -260,15 +260,15 @@ await context.AddAsync(

await context.SaveChangesAsync();

await AssertState(context);
await AssertState(context, useIds);
}

using (var context = new EmbeddedTransportationContext(options))
{
await AssertState(context);
await AssertState(context, useIds);
}

async Task AssertState(EmbeddedTransportationContext context)
async Task AssertState(EmbeddedTransportationContext context, bool useIds)
{
var people = await context.Set<Person>().OrderBy(o => o.Id).ToListAsync();
var firstAddress = people[0].Addresses.Single();
Expand All @@ -294,9 +294,17 @@ async Task AssertState(EmbeddedTransportationContext context)
{
var notes = addresses[1].IdNotes;
Assert.Equal(2, notes.Count);
Assert.Equal(1, notes.First().Id);
if (useIds)
{
Assert.Equal(4, notes.First().Id);
Assert.Equal(3, notes.Last().Id);
}
else
{
Assert.Equal(1, notes.First().Id);
Assert.Equal(2, notes.Last().Id);
}
Assert.Equal("First note", notes.First().Content);
Assert.Equal(2, notes.Last().Id);
Assert.Equal("Second note", notes.Last().Content);
}
else
Expand Down Expand Up @@ -339,7 +347,7 @@ async Task AssertState(EmbeddedTransportationContext context)
if (useIds)
{
Assert.Equal(1, addresses[1].IdNotes.Count);
Assert.Equal(1, addresses[1].IdNotes.First().Id);
Assert.Equal(-1, addresses[1].IdNotes.First().Id);
Assert.Equal("Another note", addresses[1].IdNotes.First().Content);
}
else
Expand All @@ -354,7 +362,7 @@ async Task AssertState(EmbeddedTransportationContext context)
if (useIds)
{
Assert.Equal(1, addresses[2].IdNotes.Count);
Assert.Equal(1, addresses[2].IdNotes.First().Id);
Assert.Equal(4, addresses[2].IdNotes.First().Id);
Assert.Equal("City note", addresses[2].IdNotes.First().Content);
}
else
Expand Down