From c6b92fe16cee9cf0d0e92a721210377f85b0ea8b Mon Sep 17 00:00:00 2001 From: Arthur Vickers Date: Thu, 25 Jun 2015 16:01:25 -0700 Subject: [PATCH] React to EF changes --- src/MusicStore.Spa/Models/MusicStoreContext.cs | 13 ++++++------- src/MusicStore/Models/MusicStoreContext.cs | 16 +++++++--------- src/MusicStore/Startup.cs | 3 ++- src/MusicStore/StartupOpenIdConnect.cs | 3 ++- .../shared/Mocks/StartupOpenIdConnectTesting.cs | 3 ++- .../shared/Mocks/StartupSocialTesting.cs | 3 ++- .../MusicStore.Test/AnnouncementComponentTest.cs | 3 ++- test/MusicStore.Test/CartSummaryComponentTest.cs | 3 ++- test/MusicStore.Test/CheckoutControllerTest.cs | 3 ++- test/MusicStore.Test/GenreMenuComponentTest.cs | 3 ++- test/MusicStore.Test/HomeControllerTest.cs | 3 ++- test/MusicStore.Test/ManageControllerTest.cs | 3 ++- .../ShoppingCartControllerTest.cs | 3 ++- test/MusicStore.Test/StoreControllerTest.cs | 3 ++- 14 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/MusicStore.Spa/Models/MusicStoreContext.cs b/src/MusicStore.Spa/Models/MusicStoreContext.cs index 24f18d0bcf..d63ff692b5 100644 --- a/src/MusicStore.Spa/Models/MusicStoreContext.cs +++ b/src/MusicStore.Spa/Models/MusicStoreContext.cs @@ -14,7 +14,6 @@ namespace MusicStore.Models { public MusicStoreContext() { - } public DbSet Albums { get; set; } @@ -27,12 +26,12 @@ namespace MusicStore.Models protected override void OnModelCreating(ModelBuilder builder) { // Configure pluralization - builder.Entity().Table("Albums"); - builder.Entity().Table("Artists"); - builder.Entity().Table("Orders"); - builder.Entity().Table("Genres"); - builder.Entity().Table("CartItems"); - builder.Entity().Table("OrderDetails"); + builder.Entity().ToTable("Albums"); + builder.Entity().ToTable("Artists"); + builder.Entity().ToTable("Orders"); + builder.Entity().ToTable("Genres"); + builder.Entity().ToTable("CartItems"); + builder.Entity().ToTable("OrderDetails"); base.OnModelCreating(builder); } diff --git a/src/MusicStore/Models/MusicStoreContext.cs b/src/MusicStore/Models/MusicStoreContext.cs index a35964f43b..104bda1800 100644 --- a/src/MusicStore/Models/MusicStoreContext.cs +++ b/src/MusicStore/Models/MusicStoreContext.cs @@ -18,16 +18,14 @@ namespace MusicStore.Models protected override void OnModelCreating(ModelBuilder builder) { - builder.Entity().Key(a => a.AlbumId); - builder.Entity().Key(a => a.ArtistId); - builder.Entity().Key(o => o.OrderId); - builder.Entity().Key(g => g.GenreId); - builder.Entity().Key(c => c.CartItemId); - builder.Entity().Key(o => o.OrderDetailId); + // TODO: Remove when explicit values insertion removed. + builder.Entity() + .Property(a => a.ArtistId) + .StoreGeneratedPattern(StoreGeneratedPattern.None); - // TODO: Remove UseSequence when explicit values insertion removed. Auto generated values enabled. Default is Identity, using sequence at present to allow explicit value insertion. - builder.Entity().Property(a => a.ArtistId).ForSqlServer(b => b.UseSequence()); - builder.Entity().Property(g => g.GenreId).ForSqlServer(b => b.UseSequence()); + builder.Entity() + .Property(g => g.GenreId) + .StoreGeneratedPattern(StoreGeneratedPattern.None); //Deleting an album fails with this relation builder.Entity().Ignore(a => a.OrderDetails); diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs index 1bb41a6e55..efc09830f6 100644 --- a/src/MusicStore/Startup.cs +++ b/src/MusicStore/Startup.cs @@ -45,7 +45,8 @@ namespace MusicStore { services.AddEntityFramework() .AddInMemoryDatabase() - .AddDbContext(); + .AddDbContext(options => + options.UseInMemoryDatabase()); } else { diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs index 2fd877d3ee..29ed6d12da 100644 --- a/src/MusicStore/StartupOpenIdConnect.cs +++ b/src/MusicStore/StartupOpenIdConnect.cs @@ -57,7 +57,8 @@ namespace MusicStore { services.AddEntityFramework() .AddInMemoryDatabase() - .AddDbContext(); + .AddDbContext(options => + options.UseInMemoryDatabase()); } else { diff --git a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs index 875103ad88..28981f0943 100644 --- a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs +++ b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs @@ -49,7 +49,8 @@ namespace MusicStore { services.AddEntityFramework() .AddInMemoryDatabase() - .AddDbContext(); + .AddDbContext(options => + options.UseInMemoryDatabase()); } else { diff --git a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs index bc000f5bef..292dc236e7 100644 --- a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs +++ b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs @@ -60,7 +60,8 @@ namespace MusicStore { services.AddEntityFramework() .AddInMemoryDatabase() - .AddDbContext(); + .AddDbContext(options => + options.UseInMemoryDatabase()); } else { diff --git a/test/MusicStore.Test/AnnouncementComponentTest.cs b/test/MusicStore.Test/AnnouncementComponentTest.cs index 5081e93a9c..2a8556a723 100644 --- a/test/MusicStore.Test/AnnouncementComponentTest.cs +++ b/test/MusicStore.Test/AnnouncementComponentTest.cs @@ -20,7 +20,8 @@ namespace MusicStore.Components services.AddEntityFramework() .AddInMemoryDatabase() - .AddDbContext(); + .AddDbContext(options => + options.UseInMemoryDatabase()); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/CartSummaryComponentTest.cs b/test/MusicStore.Test/CartSummaryComponentTest.cs index fdc59249e5..f64983ad19 100644 --- a/test/MusicStore.Test/CartSummaryComponentTest.cs +++ b/test/MusicStore.Test/CartSummaryComponentTest.cs @@ -25,7 +25,8 @@ namespace MusicStore.Components services.AddEntityFramework() .AddInMemoryDatabase() - .AddDbContext(); + .AddDbContext(options => + options.UseInMemoryDatabase()); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/CheckoutControllerTest.cs b/test/MusicStore.Test/CheckoutControllerTest.cs index 8003f86104..d05c0e5052 100644 --- a/test/MusicStore.Test/CheckoutControllerTest.cs +++ b/test/MusicStore.Test/CheckoutControllerTest.cs @@ -28,7 +28,8 @@ namespace MusicStore.Controllers services.AddEntityFramework() .AddInMemoryDatabase() - .AddDbContext(); + .AddDbContext(options => + options.UseInMemoryDatabase()); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/GenreMenuComponentTest.cs b/test/MusicStore.Test/GenreMenuComponentTest.cs index 42ca3a6ad1..7a6378a698 100644 --- a/test/MusicStore.Test/GenreMenuComponentTest.cs +++ b/test/MusicStore.Test/GenreMenuComponentTest.cs @@ -18,7 +18,8 @@ namespace MusicStore.Components var services = new ServiceCollection(); services.AddEntityFramework() .AddInMemoryDatabase() - .AddDbContext(); + .AddDbContext(options => + options.UseInMemoryDatabase());); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/HomeControllerTest.cs b/test/MusicStore.Test/HomeControllerTest.cs index b6765dabc5..669dc0d55f 100644 --- a/test/MusicStore.Test/HomeControllerTest.cs +++ b/test/MusicStore.Test/HomeControllerTest.cs @@ -21,7 +21,8 @@ namespace MusicStore.Controllers services.AddEntityFramework() .AddInMemoryDatabase() - .AddDbContext(); + .AddDbContext(options => + options.UseInMemoryDatabase());); _serviceProvider = services.BuildServiceProvider(); } diff --git a/test/MusicStore.Test/ManageControllerTest.cs b/test/MusicStore.Test/ManageControllerTest.cs index cdbf8e30db..ad6fa6b6d9 100644 --- a/test/MusicStore.Test/ManageControllerTest.cs +++ b/test/MusicStore.Test/ManageControllerTest.cs @@ -24,7 +24,8 @@ namespace MusicStore.Controllers var services = new ServiceCollection(); services.AddEntityFramework() .AddInMemoryDatabase() - .AddDbContext(); + .AddDbContext(options => + options.UseInMemoryDatabase());); services.AddIdentity() .AddEntityFrameworkStores(); diff --git a/test/MusicStore.Test/ShoppingCartControllerTest.cs b/test/MusicStore.Test/ShoppingCartControllerTest.cs index 6395c46888..abe1ed7625 100644 --- a/test/MusicStore.Test/ShoppingCartControllerTest.cs +++ b/test/MusicStore.Test/ShoppingCartControllerTest.cs @@ -29,7 +29,8 @@ namespace MusicStore.Controllers services.AddEntityFramework() .AddInMemoryDatabase() - .AddDbContext(); + .AddDbContext(options => + options.UseInMemoryDatabase());); services.AddMvc(); diff --git a/test/MusicStore.Test/StoreControllerTest.cs b/test/MusicStore.Test/StoreControllerTest.cs index 107c6b18e8..2ef466f77d 100644 --- a/test/MusicStore.Test/StoreControllerTest.cs +++ b/test/MusicStore.Test/StoreControllerTest.cs @@ -21,7 +21,8 @@ namespace MusicStore.Controllers services.AddEntityFramework() .AddInMemoryDatabase() - .AddDbContext(); + .AddDbContext(options => + options.UseInMemoryDatabase());); _serviceProvider = services.BuildServiceProvider(); }