Metadata: Don't override KeylessAttribute with KeyAttribute

Part of #20014
dotnet · Feb 24, 2020 · 5305551 · 5305551
1 parent aa57b4e
commit 5305551
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/EFCore/Metadata/Conventions/KeyAttributeConvention.cs b/src/EFCore/Metadata/Conventions/KeyAttributeConvention.cs
@@ -47,6 +47,14 @@ protected override void ProcessPropertyAdded(
                 return;
             }
 
+            if (entityType.IsKeyless
+                && entityType.GetIsKeylessConfigurationSource().Overrides(ConfigurationSource.DataAnnotation))
+            {
+                // TODO: Log a warning that KeyAttribute is being ignored. See issue#20014
+                // This code path will also be hit when entity is marked as Keyless explicitly
+                return;
+            }
+
             var entityTypeBuilder = entityType.Builder;
             var currentKey = entityTypeBuilder.Metadata.FindPrimaryKey();
             var properties = new List<string> { propertyBuilder.Metadata.Name };

diff --git a/src/EFCore/Metadata/IConventionEntityType.cs b/src/EFCore/Metadata/IConventionEntityType.cs
@@ -69,6 +69,12 @@ public interface IConventionEntityType : IEntityType, IConventionTypeBase
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         void HasNoKey(bool? keyless, bool fromDataAnnotation = false);
 
+        /// <summary>
+        ///     Returns the configuration source for the IsKeyless property.
+        /// </summary>
+        /// <returns> The configuration source for the IsKeyless property. </returns>
+        ConfigurationSource? GetIsKeylessConfigurationSource();
+
         /// <summary>
         ///     Sets the primary key for this entity type.
         /// </summary>

diff --git a/test/EFCore.Tests/Metadata/Conventions/EntityTypeAttributeConventionTest.cs b/test/EFCore.Tests/Metadata/Conventions/EntityTypeAttributeConventionTest.cs
@@ -126,8 +126,8 @@ public void KeyAttribute_overrides_keyless_attribute()
 
             var entityBuilder = modelBuilder.Entity<KeyClash>();
 
-            Assert.False(entityBuilder.Metadata.IsKeyless);
-            Assert.NotNull(entityBuilder.Metadata.FindPrimaryKey());
+            Assert.True(entityBuilder.Metadata.IsKeyless);
+            Assert.Null(entityBuilder.Metadata.FindPrimaryKey());
         }
 
         #endregion