Small fixes for DatabaseErrorPageMiddleware

The main change here is to also allow public `HasTables` to be found. This will be removed once we get the new EF merged. The change to the migration makes it align with what we would generate, but I don't think has any functional impact on the tests. See also dotnet/efcore#16024 which (I really hope!)fixes the other failures once it makes it here.
dotnet · Jun 10, 2019 · 4d1262c · 4d1262c
1 parent ecd709e
commit 4d1262c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseErrorPageMiddleware.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseErrorPageMiddleware.cs
@@ -135,7 +135,7 @@ public virtual async Task Invoke(HttpContext httpContext)
                                 if (databaseExists)
                                 {
                                     // Also check if the database is completely empty - see https://github.com/aspnet/EntityFrameworkCore/issues/15997
-                                    databaseExists = (bool)typeof(RelationalDatabaseCreator).GetMethod("HasTables", BindingFlags.Instance | BindingFlags.NonPublic).Invoke(relationalDatabaseCreator, null);
+                                    databaseExists = (bool)typeof(RelationalDatabaseCreator).GetMethod("HasTables", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public).Invoke(relationalDatabaseCreator, null);
                                 }
 
                                 var migrationsAssembly = context.GetService<IMigrationsAssembly>();

diff --git a/...tics.EntityFrameworkCore/test/FunctionalTests/TestModels/BloggingContextWithMigrations.cs b/...tics.EntityFrameworkCore/test/FunctionalTests/TestModels/BloggingContextWithMigrations.cs
@@ -28,7 +28,7 @@ protected override void BuildModel(ModelBuilder builder)
             {
                 builder.Entity("Blogging.Models.Blog", b =>
                 {
-                    b.Property<int>("BlogId");
+                    b.Property<int>("BlogId").ValueGeneratedOnAdd();
                     b.Property<string>("Name");
                     b.HasKey("BlogId");
                 });