Merge branch 'illumen-master'

Author: tonysneed

src/EntityFrameworkCore.Scaffolding.Handlebars/HbsCSharpDbContextGenerator.cs

@@ -343,8 +343,12 @@ private void InitializeEntityTypeBuilder(IEntityType entityType, IndentedStringB
 
         private string GetEntityTypeName(IEntityType entityType, string entityTypeName)
         {
+            var schema = !string.IsNullOrEmpty(entityType.GetTableName())
+                ? entityType.GetSchema()
+                : entityType.GetViewSchema();
+            
             return _options?.Value?.EnableSchemaFolders == true
-                ? $"{entityType.GetSchema()}.{entityTypeName}" : entityTypeName;
+                ? $"{schema}.{entityTypeName}" : entityTypeName;
         }
 
         private void GenerateEntityType(IEntityType entityType, bool useDataAnnotations, IndentedStringBuilder sb)

src/EntityFrameworkCore.Scaffolding.Handlebars/HbsCSharpEntityTypeGenerator.cs

@@ -139,7 +139,10 @@ public override string WriteCode(IEntityType entityType, string @namespace, bool
 
         private string GetNamespaceForEntity(IEntityType entityType, string defaultNamespace)
         {
-            return $"{defaultNamespace}.{CSharpHelper.Namespace(entityType.GetSchema())}";
+            var schema = !string.IsNullOrEmpty(entityType.GetTableName())
+                ? entityType.GetSchema()
+                : entityType.GetViewSchema();
+            return $"{defaultNamespace}.{CSharpHelper.Namespace(schema)}";
         }
 
         /// <summary>

src/EntityFrameworkCore.Scaffolding.Handlebars/HbsCSharpModelGenerator.cs

@@ -149,8 +149,11 @@ public override ScaffoldedModel GenerateModel(IModel model, ModelCodeGenerationO
                         options.UseDataAnnotations);
 
                     var transformedFileName = EntityTypeTransformationService.TransformEntityFileName(entityType.DisplayName());
+                    var schema = !string.IsNullOrEmpty(entityType.GetTableName())
+                        ? entityType.GetSchema()
+                        : entityType.GetViewSchema();
                     var entityTypeFileName = _options?.Value?.EnableSchemaFolders == true
-                        ? Path.Combine(CSharpHelper.Namespace(entityType.GetSchema()), transformedFileName + FileExtension)
+                        ? Path.Combine(CSharpHelper.Namespace(schema), transformedFileName + FileExtension)
                         : transformedFileName + FileExtension;
                     resultingFiles.AdditionalFiles.Add(
                         new ScaffoldedFile