Skip to content

Commit

Permalink
Fix test break due to conflicting merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
ajcvickers committed Feb 14, 2023
1 parent 77aac27 commit fa5d54d
Showing 1 changed file with 9 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,9 @@ partial class Snapshot : ModelSnapshot
protected override void BuildModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("Relational:MaxIdentifierLength", 128);
modelBuilder
.HasDefaultSchema("DefaultSchema")
.HasAnnotation("Relational:MaxIdentifierLength", 128);

SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);

Expand All @@ -820,15 +822,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.HasIndex("PetsId");

b.ToTable("HumanPet");
b.ToTable("HumanPet", "DefaultSchema");
});

modelBuilder.Entity("Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Animal", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasDefaultValueSql("NEXT VALUE FOR [AnimalSequence]");
.HasDefaultValueSql("NEXT VALUE FOR [DefaultSchema].[AnimalSequence]");

SqlServerPropertyBuilderExtensions.UseSequence(b.Property<int>("Id"));

Expand All @@ -851,7 +853,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.HasIndex("FavoriteAnimalId");

b.ToTable("Human");
b.ToTable("Human", "DefaultSchema");
});

modelBuilder.Entity("Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Pet", b =>
Expand All @@ -871,7 +873,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Property<string>("EducationLevel")
.HasColumnType("nvarchar(max)");

b.ToTable("Cat");
b.ToTable("Cat", "DefaultSchema");
});

modelBuilder.Entity("Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Dog", b =>
Expand All @@ -881,7 +883,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Property<string>("FavoriteToy")
.HasColumnType("nvarchar(max)");

b.ToTable("Dog");
b.ToTable("Dog", "DefaultSchema");
});

modelBuilder.Entity("HumanPet", b =>
Expand Down Expand Up @@ -915,7 +917,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
""",
model =>
{
Assert.Equal(5, model.GetAnnotations().Count());
Assert.Equal(6, model.GetAnnotations().Count());
Assert.Equal(6, model.GetEntityTypes().Count());
var animalType = model.FindEntityType("Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Animal");
Expand Down

0 comments on commit fa5d54d

Please sign in to comment.