Use default schema for view mappings

Fixes #23274
dotnet · Nov 12, 2020 · fe4f5e6 · fe4f5e6
1 parent 292a292
commit fe4f5e6
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 4 deletions.
diff --git a/src/EFCore.Relational/Extensions/RelationalEntityTypeExtensions.cs b/src/EFCore.Relational/Extensions/RelationalEntityTypeExtensions.cs
@@ -373,7 +373,7 @@ public static string GetDefaultViewSchema([NotNull] this IEntityType entityType)
                 return ownership.PrincipalEntityType.GetViewSchema();
             }
 
-            return null;
+            return GetViewName(entityType) != null ? entityType.Model.GetDefaultSchema() : null;
         }
 
         /// <summary>

diff --git a/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpDbContextGeneratorTest.cs b/test/EFCore.Design.Tests/Scaffolding/Internal/CSharpDbContextGeneratorTest.cs
@@ -239,9 +239,16 @@ public void Views_work()
             Test(
                 modelBuilder => modelBuilder.Entity("Vista").ToView("Vista"),
                 new ModelCodeGenerationOptions { UseDataAnnotations = true },
-                code => Assert.Contains(".ToView(\"Vista\")", code.ContextFile.Code),
-                model => Assert.NotNull(
-                    model.FindEntityType("TestNamespace.Vista").FindAnnotation(RelationalAnnotationNames.ViewDefinitionSql)));
+                code => Assert.Contains("entity.ToView(\"Vista\");", code.ContextFile.Code),
+                model => {
+                    var entityType = model.FindEntityType("TestNamespace.Vista");
+
+                    Assert.NotNull(entityType.FindAnnotation(RelationalAnnotationNames.ViewDefinitionSql));
+                    Assert.Equal("Vista", entityType.GetViewName());
+                    Assert.Null(entityType.GetViewSchema());
+                    Assert.Null(entityType.GetTableName());
+                    Assert.Null(entityType.GetSchema());
+                });
         }
 
         [ConditionalFact]

diff --git a/test/EFCore.Relational.Tests/Metadata/RelationalMetadataExtensionsTest.cs b/test/EFCore.Relational.Tests/Metadata/RelationalMetadataExtensionsTest.cs
@@ -159,6 +159,42 @@ public void Gets_model_schema_if_schema_on_entity_type_not_set()
             Assert.Null(entityType.GetSchema());
         }
 
+        [ConditionalFact]
+        public void Can_get_and_set_view_schema_name_on_entity_type()
+        {
+            var modelBuilder = new ModelBuilder();
+
+            var entityType = modelBuilder
+                .Entity<Customer>()
+                .Metadata;
+
+            Assert.Null(entityType.GetViewSchema());
+
+            modelBuilder.HasDefaultSchema("dbo");
+
+            Assert.Null(entityType.GetViewSchema());
+
+            entityType.SetViewName("CustomerView");
+
+            Assert.Equal("dbo", entityType.GetViewSchema());
+
+            entityType.SetViewSchema(null);
+
+            Assert.Equal("dbo", entityType.GetViewSchema());
+
+            entityType.SetViewSchema("db0");
+
+            Assert.Equal("db0", entityType.GetViewSchema());
+
+            entityType.SetViewName(null);
+
+            Assert.Equal("db0", entityType.GetViewSchema());
+
+            entityType.SetViewSchema(null);
+
+            Assert.Null(entityType.GetViewSchema());
+        }
+
         [ConditionalFact]
         public void Can_get_and_set_column_type()
         {