🐛 object is not a valid navigation

dotnet · Nov 12, 2015 · fe24548 · fe24548
1 parent 9b8ea39
commit fe24548
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 35 deletions.
diff --git a/src/EntityFramework.Core/Metadata/Internal/EntityType.cs b/src/EntityFramework.Core/Metadata/Internal/EntityType.cs
@@ -289,7 +289,7 @@ public virtual Key SetPrimaryKey(
         {
             if (_baseType != null)
             {
-                throw new InvalidOperationException(CoreStrings.DerivedEntityTypeKey(Name));
+                throw new InvalidOperationException(CoreStrings.DerivedEntityTypeKey(Name, _baseType.Name));
             }
 
             if (_primaryKey != null)
@@ -379,7 +379,7 @@ public virtual Key AddKey([NotNull] IReadOnlyList<Property> properties,
 
             if (_baseType != null)
             {
-                throw new InvalidOperationException(CoreStrings.DerivedEntityTypeKey(Name));
+                throw new InvalidOperationException(CoreStrings.DerivedEntityTypeKey(Name, _baseType.Name));
             }
 
             foreach (var property in properties)

diff --git a/src/EntityFramework.Core/Properties/CoreStrings.Designer.cs b/src/EntityFramework.Core/Properties/CoreStrings.Designer.cs
diff --git a/src/EntityFramework.Core/Properties/CoreStrings.resx b/src/EntityFramework.Core/Properties/CoreStrings.resx
@@ -361,7 +361,7 @@
     <value>The '{factory}' cannot create a value generator for property '{property}' on entity type '{entityType}'. Only integer properties are supported.</value>
   </data>
   <data name="DerivedEntityTypeKey" xml:space="preserve">
-    <value>The derived type '{derivedType}' cannot have keys other than those declared on the root type.</value>
+    <value>The derived type '{derivedType}' cannot have keys other than those declared on the root type '{rootType}'.</value>
   </data>
   <data name="CircularInheritance" xml:space="preserve">
     <value>The entity type '{entityType}' cannot inherit from '{baseEntityType}' because '{baseEntityType}' is a descendent of '{entityType}'.</value>

diff --git a/src/Shared/PropertyInfoExtensions.cs b/src/Shared/PropertyInfoExtensions.cs
@@ -31,7 +31,8 @@ public static Type FindCandidateNavigationPropertyType(this PropertyInfo propert
 
             if (isPrimitiveProperty(targetType)
                 || targetType.GetTypeInfo().IsInterface
-                || targetType.GetTypeInfo().IsValueType)
+                || targetType.GetTypeInfo().IsValueType
+                || targetType == typeof(object))
             {
                 return null;
             }

diff --git a/test/EntityFramework.Core.Tests/Metadata/Internal/EntityTypeTest.cs b/test/EntityFramework.Core.Tests/Metadata/Internal/EntityTypeTest.cs
@@ -476,10 +476,10 @@ public void Adding_keys_throws_when_there_is_a_parent_type()
             b.HasBaseType(a);
 
             Assert.Equal(
-                CoreStrings.DerivedEntityTypeKey(typeof(B).FullName),
+                CoreStrings.DerivedEntityTypeKey(typeof(B).FullName, typeof(A).FullName),
                 Assert.Throws<InvalidOperationException>(() => b.SetPrimaryKey(b.AddProperty("G"))).Message);
             Assert.Equal(
-                CoreStrings.DerivedEntityTypeKey(typeof(B).FullName),
+                CoreStrings.DerivedEntityTypeKey(typeof(B).FullName, typeof(A).FullName),
                 Assert.Throws<InvalidOperationException>(() => b.AddKey(b.AddProperty("E"))).Message);
         }
 

diff --git a/test/EntityFramework.Core.Tests/Metadata/Internal/InternalEntityTypeBuilderTest.cs b/test/EntityFramework.Core.Tests/Metadata/Internal/InternalEntityTypeBuilderTest.cs
@@ -555,7 +555,7 @@ public void Key_throws_for_derived_type()
             var derivedEntityBuilder = modelBuilder.Entity(typeof(SpecialOrder), ConfigurationSource.Convention);
             derivedEntityBuilder.HasBaseType(entityBuilder.Metadata, ConfigurationSource.Convention);
 
-            Assert.Equal(CoreStrings.DerivedEntityTypeKey(typeof(SpecialOrder).FullName),
+            Assert.Equal(CoreStrings.DerivedEntityTypeKey(typeof(SpecialOrder).FullName, typeof(Order).FullName),
                 Assert.Throws<InvalidOperationException>(() =>
                     derivedEntityBuilder.HasKey(new[] { Order.IdProperty.Name, Order.CustomerIdProperty.Name }, ConfigurationSource.DataAnnotation)).Message);
         }
@@ -764,7 +764,7 @@ public void PrimaryKey_throws_for_derived_type()
             var derivedEntityBuilder = modelBuilder.Entity(typeof(SpecialOrder), ConfigurationSource.Convention);
             derivedEntityBuilder.HasBaseType(entityBuilder.Metadata, ConfigurationSource.Convention);
 
-            Assert.Equal(CoreStrings.DerivedEntityTypeKey(typeof(SpecialOrder).FullName),
+            Assert.Equal(CoreStrings.DerivedEntityTypeKey(typeof(SpecialOrder).FullName, typeof(Order).FullName),
                 Assert.Throws<InvalidOperationException>(() =>
                     derivedEntityBuilder.PrimaryKey(new[] { Order.IdProperty.Name, Order.CustomerIdProperty.Name }, ConfigurationSource.DataAnnotation)).Message);
         }

diff --git a/...tityFramework.Core.Tests/Metadata/ModelConventions/RelationshipDiscoveryConventionTest.cs b/...tityFramework.Core.Tests/Metadata/ModelConventions/RelationshipDiscoveryConventionTest.cs
@@ -861,6 +861,8 @@ private class EntityWithNoValidNavigations
         {
             public int Id { get; set; }
 
+            public object Object { get; set; }
+
             public static OneToManyDependent Static { get; set; }
 
             public OneToManyDependent WriteOnly