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

React to EF changes

This commit is contained in:
Arthur Vickers 2015-06-25 16:01:25 -07:00
parent 88288ae9d3
commit c6b92fe16c
14 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/MusicStore.Spa/Models/MusicStoreContext.cs
View File

@ -14,7 +14,6 @@ namespace MusicStore.Models
{ {
public MusicStoreContext() public MusicStoreContext()
{ {
} }
public DbSet<Album> Albums { get; set; } public DbSet<Album> Albums { get; set; }
@ -27,12 +26,12 @@ namespace MusicStore.Models
protected override void OnModelCreating(ModelBuilder builder) protected override void OnModelCreating(ModelBuilder builder)
{ {
// Configure pluralization // Configure pluralization
builder.Entity<Album>().Table("Albums"); builder.Entity<Album>().ToTable("Albums");
builder.Entity<Artist>().Table("Artists"); builder.Entity<Artist>().ToTable("Artists");
builder.Entity<Order>().Table("Orders"); builder.Entity<Order>().ToTable("Orders");
builder.Entity<Genre>().Table("Genres"); builder.Entity<Genre>().ToTable("Genres");
builder.Entity<CartItem>().Table("CartItems"); builder.Entity<CartItem>().ToTable("CartItems");
builder.Entity<OrderDetail>().Table("OrderDetails"); builder.Entity<OrderDetail>().ToTable("OrderDetails");
base.OnModelCreating(builder); base.OnModelCreating(builder);
} }

16
src/MusicStore/Models/MusicStoreContext.cs
View File

@ -18,16 +18,14 @@ namespace MusicStore.Models
protected override void OnModelCreating(ModelBuilder builder) protected override void OnModelCreating(ModelBuilder builder)
{ {
builder.Entity<Album>().Key(a => a.AlbumId); // TODO: Remove when explicit values insertion removed.
builder.Entity<Artist>().Key(a => a.ArtistId); builder.Entity<Artist>()
builder.Entity<Order>().Key(o => o.OrderId); .Property(a => a.ArtistId)
builder.Entity<Genre>().Key(g => g.GenreId); .StoreGeneratedPattern(StoreGeneratedPattern.None);
builder.Entity<CartItem>().Key(c => c.CartItemId);
builder.Entity<OrderDetail>().Key(o => o.OrderDetailId);
// 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<Genre>()
builder.Entity<Artist>().Property(a => a.ArtistId).ForSqlServer(b => b.UseSequence()); .Property(g => g.GenreId)
builder.Entity<Genre>().Property(g => g.GenreId).ForSqlServer(b => b.UseSequence()); .StoreGeneratedPattern(StoreGeneratedPattern.None);
//Deleting an album fails with this relation //Deleting an album fails with this relation
builder.Entity<Album>().Ignore(a => a.OrderDetails); builder.Entity<Album>().Ignore(a => a.OrderDetails);

3
src/MusicStore/Startup.cs
View File

@ -45,7 +45,8 @@ namespace MusicStore
{ {
services.AddEntityFramework() services.AddEntityFramework()
.AddInMemoryDatabase() .AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(); .AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase());
} }
else else
{ {

3
src/MusicStore/StartupOpenIdConnect.cs
View File

@ -57,7 +57,8 @@ namespace MusicStore
{ {
services.AddEntityFramework() services.AddEntityFramework()
.AddInMemoryDatabase() .AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(); .AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase());
} }
else else
{ {

3
test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs
View File

@ -49,7 +49,8 @@ namespace MusicStore
{ {
services.AddEntityFramework() services.AddEntityFramework()
.AddInMemoryDatabase() .AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(); .AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase());
} }
else else
{ {

3
test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs
View File

@ -60,7 +60,8 @@ namespace MusicStore
{ {
services.AddEntityFramework() services.AddEntityFramework()
.AddInMemoryDatabase() .AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(); .AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase());
} }
else else
{ {

3
test/MusicStore.Test/AnnouncementComponentTest.cs
View File

@ -20,7 +20,8 @@ namespace MusicStore.Components
services.AddEntityFramework() services.AddEntityFramework()
.AddInMemoryDatabase() .AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(); .AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase());
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }

3
test/MusicStore.Test/CartSummaryComponentTest.cs
View File

@ -25,7 +25,8 @@ namespace MusicStore.Components
services.AddEntityFramework() services.AddEntityFramework()
.AddInMemoryDatabase() .AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(); .AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase());
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }

3
test/MusicStore.Test/CheckoutControllerTest.cs
View File

@ -28,7 +28,8 @@ namespace MusicStore.Controllers
services.AddEntityFramework() services.AddEntityFramework()
.AddInMemoryDatabase() .AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(); .AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase());
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }

3
test/MusicStore.Test/GenreMenuComponentTest.cs
View File

@ -18,7 +18,8 @@ namespace MusicStore.Components
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddEntityFramework() services.AddEntityFramework()
.AddInMemoryDatabase() .AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(); .AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase()););
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }

3
test/MusicStore.Test/HomeControllerTest.cs
View File

@ -21,7 +21,8 @@ namespace MusicStore.Controllers
services.AddEntityFramework() services.AddEntityFramework()
.AddInMemoryDatabase() .AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(); .AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase()););
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }

3
test/MusicStore.Test/ManageControllerTest.cs
View File

@ -24,7 +24,8 @@ namespace MusicStore.Controllers
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddEntityFramework() services.AddEntityFramework()
.AddInMemoryDatabase() .AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(); .AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase()););
services.AddIdentity<ApplicationUser, IdentityRole>() services.AddIdentity<ApplicationUser, IdentityRole>()
.AddEntityFrameworkStores<MusicStoreContext>(); .AddEntityFrameworkStores<MusicStoreContext>();

3
test/MusicStore.Test/ShoppingCartControllerTest.cs
View File

@ -29,7 +29,8 @@ namespace MusicStore.Controllers
services.AddEntityFramework() services.AddEntityFramework()
.AddInMemoryDatabase() .AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(); .AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase()););
services.AddMvc(); services.AddMvc();

3
test/MusicStore.Test/StoreControllerTest.cs
View File

@ -21,7 +21,8 @@ namespace MusicStore.Controllers
services.AddEntityFramework() services.AddEntityFramework()
.AddInMemoryDatabase() .AddInMemoryDatabase()
.AddDbContext<MusicStoreContext>(); .AddDbContext<MusicStoreContext>(options =>
options.UseInMemoryDatabase()););
_serviceProvider = services.BuildServiceProvider(); _serviceProvider = services.BuildServiceProvider();
} }