Throw better exception for incorrect ownership configuration. (#18484)

Fixes #13912
dotnet · Oct 21, 2019 · c480280 · c480280
1 parent ebb95a9
commit c480280
Show file tree

Hide file tree

Showing 4 changed files with 120 additions and 79 deletions.
diff --git a/src/EFCore/Metadata/Conventions/InversePropertyAttributeConvention.cs b/src/EFCore/Metadata/Conventions/InversePropertyAttributeConvention.cs
@@ -186,12 +186,12 @@ private IConventionRelationshipBuilder ConfigureInverseNavigation(
             var ownership = entityType.FindOwnership();
             if (ownership != null
                 && ownership.PrincipalEntityType == targetEntityTypeBuilder.Metadata
-                && ownership.PrincipalToDependent.GetIdentifyingMemberInfo() != inverseNavigationPropertyInfo)
+                && ownership.PrincipalToDependent?.GetIdentifyingMemberInfo() != inverseNavigationPropertyInfo)
             {
                 Dependencies.Logger.NonOwnershipInverseNavigationWarning(
                     entityType, navigationMemberInfo,
                     targetEntityTypeBuilder.Metadata, inverseNavigationPropertyInfo,
-                    ownership.PrincipalToDependent.GetIdentifyingMemberInfo());
+                    ownership.PrincipalToDependent?.GetIdentifyingMemberInfo());
                 return null;
             }
 

diff --git a/src/EFCore/Metadata/Conventions/RelationshipDiscoveryConvention.cs b/src/EFCore/Metadata/Conventions/RelationshipDiscoveryConvention.cs
@@ -120,7 +120,7 @@ private IReadOnlyList<RelationshipCandidate> FindRelationshipCandidates(IConvent
                     var targetOwnership = candidateTargetEntityType.FindOwnership();
                     if (targetOwnership != null
                         && (targetOwnership.PrincipalEntityType != entityType
-                            || targetOwnership.PrincipalToDependent.Name != navigationPropertyInfo.GetSimpleMemberName())
+                            || targetOwnership.PrincipalToDependent?.Name != navigationPropertyInfo.GetSimpleMemberName())
                         && (ownership == null
                             || ownership.PrincipalEntityType != candidateTargetEntityType))
                     {
@@ -163,7 +163,7 @@ private IReadOnlyList<RelationshipCandidate> FindRelationshipCandidates(IConvent
                                 && (candidateTargetEntityType.IsOwned()
                                     || model.FindIsOwnedConfigurationSource(targetClrType) == null)
                                 && (ownership.PrincipalEntityType != candidateTargetEntityType
-                                    || ownership.PrincipalToDependent.Name != inversePropertyInfo.GetSimpleMemberName()))
+                                    || ownership.PrincipalToDependent?.Name != inversePropertyInfo.GetSimpleMemberName()))
                             || (entityType.HasDefiningNavigation()
                                 && !candidateTargetEntityType.IsInDefinitionPath(entityType.ClrType)
                                 && (entityType.DefiningEntityType != candidateTargetEntityType

diff --git a/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs b/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs
@@ -2788,7 +2788,7 @@ public virtual InternalEntityTypeBuilder GetTargetEntityTypeBuilder(
                 if (existingOwnership != null
                     && entityType.Model.IsOwned(targetClrType)
                     && (existingOwnership.PrincipalEntityType != entityType
-                        || existingOwnership.PrincipalToDependent.Name != navigationInfo.GetSimpleMemberName()))
+                        || existingOwnership.PrincipalToDependent?.Name != navigationInfo.GetSimpleMemberName()))
                 {
                     return configurationSource.HasValue
                            && !targetClrType.Equals(Metadata.ClrType)