Throw if same name is specified for a different shared type owned ent…

…ity type (#22052) Fixes #21951
dotnet · Aug 14, 2020 · 9b11ad1 · 9b11ad1
1 parent 3160094
commit 9b11ad1
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 0 deletions.
diff --git a/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs b/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs
@@ -3204,6 +3204,18 @@ private InternalForeignKeyBuilder HasOwnership(
                             return null;
                         }
 
+                        if (targetEntityType.IsNamed
+                            && targetType != null)
+                        {
+                            if (configurationSource == ConfigurationSource.Explicit)
+                            {
+                                throw new InvalidOperationException(CoreStrings.ClashingNamedOwnedType(
+                                    targetTypeName, Metadata.DisplayName(), navigation.Name));
+                            }
+
+                            return null;
+                        }
+
                         var newOtherOwnership = otherOwnership.Builder.AddToDeclaringTypeDefinition(configurationSource);
                         if (newOtherOwnership == null)
                         {

diff --git a/src/EFCore/Properties/CoreStrings.Designer.cs b/src/EFCore/Properties/CoreStrings.Designer.cs
diff --git a/src/EFCore/Properties/CoreStrings.resx b/src/EFCore/Properties/CoreStrings.resx
@@ -1495,4 +1495,7 @@
   <data name="QueryInvalidMaterializationType" xml:space="preserve">
     <value>The query contains a final projection '{projection}' to type '{queryableType}'. Collections in the final projection must be an 'IEnumerable&lt;T&gt;' type such as 'List&lt;T&gt;'. Consider using 'ToList()' or some other mechanism to convert the 'IQueryable&lt;T&gt;' or 'IOrderedEnumerable&lt;T&gt;' into an 'IEnumerable&lt;T&gt;'.</value>
   </data>
+  <data name="ClashingNamedOwnedType" xml:space="preserve">
+    <value>There is already an entity type named '{ownedTypeName}'. Use a different name when configuring the ownership '{ownerEntityType}.{navigation}'.</value>
+  </data>
 </root>
diff --git a/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs b/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs
@@ -1549,6 +1549,24 @@ public virtual void Shared_type_can_be_used_as_owned_type()
                     t => { Assert.Equal("Shared4", t.Name); Assert.NotNull(t.FindProperty("NestedLong")); });
             }
 
+            [ConditionalFact]
+            public virtual void Shared_type_used_as_owned_type_throws_for_same_name()
+            {
+                var modelBuilder = CreateModelBuilder();
+
+                modelBuilder.Entity<OwnerOfSharedType>(
+                    b =>
+                    {
+                        b.OwnsOne("Shared1", e => e.Reference);
+                        b.OwnsOne("Shared1", e => e.Reference);
+
+                        Assert.Equal(CoreStrings.ClashingNamedOwnedType(
+                            "Shared1", nameof(OwnerOfSharedType), nameof(OwnerOfSharedType.Collection)),
+                            Assert.Throws<InvalidOperationException>(() =>
+                                b.OwnsMany("Shared1", e => e.Collection)).Message);
+                    });
+            }
+
             [ConditionalFact]
             public virtual void Cannot_add_shared_type_with_same_clr_type_as_weak_entity_type()
             {