Skip to content

Commit fa5d54d

Browse files
committed
Fix test break due to conflicting merge.
1 parent 77aac27 commit fa5d54d

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

‎test/EFCore.Design.Tests/Migrations/ModelSnapshotSqlServerTest.cs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,9 @@ partial class Snapshot : ModelSnapshot
802802
protected override void BuildModel(ModelBuilder modelBuilder)
803803
{
804804
#pragma warning disable 612, 618
805-
modelBuilder.HasAnnotation("Relational:MaxIdentifierLength", 128);
805+
modelBuilder
806+
.HasDefaultSchema("DefaultSchema")
807+
.HasAnnotation("Relational:MaxIdentifierLength", 128);
806808
807809
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
808810
@@ -820,15 +822,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
820822
821823
b.HasIndex("PetsId");
822824
823-
b.ToTable("HumanPet");
825+
b.ToTable("HumanPet", "DefaultSchema");
824826
});
825827
826828
modelBuilder.Entity("Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Animal", b =>
827829
{
828830
b.Property<int>("Id")
829831
.ValueGeneratedOnAdd()
830832
.HasColumnType("int")
831-
.HasDefaultValueSql("NEXT VALUE FOR [AnimalSequence]");
833+
.HasDefaultValueSql("NEXT VALUE FOR [DefaultSchema].[AnimalSequence]");
832834
833835
SqlServerPropertyBuilderExtensions.UseSequence(b.Property<int>("Id"));
834836
@@ -851,7 +853,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
851853
852854
b.HasIndex("FavoriteAnimalId");
853855
854-
b.ToTable("Human");
856+
b.ToTable("Human", "DefaultSchema");
855857
});
856858
857859
modelBuilder.Entity("Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Pet", b =>
@@ -871,7 +873,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
871873
b.Property<string>("EducationLevel")
872874
.HasColumnType("nvarchar(max)");
873875
874-
b.ToTable("Cat");
876+
b.ToTable("Cat", "DefaultSchema");
875877
});
876878
877879
modelBuilder.Entity("Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Dog", b =>
@@ -881,7 +883,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
881883
b.Property<string>("FavoriteToy")
882884
.HasColumnType("nvarchar(max)");
883885
884-
b.ToTable("Dog");
886+
b.ToTable("Dog", "DefaultSchema");
885887
});
886888
887889
modelBuilder.Entity("HumanPet", b =>
@@ -915,7 +917,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
915917
""",
916918
model =>
917919
{
918-
Assert.Equal(5, model.GetAnnotations().Count());
920+
Assert.Equal(6, model.GetAnnotations().Count());
919921
Assert.Equal(6, model.GetEntityTypes().Count());
920922

921923
var animalType = model.FindEntityType("Microsoft.EntityFrameworkCore.Migrations.ModelSnapshotSqlServerTest+Animal");

0 commit comments

Comments
 (0)