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

Updating to reflect EF fluent API chaining change.

This commit is contained in:
ajcvickers 2014-08-04 13:27:30 -07:00
parent 626362d8a2
commit 0ae9406e5c
2 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Microsoft.AspNet.Identity.EntityFramework/IdentityDbContext.cs
View File

@ -75,13 +75,17 @@ namespace Microsoft.AspNet.Identity.EntityFramework
b.ToTable("AspNetRoles");
});
builder.Entity<IdentityUserClaim<TKey>>()
.Key(uc => uc.Id)
.ToTable("AspNetUserClaims");
builder.Entity<IdentityUserClaim<TKey>>(b =>
{
b.Key(uc => uc.Id);
b.ToTable("AspNetUserClaims");
});
builder.Entity<IdentityRoleClaim<TKey>>()
.Key(uc => uc.Id)
.ToTable("AspNetRoleClaims");
builder.Entity<IdentityRoleClaim<TKey>>(b =>
{
b.Key(uc => uc.Id);
b.ToTable("AspNetRoleClaims");
});
var userType = builder.Model.GetEntityType(typeof(TUser));
var roleType = builder.Model.GetEntityType(typeof(TRole));
@ -100,17 +104,21 @@ namespace Microsoft.AspNet.Identity.EntityFramework
var rcfk = roleClaimType.AddForeignKey(roleType.GetKey(), new[] { roleClaimType.GetProperty("RoleId") });
roleType.AddNavigation(new Navigation(rcfk, "Claims", false));
builder.Entity<IdentityUserRole<TKey>>()
.Key(r => new { r.UserId, r.RoleId })
builder.Entity<IdentityUserRole<TKey>>(b =>
{
b.Key(r => new { r.UserId, r.RoleId });
b.ToTable("AspNetUserRoles");
});
// Blocks delete currently without cascade
//.ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId))
//.ForeignKeys(fk => fk.ForeignKey<TRole>(f => f.RoleId));
.ToTable("AspNetUserRoles");
builder.Entity<IdentityUserLogin<TKey>>()
.Key(l => new { l.LoginProvider, l.ProviderKey, l.UserId })
builder.Entity<IdentityUserLogin<TKey>>(b =>
{
b.Key(l => new { l.LoginProvider, l.ProviderKey, l.UserId });
b.ToTable("AspNetUserLogins");
});
//.ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId))
.ToTable("AspNetUserLogins");
}
}
}

51
test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryContext.cs
View File

@ -54,31 +54,40 @@ namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
b.ToTable("AspNetUsers");
});
builder.Entity<TRole>()
.Key(r => r.Id)
.ToTable("AspNetRoles");
builder.Entity<TRole>(b =>
{
b.Key(r => r.Id);
b.ToTable("AspNetRoles");
});
builder.Entity<TUserRole>()
.Key(r => new { r.UserId, r.RoleId })
.ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId))
.ForeignKeys(fk => fk.ForeignKey<TRole>(f => f.RoleId))
.ToTable("AspNetUserRoles");
builder.Entity<TUserRole>(b =>
{
b.Key(r => new { r.UserId, r.RoleId });
b.ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId));
b.ForeignKeys(fk => fk.ForeignKey<TRole>(f => f.RoleId));
b.ToTable("AspNetUserRoles");
});
builder.Entity<TUserLogin>()
.Key(l => new { l.LoginProvider, l.ProviderKey, l.UserId })
.ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId))
.ToTable("AspNetUserLogins");
builder.Entity<TUserLogin>(b =>
{
b.Key(l => new { l.LoginProvider, l.ProviderKey, l.UserId });
b.ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId));
b.ToTable("AspNetUserLogins");
});
builder.Entity<TUserClaim>()
.Key(c => c.Id)
.ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId))
.ToTable("AspNetUserClaims");
builder.Entity<IdentityRoleClaim<TKey>>()
.Key(c => c.Id)
.ForeignKeys(fk => fk.ForeignKey<TRole>(f => f.RoleId))
.ToTable("AspNetRoleClaims");
builder.Entity<TUserClaim>(b =>
{
b.Key(c => c.Id);
b.ForeignKeys(fk => fk.ForeignKey<TUser>(f => f.UserId));
b.ToTable("AspNetUserClaims");
});
builder.Entity<IdentityRoleClaim<TKey>>(b =>
{
b.Key(c => c.Id);
b.ForeignKeys(fk => fk.ForeignKey<TRole>(f => f.RoleId));
b.ToTable("AspNetRoleClaims");
});
}
}
}