Migrations: Adding properties to owned types causes strange renames

[kykc]

Observed behavior

When I'm trying to add another owned type property to already existing entity, instead of just adding new fields, migration renames one of the existing properties fields to the new name and creates new fields for already existing property. The resulting Up method looks like this:

        protected override void Up(MigrationBuilder migrationBuilder)
        {
            migrationBuilder.RenameColumn(
                name: "AmountCharged_Currency",
                table: "BusinessTransactions",
                newName: "ChargeFee_Currency");

            migrationBuilder.RenameColumn(
                name: "AmountCharged_Amount",
                table: "BusinessTransactions",
                newName: "ChargeFee_Amount");

            migrationBuilder.AddColumn<decimal>(
                name: "AmountCharged_Amount",
                table: "BusinessTransactions",
                type: "decimal(18, 2)",
                nullable: false,
                defaultValue: 0m);

            migrationBuilder.AddColumn<int>(
                name: "AmountCharged_Currency",
                table: "BusinessTransactions",
                type: "int",
                nullable: false,
                defaultValue: 0);
        }

Expected behavior

        protected override void Up(MigrationBuilder migrationBuilder)
        {
            migrationBuilder.AddColumn<decimal>(
                name: "ChargeFee_Amount",
                table: "BusinessTransactions",
                type: "decimal(18, 2)",
                nullable: false,
                defaultValue: 0m);

            migrationBuilder.AddColumn<int>(
                name: "ChargeFee_Currency",
                table: "BusinessTransactions",
                type: "int",
                nullable: false,
                defaultValue: 0);
        }

Steps to reproduce

Minimal testcase is better than a thousand words:

1. Clone testcase repo
2. Uncomment two lines in Program.cs
3. Add-Migration TestNewField in nuget console

Note: this repo also contains borken branch which contains all migrations and snapshots as it happened on my side, so master is before, borken is after.

Further technical details

EF Core version: 2.0.0
Database Provider: Microsoft.EntityFrameworkCore.SqlServer
Operating system: Windows 10 1703
IDE: Visual Studio 2017 15.3.5

[kykc]

Futher experiments:

1. Setting field names explicitly like this achieves nothing:

var x = modelBuilder.Entity<BusinessTransaction>().OwnsOne(p => p.Profit);
x.Property(m => m.Amount).HasColumnName("Profit_Amount");
x.Property(m => m.Currency).HasColumnName("Profit_Currency");

2. Setting owned type automatically for each property of desired type (MoneyAmount in this example) achieves nothing:

foreach (var entity in modelBuilder.Model.GetEntityTypes().ToList())
{
	foreach (var property in entity.ClrType.GetProperties().ToList())
	{
		if (property.PropertyType == typeof(MoneyAmount))
		{
			modelBuilder.Entity(entity.ClrType).OwnsOne(typeof(MoneyAmount), property.Name);
		}
	}
}

3. If I correct generated Up and Down methods by hand further migrations (without owned types) and subsequent Update-Database calls seem to work as expected since generated snapshots are correct, the problem is only in the migration.

        protected override void Up(MigrationBuilder migrationBuilder)
        {
            migrationBuilder.AddColumn<decimal>(
                name: "ChargeFee_Amount",
                table: "BusinessTransactions",
                type: "decimal(18, 2)",
                nullable: false,
                defaultValue: 0m);

            migrationBuilder.AddColumn<int>(
                name: "ChargeFee_Currency",
                table: "BusinessTransactions",
                type: "int",
                nullable: false,
                defaultValue: 0);
        }

        protected override void Down(MigrationBuilder migrationBuilder)
        {
            migrationBuilder.DropColumn(
                name: "ChargeFee_Amount",
                table: "BusinessTransactions");

            migrationBuilder.DropColumn(
                name: "ChargeFee_Currency",
                table: "BusinessTransactions");
        }
    }

Is it save thing to do? I've tried to never touch code-generated migrations before.

4. There's a strange thing in the snapshot that I've spotted: for one field BusinessTransactionId isn't nullable, and for others it is:

                        b.OwnsOne("efc_minimal_testcase.MoneyAmount", "AmountCharged", b1 =>
                        {
                            b1.Property<int>("BusinessTransactionId");

and

                        b.OwnsOne("efc_minimal_testcase.MoneyAmount", "ChargeFee", b1 =>
                        {
                            b1.Property<int?>("BusinessTransactionId");

[bricelam]

I suspect this was fixed by #9469. I'll confirm before closing.

[bricelam]

Negative. This was not fixed by that change.

[bricelam]

For properties on owned types we probably just need to include the navigation property when pairing up old and new properties.