huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 https://github.com/aspnet/EntityFrameworkCore/pull/16024 which (I really hope!)fixes the other failures once it makes it here.
This commit is contained in:
Arthur Vickers 2019-06-10 14:28:28 -07:00
parent ecd709eb9a
commit 4d1262c39b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Middleware/Diagnostics.EntityFrameworkCore/src/DatabaseErrorPageMiddleware.cs
View File

@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
if (databaseExists) if (databaseExists)
{ {
// Also check if the database is completely empty - see https://github.com/aspnet/EntityFrameworkCore/issues/15997 // 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>(); var migrationsAssembly = context.GetService<IMigrationsAssembly>();

2
src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/TestModels/BloggingContextWithMigrations.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
{ {
builder.Entity("Blogging.Models.Blog", b => builder.Entity("Blogging.Models.Blog", b =>
{ {
b.Property<int>("BlogId"); b.Property<int>("BlogId").ValueGeneratedOnAdd();
b.Property<string>("Name"); b.Property<string>("Name");
b.HasKey("BlogId"); b.HasKey("BlogId");
}); });