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

[5.0.1] Only accept non-default store-generated values #23186

Merged
merged 2 commits into from
Nov 12, 2020
Merged

[5.0.1] Only accept non-default store-generated values #23186

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
749cbf0
Only accept non-default store-generated values
AndriySvyryd Nov 4, 2020
292a292
Add quirk mode for #23180
AndriySvyryd Nov 4, 2020
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
10 changes: 9 additions & 1 deletion src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1265,13 +1265,21 @@ public virtual void AcceptChanges()
{
if (!_storeGeneratedValues.IsEmpty)
{
var useOldBehavior = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue23180", out var isEnabled)
&& isEnabled;
foreach (var property in EntityType.GetProperties())
{
var storeGeneratedIndex = property.GetStoreGeneratedIndex();
if (storeGeneratedIndex != -1
&& _storeGeneratedValues.TryGetValue(storeGeneratedIndex, out var value))
{
this[property] = value;
var equals = ValuesEqualFunc(property);
var defaultValue = property.ClrType.GetDefaultValue();
if (!equals(value, defaultValue)
&& !useOldBehavior)
{
this[property] = value;
}
}
}

Expand Down
8 changes: 4 additions & 4 deletions test/EFCore.InMemory.FunctionalTests/GraphUpdates/GraphUpdatesInMemoryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ public override void Optional_many_to_one_dependents_with_alternate_key_are_orph
// FK uniqueness not enforced in in-memory database
}

public override void Optional_One_to_one_relationships_are_one_to_one(
public override void Optional_one_to_one_relationships_are_one_to_one(
CascadeTiming? deleteOrphansTiming)
{
// FK uniqueness not enforced in in-memory database
}

public override void Required_One_to_one_relationships_are_one_to_one(
public override void Required_one_to_one_relationships_are_one_to_one(
CascadeTiming? deleteOrphansTiming)
{
// FK uniqueness not enforced in in-memory database
Expand Down Expand Up @@ -104,13 +104,13 @@ public override void Required_non_PK_one_to_one_are_cascade_detached_when_Added(
// FK uniqueness not enforced in in-memory database
}

public override void Optional_One_to_one_with_AK_relationships_are_one_to_one(
public override void Optional_one_to_one_with_AK_relationships_are_one_to_one(
CascadeTiming? deleteOrphansTiming)
{
// FK uniqueness not enforced in in-memory database
}

public override void Required_One_to_one_with_AK_relationships_are_one_to_one(
public override void Required_one_to_one_with_AK_relationships_are_one_to_one(
CascadeTiming? deleteOrphansTiming)
{
// FK uniqueness not enforced in in-memory database
Expand Down
4 changes: 2 additions & 2 deletions test/EFCore.Specification.Tests/GraphUpdates/GraphUpdatesTestBaseOneToOne.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public abstract partial class GraphUpdatesTestBase<TFixture>
[InlineData(CascadeTiming.Immediate)]
[InlineData(CascadeTiming.Never)]
[InlineData(null)]
public virtual void Optional_One_to_one_relationships_are_one_to_one(
public virtual void Optional_one_to_one_relationships_are_one_to_one(
CascadeTiming? deleteOrphansTiming)
{
ExecuteWithStrategyInTransaction(
Expand Down Expand Up @@ -781,7 +781,7 @@ public virtual void Optional_one_to_one_are_orphaned_starting_detached(
[InlineData(CascadeTiming.Immediate)]
[InlineData(CascadeTiming.Never)]
[InlineData(null)]
public virtual void Required_One_to_one_relationships_are_one_to_one(
public virtual void Required_one_to_one_relationships_are_one_to_one(
CascadeTiming? deleteOrphansTiming)
{
ExecuteWithStrategyInTransaction(
Expand Down
4 changes: 2 additions & 2 deletions test/EFCore.Specification.Tests/GraphUpdates/GraphUpdatesTestBaseOneToOneAk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public abstract partial class GraphUpdatesTestBase<TFixture>
[InlineData(CascadeTiming.Immediate)]
[InlineData(CascadeTiming.Never)]
[InlineData(null)]
public virtual void Optional_One_to_one_with_AK_relationships_are_one_to_one(
public virtual void Optional_one_to_one_with_AK_relationships_are_one_to_one(
CascadeTiming? deleteOrphansTiming)
{
ExecuteWithStrategyInTransaction(
Expand Down Expand Up @@ -959,7 +959,7 @@ public virtual void Optional_one_to_one_with_alternate_key_are_orphaned_starting
[InlineData(CascadeTiming.Immediate)]
[InlineData(CascadeTiming.Never)]
[InlineData(null)]
public virtual void Required_One_to_one_with_AK_relationships_are_one_to_one(
public virtual void Required_one_to_one_with_AK_relationships_are_one_to_one(
CascadeTiming? deleteOrphansTiming)
{
ExecuteWithStrategyInTransaction(
Expand Down
18 changes: 0 additions & 18 deletions test/EFCore.SqlServer.FunctionalTests/GraphUpdates/GraphUpdatesSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,6 @@ public TptIdentity(SqlServerFixture fixture)
{
}

[ConditionalFact(Skip = "Issue #22582")]
public override void Can_add_multiple_dependents_when_multiple_possible_principal_sides()
{
}

[ConditionalFact(Skip = "Issue #22582")]
public override void Can_add_valid_first_dependent_when_multiple_possible_principal_sides()
{
}

[ConditionalFact(Skip = "Issue #22582")]
public override void Can_add_valid_second_dependent_when_multiple_possible_principal_sides()
{
}

protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction)
=> facade.UseTransaction(transaction.GetDbTransaction());

Expand Down Expand Up @@ -152,9 +137,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
modelBuilder.Entity<OptionalOverlapping2>().ToTable(nameof(OptionalOverlapping2));
modelBuilder.Entity<BadCustomer>().ToTable(nameof(BadCustomer));
modelBuilder.Entity<BadOrder>().ToTable(nameof(BadOrder));
modelBuilder.Entity<QuestTask>().ToTable(nameof(QuestTask));
modelBuilder.Entity<QuizTask>().ToTable(nameof(QuizTask));
modelBuilder.Entity<HiddenAreaTask>().ToTable(nameof(HiddenAreaTask));
modelBuilder.Entity<TaskChoice>().ToTable(nameof(TaskChoice));
modelBuilder.Entity<ParentAsAChild>().ToTable(nameof(ParentAsAChild));
modelBuilder.Entity<ChildAsAParent>().ToTable(nameof(ChildAsAParent));
Expand Down
43 changes: 43 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,49 @@ private class BNum
public string TheWalrus { get; set; }
}

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

var options = Fixture.CreateOptions(testDatabase);
using (var context = new CarContext(options))
{
context.Database.EnsureCreatedResiliently();

var ferrari = new Ferrari { Special = new Car() };
context.Add(ferrari);

await context.SaveChangesAsync();

Assert.NotNull(ferrari.Special);
}
}

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

protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<Car>().ToTable("Car");
modelBuilder.Entity<Ferrari>().ToTable("Ferrari");
}
}

private class Car
{
public int Id { get; set; }
}

private class Ferrari : Car
{
public Car Special { get; set; }
}

[ConditionalFact]
public void Can_run_linq_query_on_entity_set()
{
Expand Down