More precise index scaffolding warning

Missing property is only one reason for failing to scaffold an index. Providers may override VisitIndex and return null for other reasons, in which case it's their responsibility to log a warning.
brandondahler · Dec 9, 2015 · 503095e · 503095e
1 parent af876fa
commit 503095e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/src/EntityFramework.Relational.Design/Properties/RelationalDesignStrings.Designer.cs b/src/EntityFramework.Relational.Design/Properties/RelationalDesignStrings.Designer.cs
diff --git a/src/EntityFramework.Relational.Design/Properties/RelationalDesignStrings.resx b/src/EntityFramework.Relational.Design/Properties/RelationalDesignStrings.resx
@@ -147,7 +147,7 @@
   <data name="UnableToGenerateEntityType" xml:space="preserve">
     <value>Unable to generate entity type for table '{tableName}'.</value>
   </data>
-  <data name="UnableToScaffoldIndex" xml:space="preserve">
+  <data name="UnableToScaffoldIndexMissingProperty" xml:space="preserve">
     <value>Unable to scaffold the index '{indexName}' because at least one of the properties it contains could not be scaffolded.</value>
   </data>
   <data name="MissingUseProviderMethodNameAnnotation" xml:space="preserve">

diff --git a/src/EntityFramework.Relational.Design/RelationalScaffoldingModelFactory.cs b/src/EntityFramework.Relational.Design/RelationalScaffoldingModelFactory.cs
@@ -263,12 +263,7 @@ protected virtual EntityTypeBuilder VisitIndexes([NotNull] EntityTypeBuilder bui
 
             foreach (var index in indexes)
             {
-                var indexBuilder = VisitIndex(builder, index);
-
-                if (indexBuilder == null)
-                {
-                    Logger.LogWarning(RelationalDesignStrings.UnableToScaffoldIndex(index.Name));
-                }
+                VisitIndex(builder, index);
             }
 
             return builder;
@@ -283,7 +278,7 @@ protected virtual IndexBuilder VisitIndex([NotNull] EntityTypeBuilder builder, [
 
             if (properties.Count(p => builder.Metadata.FindProperty(p) != null) != properties.Length)
             {
-                // TODO log when index cannot be scaffolding because of missing columns
+                Logger.LogWarning(RelationalDesignStrings.UnableToScaffoldIndexMissingProperty(index.Name));
                 return null;
             }
 

diff --git a/...amework.MicrosoftSqlServer.Design.FunctionalTests/ReverseEngineering/SqlServerE2ETests.cs b/...amework.MicrosoftSqlServer.Design.FunctionalTests/ReverseEngineering/SqlServerE2ETests.cs
@@ -142,7 +142,7 @@ public void E2ETest_UseAttributesInsteadOfFluentApi()
                             RelationalDesignStrings.CannotFindTypeMappingForColumn("dbo.AllDataTypes.hierarchyidColumn", "hierarchyid"),
                             RelationalDesignStrings.CannotFindTypeMappingForColumn("dbo.AllDataTypes.sql_variantColumn", "sql_variant"),
                             RelationalDesignStrings.CannotFindTypeMappingForColumn("dbo.AllDataTypes.xmlColumn", "xml"),
-                            RelationalDesignStrings.UnableToScaffoldIndex("IX_UnscaffoldableIndex"),
+                            RelationalDesignStrings.UnableToScaffoldIndexMissingProperty("IX_UnscaffoldableIndex"),
                             SqlServerDesignStrings.DataTypeDoesNotAllowSqlServerIdentityStrategy("dbo.PropertyConfiguration.PropertyConfigurationID","tinyint"),
                             RelationalDesignStrings.CannotFindTypeMappingForColumn("dbo.TableWithUnmappablePrimaryKeyColumn.TableWithUnmappablePrimaryKeyColumnID", "hierarchyid"),
                             RelationalDesignStrings.PrimaryKeyErrorPropertyNotFound("dbo.TableWithUnmappablePrimaryKeyColumn"),
@@ -191,7 +191,7 @@ public void E2ETest_AllFluentApi()
                             RelationalDesignStrings.CannotFindTypeMappingForColumn("dbo.AllDataTypes.hierarchyidColumn", "hierarchyid"),
                             RelationalDesignStrings.CannotFindTypeMappingForColumn("dbo.AllDataTypes.sql_variantColumn", "sql_variant"),
                             RelationalDesignStrings.CannotFindTypeMappingForColumn("dbo.AllDataTypes.xmlColumn", "xml"),
-                            RelationalDesignStrings.UnableToScaffoldIndex("IX_UnscaffoldableIndex"),
+                            RelationalDesignStrings.UnableToScaffoldIndexMissingProperty("IX_UnscaffoldableIndex"),
                             SqlServerDesignStrings.DataTypeDoesNotAllowSqlServerIdentityStrategy("dbo.PropertyConfiguration.PropertyConfigurationID","tinyint"),
                             RelationalDesignStrings.CannotFindTypeMappingForColumn("dbo.TableWithUnmappablePrimaryKeyColumn.TableWithUnmappablePrimaryKeyColumnID", "hierarchyid"),
                             RelationalDesignStrings.PrimaryKeyErrorPropertyNotFound("dbo.TableWithUnmappablePrimaryKeyColumn"),