Merge in 'release/7.0' changes

dotnet · Jan 13, 2023 · 01a74cc · 01a74cc
2 parents 32bfe8b + 00e218a
commit 01a74cc
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 1 deletion.
diff --git a/src/EFCore.Relational/Metadata/Internal/ForeignKeyConstraintComparer.cs b/src/EFCore.Relational/Metadata/Internal/ForeignKeyConstraintComparer.cs
@@ -12,6 +12,9 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Internal;
 // Sealed for perf
 public sealed class ForeignKeyConstraintComparer : IEqualityComparer<IForeignKeyConstraint>, IComparer<IForeignKeyConstraint>
 {
+    private static readonly bool QuirkEnabled29741
+        = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue29741", out var enabled) && enabled;
+
     private ForeignKeyConstraintComparer()
     {
     }
@@ -66,7 +69,24 @@ public int Compare(IForeignKeyConstraint? x, IForeignKeyConstraint? y)
         }
 
         result = StringComparer.Ordinal.Compare(x.PrincipalTable.Name, y.PrincipalTable.Name);
-        return result != 0 ? result : StringComparer.Ordinal.Compare(x.Table.Name, y.Table.Name);
+        if (result != 0)
+        {
+            return result;
+        }
+
+        result = StringComparer.Ordinal.Compare(x.Table.Name, y.Table.Name);
+        if (result != 0 || QuirkEnabled29741)
+        {
+            return result;
+        }
+
+        result = StringComparer.Ordinal.Compare(x.PrincipalTable.Schema, y.PrincipalTable.Schema);
+        if (result != 0)
+        {
+            return result;
+        }
+
+        return result != 0 ? result : StringComparer.Ordinal.Compare(x.Table.Schema, y.Table.Schema);
     }
 
     /// <summary>

diff --git a/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs b/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs
@@ -2921,6 +2921,31 @@ public void Can_use_relational_model_with_keyless_TPH()
             Assert.True(specialtyColumn.IsNullable);
         }
 
+        [ConditionalFact]
+        public void Can_use_relational_model_with_tables_in_different_schemas()
+        {
+            var modelBuilder = CreateConventionModelBuilder();
+
+            modelBuilder.Ignore<Order>();
+            modelBuilder.Entity<OrderDetails>(
+                cb =>
+                {
+                    cb.HasKey(b => b.OrderId);
+                    cb.OwnsOne(d => d.BillingAddress, a => a.ToTable("Details", "Billing"));
+                    cb.OwnsOne(d => d.ShippingAddress, a => a.ToTable("Details", "Shipping"));
+                    cb.OwnsOne(d => d.DateDetails, a => a.ToTable("Details", "Date"));
+                });
+
+            var model = Finalize(modelBuilder);
+
+            Assert.Equal(4, model.Model.GetEntityTypes().Count());
+            Assert.Empty(model.Views);
+
+            var orderDetails = model.Model.FindEntityType(typeof(OrderDetails));
+            var orderDetailsTable = orderDetails.GetTableMappings().Single().Table;
+            Assert.Equal(3, orderDetailsTable.ReferencingForeignKeyConstraints.Count());
+        }
+
         [ConditionalFact]
         public void Can_use_relational_model_with_SQL_queries()
         {