add entityType comment

Add test and fix test
dotnet · Jul 12, 2019 · 93d6298 · 93d6298
1 parent 1dbdc87
commit 93d6298
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/EFCore.Design/Scaffolding/Internal/CSharpDbContextGenerator.cs b/src/EFCore.Design/Scaffolding/Internal/CSharpDbContextGenerator.cs
@@ -357,6 +357,7 @@ private void GenerateEntityType(IEntityType entityType, bool useDataAnnotations)
             var annotations = entityType.GetAnnotations().ToList();
             RemoveAnnotation(ref annotations, CoreAnnotationNames.ConstructorBinding);
             RemoveAnnotation(ref annotations, RelationalAnnotationNames.TableName);
+            RemoveAnnotation(ref annotations, RelationalAnnotationNames.Comment);
             RemoveAnnotation(ref annotations, RelationalAnnotationNames.Schema);
             RemoveAnnotation(ref annotations, ScaffoldingAnnotationNames.DbSetName);
 
@@ -388,6 +389,13 @@ private void GenerateEntityType(IEntityType entityType, bool useDataAnnotations)
 
             lines.AddRange(GenerateAnnotations(annotations.Except(annotationsToRemove)));
 
+            if (entityType.GetComment() != null)
+            {
+                lines.Add(
+                    $".{nameof(RelationalPropertyBuilderExtensions.HasComment)}" +
+                    $"({_code.Literal(entityType.GetComment())})");
+            }
+
             AppendMultiLineFluentApi(entityType, lines);
 
             foreach (var index in entityType.GetIndexes())

diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpDbContextGeneratorTest.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpDbContextGeneratorTest.cs
@@ -159,13 +159,32 @@ public void Comments_use_fluent_api()
                     }),
                 new ModelCodeGenerationOptions(),
                 code => Assert.Contains(
-                    ".HasColumn(\"An int property\")",
+                    ".HasComment(\"An int property\")",
                     code.ContextFile.Code),
                 model => Assert.Equal(
                     "An int property",
                     model.FindEntityType("Entity").GetProperty("Property").GetComment()));
         }
 
+        [Fact]
+        public void Entity_comments_use_fluent_api()
+        {
+            Test(
+                modelBuilder => modelBuilder.Entity(
+                    "Entity",
+                    x =>
+                    {
+                        x.HasComment("An entity comment");
+                    }),
+                new ModelCodeGenerationOptions(),
+                code => Assert.Contains(
+                    ".HasComment(\"An entity comment\")",
+                    code.ContextFile.Code),
+                model => Assert.Equal(
+                    "An entity comment",
+                    model.FindEntityType("Entity").GetComment()));
+        }
+
         private class TestCodeGeneratorPlugin : ProviderCodeGeneratorPlugin
         {
             public override MethodCallCodeFragment GenerateProviderOptions()