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

Ensure properties matching CLR properties are always marked as non-shadow #5046

Closed
wants to merge 1 commit into from
Closed

Ensure properties matching CLR properties are always marked as non-shadow #5046

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
14 changes: 14 additions & 0 deletions src/Microsoft.EntityFrameworkCore/Metadata/Internal/InternalEntityTypeBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,20 @@ private InternalPropertyBuilder Property(
{
Unignore(propertyName);

if (shadowProperty != false)
{
var clrProperty = Metadata.ClrType?.GetPropertiesInHierarchy(propertyName).FirstOrDefault();
if (clrProperty != null)
{
propertyType = clrProperty.PropertyType;
shadowProperty = false;
}
else
{
shadowProperty = true;
}
}

property = Metadata.AddProperty(propertyName, configurationSource.Value, runConventions: false);
}
else if (configurationSource.HasValue)
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.EntityFrameworkCore.Tests/Metadata/Internal/InternalEntityTypeBuilderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,7 @@ public void Can_promote_property_to_base()
Assert.False(entityBuilder.Ignore(Order.IdProperty.Name, ConfigurationSource.Convention));
Assert.Empty(derivedEntityBuilder.Metadata.GetDeclaredProperties());
Assert.Empty(derivedEntityBuilder2.Metadata.GetDeclaredProperties());
Assert.Equal(typeof(string), propertyBuilder.Metadata.ClrType);
Assert.Equal(typeof(int), propertyBuilder.Metadata.ClrType);
Assert.True(propertyBuilder.Metadata.IsConcurrencyToken);
Assert.True(propertyBuilder.Metadata.RequiresValueGenerator);
Assert.Equal(1, propertyBuilder.Metadata.GetMaxLength());
Expand Down
8 changes: 4 additions & 4 deletions test/Microsoft.EntityFrameworkCore.Tests/Metadata/Internal/InternalPropertyBuilderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void Can_only_override_existing_ClrType_value_explicitly()
}

[Fact]
public void Property_added_by_name_is_shadow_even_if_matches_Clr_type()
public void Property_added_by_name_is_non_shadow_if_matches_Clr_property()
{
var model = new Model();
var modelBuilder = new InternalModelBuilder(model);
Expand All @@ -65,9 +65,9 @@ public void Property_added_by_name_is_shadow_even_if_matches_Clr_type()
var property = builder.Metadata;

Assert.Equal(typeof(string), property.ClrType);
Assert.True(property.IsShadowProperty);
Assert.Null(property.GetClrTypeConfigurationSource());
Assert.Null(property.GetIsShadowPropertyConfigurationSource());
Assert.False(property.IsShadowProperty);
Assert.Equal(ConfigurationSource.Convention, property.GetClrTypeConfigurationSource());
Assert.Equal(ConfigurationSource.Convention, property.GetIsShadowPropertyConfigurationSource());
}

[Fact]
Expand Down
32 changes: 0 additions & 32 deletions .../Microsoft.EntityFrameworkCore.Tests/ModelBuilderTest/ModelBuilderNonGenericStringTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,43 +17,11 @@ public class ModelBuilderNonGenericStringTest : ModelBuilderNonGenericTest
{
public class NonGenericOneToManyType : OneToManyTestBase
{
public override void Can_set_foreign_key_property_when_matching_property_added()
{
var modelBuilder = CreateModelBuilder();
var model = modelBuilder.Model;
modelBuilder.Entity<PrincipalEntity>();

var foreignKey = model.FindEntityType(typeof(DependentEntity)).GetForeignKeys().Single();
Assert.Equal("NavId", foreignKey.Properties.Single().Name);

modelBuilder.Entity<DependentEntity>().Property(et => et.PrincipalEntityId);

// Does not set foreign key property for added shadow property
var newForeignKey = model.FindEntityType(typeof(DependentEntity)).GetForeignKeys().Single();
Assert.Equal("NavId", newForeignKey.Properties.Single().Name);
}

protected override TestModelBuilder CreateTestModelBuilder(ModelBuilder modelBuilder) => new NonGenericStringTestModelBuilder(modelBuilder);
}

public class NonGenericManyToOneType : ManyToOneTestBase
{
public override void Can_set_foreign_key_property_when_matching_property_added()
{
var modelBuilder = CreateModelBuilder();
var model = modelBuilder.Model;
modelBuilder.Entity<PrincipalEntity>();

var foreignKey = model.FindEntityType(typeof(DependentEntity)).GetForeignKeys().Single();
Assert.Equal("NavId", foreignKey.Properties.Single().Name);

modelBuilder.Entity<DependentEntity>().Property(et => et.PrincipalEntityId);

// Does not set foreign key property for added shadow property
var newForeignKey = model.FindEntityType(typeof(DependentEntity)).GetForeignKeys().Single();
Assert.Equal("NavId", newForeignKey.Properties.Single().Name);
}

protected override TestModelBuilder CreateTestModelBuilder(ModelBuilder modelBuilder) => new NonGenericStringTestModelBuilder(modelBuilder);
}

Expand Down
34 changes: 0 additions & 34 deletions test/Microsoft.EntityFrameworkCore.Tests/ModelBuilderTest/ModelBuilderNonGenericTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,45 +36,11 @@ public void Can_set_model_annotation()

public class NonGenericOneToMany : OneToManyTestBase
{
[Fact]
public override void Can_set_foreign_key_property_when_matching_property_added()
{
var modelBuilder = CreateModelBuilder();
var model = modelBuilder.Model;
modelBuilder.Entity<PrincipalEntity>();

var foreignKey = model.FindEntityType(typeof(DependentEntity)).GetForeignKeys().Single();
Assert.Equal("NavId", foreignKey.Properties.Single().Name);

modelBuilder.Entity<DependentEntity>().Property(et => et.PrincipalEntityId);

// Does not set foreign key property for added shadow property
var newForeignKey = model.FindEntityType(typeof(DependentEntity)).GetForeignKeys().Single();
Assert.Equal("NavId", newForeignKey.Properties.Single().Name);
}

protected override TestModelBuilder CreateTestModelBuilder(ModelBuilder modelBuilder) => new NonGenericTestModelBuilder(modelBuilder);
}

public class NonGenericManyToOne : ManyToOneTestBase
{
[Fact]
public override void Can_set_foreign_key_property_when_matching_property_added()
{
var modelBuilder = CreateModelBuilder();
var model = modelBuilder.Model;
modelBuilder.Entity<PrincipalEntity>();

var foreignKey = model.FindEntityType(typeof(DependentEntity)).GetForeignKeys().Single();
Assert.Equal("NavId", foreignKey.Properties.Single().Name);

modelBuilder.Entity<DependentEntity>().Property(et => et.PrincipalEntityId);

// Does not set foreign key property for added shadow property
var newForeignKey = model.FindEntityType(typeof(DependentEntity)).GetForeignKeys().Single();
Assert.Equal("NavId", newForeignKey.Properties.Single().Name);
}

protected override TestModelBuilder CreateTestModelBuilder(ModelBuilder modelBuilder) => new NonGenericTestModelBuilder(modelBuilder);
}

Expand Down