Fix scaffolding NRT issues

That only surface in preview versions of VS. Fixes dotnet#19496
svengeance · Jan 15, 2020 · 3e8f4e2 · 3e8f4e2
1 parent d34b02c
commit 3e8f4e2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/EFCore.Relational/Scaffolding/Metadata/DatabasePrimaryKey.cs b/src/EFCore.Relational/Scaffolding/Metadata/DatabasePrimaryKey.cs
@@ -14,7 +14,7 @@ namespace Microsoft.EntityFrameworkCore.Scaffolding.Metadata
     /// </summary>
     public class DatabasePrimaryKey : Annotatable
     {
-        public DatabasePrimaryKey([NotNull] DatabaseTable table, [NotNull] string name)
+        public DatabasePrimaryKey([NotNull] DatabaseTable table, [CanBeNull] string? name)
         {
             Table = table;
             Name = name;
@@ -29,7 +29,7 @@ public DatabasePrimaryKey([NotNull] DatabaseTable table, [NotNull] string name)
         /// <summary>
         ///     The name of the primary key.
         /// </summary>
-        public virtual string Name { get; [param: NotNull] set; }
+        public virtual string? Name { get; [param: CanBeNull] set; }
 
         /// <summary>
         ///     The ordered list of columns that make up the primary key.

diff --git a/src/EFCore.SqlServer/Scaffolding/Internal/SqlDataReaderExtension.cs b/src/EFCore.SqlServer/Scaffolding/Internal/SqlDataReaderExtension.cs
@@ -5,6 +5,8 @@
 using System.Diagnostics.CodeAnalysis;
 using JB = JetBrains.Annotations;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.SqlServer.Scaffolding.Internal
 {
     /// <summary>

diff --git a/src/EFCore.SqlServer/Scaffolding/Internal/SqlServerDatabaseModelFactory.cs b/src/EFCore.SqlServer/Scaffolding/Internal/SqlServerDatabaseModelFactory.cs
@@ -606,7 +606,7 @@ UNION ALL
             var tableColumnGroups = reader.Cast<DbDataRecord>()
                 .GroupBy(
                     ddr => (tableSchema: ddr.GetValueOrDefault<string>("table_schema"),
-                        tableName: ddr.GetValueOrDefault<string>("table_name")));
+                        tableName: ddr.GetFieldValue<string>("table_name")));
 
             foreach (var tableColumnGroup in tableColumnGroups)
             {
@@ -830,7 +830,7 @@ FROM [sys].[indexes] i
             var tableIndexGroups = reader.Cast<DbDataRecord>()
                 .GroupBy(
                     ddr => (tableSchema: ddr.GetValueOrDefault<string>("table_schema"),
-                        tableName: ddr.GetValueOrDefault<string>("table_name")));
+                        tableName: ddr.GetFieldValue<string>("table_name")));
 
             foreach (var tableIndexGroup in tableIndexGroups)
             {
@@ -976,7 +976,7 @@ FROM [sys].[foreign_keys] AS [f]
             var tableForeignKeyGroups = reader.Cast<DbDataRecord>()
                 .GroupBy(
                     ddr => (tableSchema: ddr.GetValueOrDefault<string>("table_schema"),
-                        tableName: ddr.GetValueOrDefault<string>("table_name")));
+                        tableName: ddr.GetFieldValue<string>("table_name")));
 
             foreach (var tableForeignKeyGroup in tableForeignKeyGroups)
             {
@@ -989,7 +989,7 @@ FROM [sys].[foreign_keys] AS [f]
                     .GroupBy(
                         c => (Name: c.GetValueOrDefault<string>("name"),
                             PrincipalTableSchema: c.GetValueOrDefault<string>("principal_table_schema"),
-                            PrincipalTableName: c.GetValueOrDefault<string>("principal_table_name"),
+                            PrincipalTableName: c.GetFieldValue<string>("principal_table_name"),
                             OnDeleteAction: c.GetValueOrDefault<string>("delete_referential_action_desc")));
 
                 foreach (var foreignKeyGroup in foreignKeyGroups)
@@ -1108,7 +1108,7 @@ FROM sys.databases
             return result != null ? Convert.ToByte(result) : (byte)0;
         }
 
-        private static string DisplayName(string? schema, string? name)
+        private static string DisplayName(string? schema, string name)
             => (!string.IsNullOrEmpty(schema) ? schema + "." : "") + name;
 
         private static ReferentialAction? ConvertToReferentialAction(string? onDeleteAction)