From e6fdb8cbd2b7348ac3f622f718eecf46e1cea08b Mon Sep 17 00:00:00 2001 From: ajcvickers Date: Tue, 25 Nov 2014 13:34:34 -0800 Subject: [PATCH] React to EF dynamic services changes --- .../DatabaseErrorPageMiddleware.cs | 5 ++--- .../DatabaseErrorPageMiddlewareTest.cs | 7 ++++--- .../MigrationsEndPointMiddlewareTest.cs | 8 +++++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs index 5ce05077a8..308d9cd8c8 100644 --- a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs +++ b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs @@ -83,9 +83,8 @@ namespace Microsoft.AspNet.Diagnostics.Entity { var databaseExists = dbContext.Database.AsRelational().Exists(); - var contextServices = ((IDbContextServices)dbContext).ScopedServiceProvider; - var services = (MigrationsDataStoreServices)contextServices.GetRequiredService().DataStoreServices; - var migrator = services.Migrator; + var databaseInternals = (IMigrationsEnabledDatabaseInternals)dbContext.Database; + var migrator = databaseInternals.Migrator; var pendingMigrations = migrator.GetPendingMigrations().Select(m => m.GetMigrationId()); diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs index 2a776fec7c..61516a7a97 100644 --- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs +++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs @@ -14,6 +14,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.TestHost; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; +using Microsoft.Data.Entity.Migrations; using Microsoft.Data.Entity.Migrations.Infrastructure; using Microsoft.Data.Entity.Utilities; using Microsoft.Framework.DependencyInjection; @@ -159,9 +160,9 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests { using (var db = context.ApplicationServices.GetService()) { - var contextServices = ((IDbContextServices)db).ScopedServiceProvider; - var services = (MigrationsDataStoreServices)contextServices.GetRequiredService().DataStoreServices; - services.Migrator.ApplyMigrations(); + var databaseInternals = (IMigrationsEnabledDatabaseInternals)db.Database; + var migrator = databaseInternals.Migrator; + migrator.ApplyMigrations(); db.Blogs.Add(new Blog()); db.SaveChanges(); diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs index 39124721bd..66fa99abc7 100644 --- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs +++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs @@ -12,6 +12,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.TestHost; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; +using Microsoft.Data.Entity.Migrations; using Microsoft.Data.Entity.Migrations.Infrastructure; using Microsoft.Data.Entity.Migrations.Utilities; using Microsoft.Data.Entity.Utilities; @@ -101,9 +102,10 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests Assert.Equal(HttpStatusCode.NoContent, response.StatusCode); Assert.True(db.Database.AsRelational().Exists()); - var contextServices = ((IDbContextServices)db).ScopedServiceProvider; - var dataStoreServices = (MigrationsDataStoreServices)contextServices.GetRequiredService().DataStoreServices; - var appliedMigrations = dataStoreServices.Migrator.GetDatabaseMigrations(); + + var databaseInternals = (IMigrationsEnabledDatabaseInternals)db.Database; + var migrator = databaseInternals.Migrator; + var appliedMigrations = migrator.GetDatabaseMigrations(); Assert.Equal(2, appliedMigrations.Count); Assert.Equal("111111111111111_MigrationOne", appliedMigrations.ElementAt(0).GetMigrationId()); Assert.Equal("222222222222222_MigrationTwo", appliedMigrations.ElementAt(1).GetMigrationId());