Filter out indexer navigations when sorting columns

Fixes #27504

Author: AndriySvyryd

src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs

@@ -16,6 +16,9 @@ namespace Microsoft.EntityFrameworkCore.Migrations.Internal;
 /// </summary>
 public class MigrationsModelDiffer : IMigrationsModelDiffer
 {
+    private static readonly bool QuirkEnabled27504
+        = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue27504", out var enabled) && enabled;
+
     private static readonly Type[] DropOperationTypes =
     {
         typeof(DropIndexOperation),
@@ -784,7 +787,9 @@ private static IEnumerable<IProperty> GetSortedProperties(IEntityType entityType
 
                 var linkingNavigationProperty = linkingForeignKey.PrincipalToDependent?.PropertyInfo;
                 var properties = GetSortedProperties(linkingForeignKey.DeclaringEntityType, table).ToList();
-                if (linkingNavigationProperty == null)
+                if (linkingNavigationProperty == null
+                    || (linkingForeignKey.PrincipalToDependent!.IsIndexerProperty()
+                        && !QuirkEnabled27504))
                 {
                     leastPriorityProperties.AddRange(properties);
 

test/EFCore.Relational.Tests/Migrations/Internal/MigrationsModelDifferTest.cs

@@ -1459,6 +1459,37 @@ public void Can_add_tables_with_entity_splitting_with_seed_data()
                     Assert.Equal("Animal", m.Name);
                 }));
 
+    [ConditionalFact]
+    public void Add_owned_types()
+        => Execute(
+            _ => { },
+            _ => { },
+            modelBuilder =>
+            {
+                modelBuilder.Entity(
+                    "Order",
+                    x =>
+                    {
+                        x.Property<int>("Id");
+                        x.OwnsOne("Address", "ShippingAddress");
+                        x.OwnsOne("Address", "BillingAddress");
+                    });
+            },
+            upOps => Assert.Collection(
+                upOps,
+                o =>
+                {
+                    var m = Assert.IsType<CreateTableOperation>(o);
+                    Assert.Equal("Order", m.Name);
+                }),
+            downOps => Assert.Collection(
+                downOps,
+                o =>
+                {
+                    var m = Assert.IsType<DropTableOperation>(o);
+                    Assert.Equal("Order", m.Name);
+                }));
+
     [ConditionalFact]
     public void Add_owned_type_with_seed_data()
         => Execute(

test/EFCore.SqlServer.FunctionalTests/Migrations/MigrationsSqlServerTest.cs

@@ -8883,13 +8883,13 @@ CONSTRAINT [PK_Entity_NestedCollection] PRIMARY KEY ([OwnedEntityId], [Id]),
     CONSTRAINT [FK_Entity_NestedCollection_Entity_OwnedEntityId] FOREIGN KEY ([OwnedEntityId]) REFERENCES [Entity] ([Id]) ON DELETE CASCADE
 );
 """,
-            //
+//
 """
 CREATE TABLE [Entity_OwnedCollection] (
     [EntityId] int NOT NULL,
     [Id] int NOT NULL IDENTITY,
-    [NestedReference2_Number3] int NULL,
     [Date2] datetime2 NOT NULL,
+    [NestedReference2_Number3] int NULL,
     CONSTRAINT [PK_Entity_OwnedCollection] PRIMARY KEY ([EntityId], [Id]),
     CONSTRAINT [FK_Entity_OwnedCollection_Entity_EntityId] FOREIGN KEY ([EntityId]) REFERENCES [Entity] ([Id]) ON DELETE CASCADE
 );