Skip to content

Commit 4babce3

Browse files
sjh37sjh37
committed
Update tests
1 parent 6e7ff58 commit 4babce3

File tree

3 files changed

+89
-89
lines changed

3 files changed

+89
-89
lines changed

‎Generator.Tests.Integration/TestComparison/EfrpgTest_SqlServer_Ef6_FkCurrent.cs‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ public interface IEfrpgTestDbContext : IDisposable
9191
DbSet<Issue47_User> Issue47_Users { get; set; } // Users
9292
DbSet<Issue47_UserRole> Issue47_UserRoles { get; set; } // UserRoles
9393
DbSet<MultipleKey> MultipleKeys { get; set; } // MultipleKeys
94-
DbSet<NullableReverseNavA> NullableReverseNavAs { get; set; } // NullableReverseNavA
95-
DbSet<NullableReverseNavB> NullableReverseNavBs { get; set; } // NullableReverseNavB
94+
DbSet<NullableReverseNavigationA> NullableReverseNavigationAs { get; set; } // NullableReverseNavigationA
95+
DbSet<NullableReverseNavigationB> NullableReverseNavigationBs { get; set; } // NullableReverseNavigationB
9696
DbSet<OneEightSix_Issue> OneEightSix_Issues { get; set; } // Issue
9797
DbSet<OneEightSix_UploadedFile> OneEightSix_UploadedFiles { get; set; } // UploadedFile
9898
DbSet<PeriodTable> PeriodTables { get; set; } // Period.Table
@@ -418,8 +418,8 @@ public class EfrpgTestDbContext : DbContext, IEfrpgTestDbContext
418418
public DbSet<Issue47_User> Issue47_Users { get; set; } // Users
419419
public DbSet<Issue47_UserRole> Issue47_UserRoles { get; set; } // UserRoles
420420
public DbSet<MultipleKey> MultipleKeys { get; set; } // MultipleKeys
421-
public DbSet<NullableReverseNavA> NullableReverseNavAs { get; set; } // NullableReverseNavA
422-
public DbSet<NullableReverseNavB> NullableReverseNavBs { get; set; } // NullableReverseNavB
421+
public DbSet<NullableReverseNavigationA> NullableReverseNavigationAs { get; set; } // NullableReverseNavigationA
422+
public DbSet<NullableReverseNavigationB> NullableReverseNavigationBs { get; set; } // NullableReverseNavigationB
423423
public DbSet<OneEightSix_Issue> OneEightSix_Issues { get; set; } // Issue
424424
public DbSet<OneEightSix_UploadedFile> OneEightSix_UploadedFiles { get; set; } // UploadedFile
425425
public DbSet<PeriodTable> PeriodTables { get; set; } // Period.Table
@@ -598,8 +598,8 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
598598
modelBuilder.Configurations.Add(new Issue47_UserConfiguration());
599599
modelBuilder.Configurations.Add(new Issue47_UserRoleConfiguration());
600600
modelBuilder.Configurations.Add(new MultipleKeyConfiguration());
601-
modelBuilder.Configurations.Add(new NullableReverseNavAConfiguration());
602-
modelBuilder.Configurations.Add(new NullableReverseNavBConfiguration());
601+
modelBuilder.Configurations.Add(new NullableReverseNavigationAConfiguration());
602+
modelBuilder.Configurations.Add(new NullableReverseNavigationBConfiguration());
603603
modelBuilder.Configurations.Add(new OneEightSix_IssueConfiguration());
604604
modelBuilder.Configurations.Add(new OneEightSix_UploadedFileConfiguration());
605605
modelBuilder.Configurations.Add(new PeriodTableConfiguration());
@@ -894,8 +894,8 @@ public static DbModelBuilder CreateModel(DbModelBuilder modelBuilder, string sch
894894
modelBuilder.Configurations.Add(new Issue47_UserConfiguration(schema));
895895
modelBuilder.Configurations.Add(new Issue47_UserRoleConfiguration(schema));
896896
modelBuilder.Configurations.Add(new MultipleKeyConfiguration(schema));
897-
modelBuilder.Configurations.Add(new NullableReverseNavAConfiguration(schema));
898-
modelBuilder.Configurations.Add(new NullableReverseNavBConfiguration(schema));
897+
modelBuilder.Configurations.Add(new NullableReverseNavigationAConfiguration(schema));
898+
modelBuilder.Configurations.Add(new NullableReverseNavigationBConfiguration(schema));
899899
modelBuilder.Configurations.Add(new OneEightSix_IssueConfiguration(schema));
900900
modelBuilder.Configurations.Add(new OneEightSix_UploadedFileConfiguration(schema));
901901
modelBuilder.Configurations.Add(new PeriodTableConfiguration(schema));
@@ -2543,8 +2543,8 @@ public class FakeEfrpgTestDbContext : IEfrpgTestDbContext
25432543
public DbSet<Issue47_User> Issue47_Users { get; set; } // Users
25442544
public DbSet<Issue47_UserRole> Issue47_UserRoles { get; set; } // UserRoles
25452545
public DbSet<MultipleKey> MultipleKeys { get; set; } // MultipleKeys
2546-
public DbSet<NullableReverseNavA> NullableReverseNavAs { get; set; } // NullableReverseNavA
2547-
public DbSet<NullableReverseNavB> NullableReverseNavBs { get; set; } // NullableReverseNavB
2546+
public DbSet<NullableReverseNavigationA> NullableReverseNavigationAs { get; set; } // NullableReverseNavigationA
2547+
public DbSet<NullableReverseNavigationB> NullableReverseNavigationBs { get; set; } // NullableReverseNavigationB
25482548
public DbSet<OneEightSix_Issue> OneEightSix_Issues { get; set; } // Issue
25492549
public DbSet<OneEightSix_UploadedFile> OneEightSix_UploadedFiles { get; set; } // UploadedFile
25502550
public DbSet<PeriodTable> PeriodTables { get; set; } // Period.Table
@@ -2663,8 +2663,8 @@ public FakeEfrpgTestDbContext()
26632663
Issue47_Users = new FakeDbSet<Issue47_User>("UserId");
26642664
Issue47_UserRoles = new FakeDbSet<Issue47_UserRole>("UserRoleId");
26652665
MultipleKeys = new FakeDbSet<MultipleKey>("UserId", "FavouriteColourId", "BestHolidayTypeId");
2666-
NullableReverseNavAs = new FakeDbSet<NullableReverseNavA>("Id");
2667-
NullableReverseNavBs = new FakeDbSet<NullableReverseNavB>("Id");
2666+
NullableReverseNavigationAs = new FakeDbSet<NullableReverseNavigationA>("Id");
2667+
NullableReverseNavigationBs = new FakeDbSet<NullableReverseNavigationB>("Id");
26682668
OneEightSix_Issues = new FakeDbSet<OneEightSix_Issue>("Id");
26692669
OneEightSix_UploadedFiles = new FakeDbSet<OneEightSix_UploadedFile>("Id");
26702670
PeriodTables = new FakeDbSet<PeriodTable>("Id");
@@ -4745,32 +4745,32 @@ public class NoPrimaryKey
47454745
public string Description { get; set; } // Description (length: 10)
47464746
}
47474747

4748-
// NullableReverseNavA
4749-
public class NullableReverseNavA
4748+
// NullableReverseNavigationA
4749+
public class NullableReverseNavigationA
47504750
{
47514751
public Guid Id { get; set; } // Id (Primary key)
47524752
public string Data { get; set; } // Data (length: 100)
47534753

47544754
// Reverse navigation
47554755

47564756
/// <summary>
4757-
/// Parent (One-to-One) NullableReverseNavA pointed by [NullableReverseNavB].[Id] (FK_NullableReverseNavB_A)
4757+
/// Parent (One-to-One) NullableReverseNavigationA pointed by [NullableReverseNavigationB].[Id] (FK_NullableReverseNavigationB_Id)
47584758
/// </summary>
4759-
public virtual NullableReverseNavB NullableReverseNavB { get; set; } // NullableReverseNavB.FK_NullableReverseNavB_A
4759+
public virtual NullableReverseNavigationB NullableReverseNavigationB { get; set; } // NullableReverseNavigationB.FK_NullableReverseNavigationB_Id
47604760
}
47614761

4762-
// NullableReverseNavB
4763-
public class NullableReverseNavB
4762+
// NullableReverseNavigationB
4763+
public class NullableReverseNavigationB
47644764
{
47654765
public Guid Id { get; set; } // Id (Primary key)
47664766
public string Data { get; set; } // Data (length: 100)
47674767

47684768
// Foreign keys
47694769

47704770
/// <summary>
4771-
/// Parent NullableReverseNavA pointed by [NullableReverseNavB].([Id]) (FK_NullableReverseNavB_A)
4771+
/// Parent NullableReverseNavigationA pointed by [NullableReverseNavigationB].([Id]) (FK_NullableReverseNavigationB_Id)
47724772
/// </summary>
4773-
public virtual NullableReverseNavA NullableReverseNavA { get; set; } // FK_NullableReverseNavB_A
4773+
public virtual NullableReverseNavigationA NullableReverseNavigationA { get; set; } // FK_NullableReverseNavigationB_Id
47744774
}
47754775

47764776
// The table 'Test' is not usable by entity framework because it
@@ -6775,42 +6775,42 @@ public MultipleKeyConfiguration(string schema)
67756775
}
67766776
}
67776777

6778-
// NullableReverseNavA
6779-
public class NullableReverseNavAConfiguration : EntityTypeConfiguration<NullableReverseNavA>
6778+
// NullableReverseNavigationA
6779+
public class NullableReverseNavigationAConfiguration : EntityTypeConfiguration<NullableReverseNavigationA>
67806780
{
6781-
public NullableReverseNavAConfiguration()
6781+
public NullableReverseNavigationAConfiguration()
67826782
: this("dbo")
67836783
{
67846784
}
67856785

6786-
public NullableReverseNavAConfiguration(string schema)
6786+
public NullableReverseNavigationAConfiguration(string schema)
67876787
{
6788-
ToTable("NullableReverseNavA", schema);
6788+
ToTable("NullableReverseNavigationA", schema);
67896789
HasKey(x => x.Id);
67906790

67916791
Property(x => x.Id).HasColumnName(@"Id").HasColumnType("uniqueidentifier").IsRequired().HasDatabaseGeneratedOption(DatabaseGeneratedOption.None);
67926792
Property(x => x.Data).HasColumnName(@"Data").HasColumnType("nvarchar").IsOptional().HasMaxLength(100);
67936793
}
67946794
}
67956795

6796-
// NullableReverseNavB
6797-
public class NullableReverseNavBConfiguration : EntityTypeConfiguration<NullableReverseNavB>
6796+
// NullableReverseNavigationB
6797+
public class NullableReverseNavigationBConfiguration : EntityTypeConfiguration<NullableReverseNavigationB>
67986798
{
6799-
public NullableReverseNavBConfiguration()
6799+
public NullableReverseNavigationBConfiguration()
68006800
: this("dbo")
68016801
{
68026802
}
68036803

6804-
public NullableReverseNavBConfiguration(string schema)
6804+
public NullableReverseNavigationBConfiguration(string schema)
68056805
{
6806-
ToTable("NullableReverseNavB", schema);
6806+
ToTable("NullableReverseNavigationB", schema);
68076807
HasKey(x => x.Id);
68086808

68096809
Property(x => x.Id).HasColumnName(@"Id").HasColumnType("uniqueidentifier").IsRequired().HasDatabaseGeneratedOption(DatabaseGeneratedOption.None);
68106810
Property(x => x.Data).HasColumnName(@"Data").HasColumnType("nvarchar").IsOptional().HasMaxLength(100);
68116811

68126812
// Foreign keys
6813-
HasRequired(a => a.NullableReverseNavA).WithOptional(b => b.NullableReverseNavB).WillCascadeOnDelete(false); // FK_NullableReverseNavB_A
6813+
HasRequired(a => a.NullableReverseNavigationA).WithOptional(b => b.NullableReverseNavigationB).WillCascadeOnDelete(false); // FK_NullableReverseNavigationB_Id
68146814
}
68156815
}
68166816

‎Generator.Tests.Integration/TestComparison/EfrpgTest_SqlServer_EfCore8_FkCurrent.cs‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public interface IEfrpgTestDbContext : IDisposable
9292
DbSet<Issue47_User> Issue47_Users { get; set; } // Users
9393
DbSet<Issue47_UserRole> Issue47_UserRoles { get; set; } // UserRoles
9494
DbSet<MultipleKey> MultipleKeys { get; set; } // MultipleKeys
95-
DbSet<NullableReverseNavA> NullableReverseNavAs { get; set; } // NullableReverseNavA
96-
DbSet<NullableReverseNavB> NullableReverseNavBs { get; set; } // NullableReverseNavB
95+
DbSet<NullableReverseNavigationA> NullableReverseNavigationAs { get; set; } // NullableReverseNavigationA
96+
DbSet<NullableReverseNavigationB> NullableReverseNavigationBs { get; set; } // NullableReverseNavigationB
9797
DbSet<OneEightSix_Issue> OneEightSix_Issues { get; set; } // Issue
9898
DbSet<OneEightSix_UploadedFile> OneEightSix_UploadedFiles { get; set; } // UploadedFile
9999
DbSet<PeriodTable> PeriodTables { get; set; } // Period.Table
@@ -449,8 +449,8 @@ public EfrpgTestDbContext(DbContextOptions<EfrpgTestDbContext> options)
449449
public DbSet<Issue47_User> Issue47_Users { get; set; } // Users
450450
public DbSet<Issue47_UserRole> Issue47_UserRoles { get; set; } // UserRoles
451451
public DbSet<MultipleKey> MultipleKeys { get; set; } // MultipleKeys
452-
public DbSet<NullableReverseNavA> NullableReverseNavAs { get; set; } // NullableReverseNavA
453-
public DbSet<NullableReverseNavB> NullableReverseNavBs { get; set; } // NullableReverseNavB
452+
public DbSet<NullableReverseNavigationA> NullableReverseNavigationAs { get; set; } // NullableReverseNavigationA
453+
public DbSet<NullableReverseNavigationB> NullableReverseNavigationBs { get; set; } // NullableReverseNavigationB
454454
public DbSet<OneEightSix_Issue> OneEightSix_Issues { get; set; } // Issue
455455
public DbSet<OneEightSix_UploadedFile> OneEightSix_UploadedFiles { get; set; } // UploadedFile
456456
public DbSet<PeriodTable> PeriodTables { get; set; } // Period.Table
@@ -594,8 +594,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
594594
modelBuilder.ApplyConfiguration(new Issue47_UserConfiguration());
595595
modelBuilder.ApplyConfiguration(new Issue47_UserRoleConfiguration());
596596
modelBuilder.ApplyConfiguration(new MultipleKeyConfiguration());
597-
modelBuilder.ApplyConfiguration(new NullableReverseNavAConfiguration());
598-
modelBuilder.ApplyConfiguration(new NullableReverseNavBConfiguration());
597+
modelBuilder.ApplyConfiguration(new NullableReverseNavigationAConfiguration());
598+
modelBuilder.ApplyConfiguration(new NullableReverseNavigationBConfiguration());
599599
modelBuilder.ApplyConfiguration(new OneEightSix_IssueConfiguration());
600600
modelBuilder.ApplyConfiguration(new OneEightSix_UploadedFileConfiguration());
601601
modelBuilder.ApplyConfiguration(new PeriodTableConfiguration());
@@ -2312,8 +2312,8 @@ public class FakeEfrpgTestDbContext : IEfrpgTestDbContext
23122312
public DbSet<Issue47_User> Issue47_Users { get; set; } // Users
23132313
public DbSet<Issue47_UserRole> Issue47_UserRoles { get; set; } // UserRoles
23142314
public DbSet<MultipleKey> MultipleKeys { get; set; } // MultipleKeys
2315-
public DbSet<NullableReverseNavA> NullableReverseNavAs { get; set; } // NullableReverseNavA
2316-
public DbSet<NullableReverseNavB> NullableReverseNavBs { get; set; } // NullableReverseNavB
2315+
public DbSet<NullableReverseNavigationA> NullableReverseNavigationAs { get; set; } // NullableReverseNavigationA
2316+
public DbSet<NullableReverseNavigationB> NullableReverseNavigationBs { get; set; } // NullableReverseNavigationB
23172317
public DbSet<OneEightSix_Issue> OneEightSix_Issues { get; set; } // Issue
23182318
public DbSet<OneEightSix_UploadedFile> OneEightSix_UploadedFiles { get; set; } // UploadedFile
23192319
public DbSet<PeriodTable> PeriodTables { get; set; } // Period.Table
@@ -2432,8 +2432,8 @@ public FakeEfrpgTestDbContext()
24322432
Issue47_Users = new FakeDbSet<Issue47_User>("UserId");
24332433
Issue47_UserRoles = new FakeDbSet<Issue47_UserRole>("UserRoleId");
24342434
MultipleKeys = new FakeDbSet<MultipleKey>("UserId", "FavouriteColourId", "BestHolidayTypeId");
2435-
NullableReverseNavAs = new FakeDbSet<NullableReverseNavA>("Id");
2436-
NullableReverseNavBs = new FakeDbSet<NullableReverseNavB>("Id");
2435+
NullableReverseNavigationAs = new FakeDbSet<NullableReverseNavigationA>("Id");
2436+
NullableReverseNavigationBs = new FakeDbSet<NullableReverseNavigationB>("Id");
24372437
OneEightSix_Issues = new FakeDbSet<OneEightSix_Issue>("Id");
24382438
OneEightSix_UploadedFiles = new FakeDbSet<OneEightSix_UploadedFile>("Id");
24392439
PeriodTables = new FakeDbSet<PeriodTable>("Id");
@@ -4948,32 +4948,32 @@ public class NoPrimaryKey
49484948
public string Description { get; set; } // Description (length: 10)
49494949
}
49504950

4951-
// NullableReverseNavA
4952-
public class NullableReverseNavA
4951+
// NullableReverseNavigationA
4952+
public class NullableReverseNavigationA
49534953
{
49544954
public Guid Id { get; set; } // Id (Primary key)
49554955
public string Data { get; set; } // Data (length: 100)
49564956

49574957
// Reverse navigation
49584958

49594959
/// <summary>
4960-
/// Parent (One-to-One) NullableReverseNavA pointed by [NullableReverseNavB].[Id] (FK_NullableReverseNavB_A)
4960+
/// Parent (One-to-One) NullableReverseNavigationA pointed by [NullableReverseNavigationB].[Id] (FK_NullableReverseNavigationB_Id)
49614961
/// </summary>
4962-
public virtual NullableReverseNavB NullableReverseNavB { get; set; } // NullableReverseNavB.FK_NullableReverseNavB_A
4962+
public virtual NullableReverseNavigationB NullableReverseNavigationB { get; set; } // NullableReverseNavigationB.FK_NullableReverseNavigationB_Id
49634963
}
49644964

4965-
// NullableReverseNavB
4966-
public class NullableReverseNavB
4965+
// NullableReverseNavigationB
4966+
public class NullableReverseNavigationB
49674967
{
49684968
public Guid Id { get; set; } // Id (Primary key)
49694969
public string Data { get; set; } // Data (length: 100)
49704970

49714971
// Foreign keys
49724972

49734973
/// <summary>
4974-
/// Parent NullableReverseNavA pointed by [NullableReverseNavB].([Id]) (FK_NullableReverseNavB_A)
4974+
/// Parent NullableReverseNavigationA pointed by [NullableReverseNavigationB].([Id]) (FK_NullableReverseNavigationB_Id)
49754975
/// </summary>
4976-
public virtual NullableReverseNavA NullableReverseNavA { get; set; } // FK_NullableReverseNavB_A
4976+
public virtual NullableReverseNavigationA NullableReverseNavigationA { get; set; } // FK_NullableReverseNavigationB_Id
49774977
}
49784978

49794979
// The table 'Test' is not usable by entity framework because it
@@ -6705,32 +6705,32 @@ public void Configure(EntityTypeBuilder<MultipleKey> builder)
67056705
}
67066706
}
67076707

6708-
// NullableReverseNavA
6709-
public class NullableReverseNavAConfiguration : IEntityTypeConfiguration<NullableReverseNavA>
6708+
// NullableReverseNavigationA
6709+
public class NullableReverseNavigationAConfiguration : IEntityTypeConfiguration<NullableReverseNavigationA>
67106710
{
6711-
public void Configure(EntityTypeBuilder<NullableReverseNavA> builder)
6711+
public void Configure(EntityTypeBuilder<NullableReverseNavigationA> builder)
67126712
{
6713-
builder.ToTable("NullableReverseNavA", "dbo");
6714-
builder.HasKey(x => x.Id).HasName("PK_NullableReverseNavA").IsClustered();
6713+
builder.ToTable("NullableReverseNavigationA", "dbo");
6714+
builder.HasKey(x => x.Id).HasName("PK_NullableReverseNavigationA").IsClustered();
67156715

67166716
builder.Property(x => x.Id).HasColumnName(@"Id").HasColumnType("uniqueidentifier").IsRequired().ValueGeneratedNever();
67176717
builder.Property(x => x.Data).HasColumnName(@"Data").HasColumnType("nvarchar(100)").IsRequired(false).HasMaxLength(100);
67186718
}
67196719
}
67206720

6721-
// NullableReverseNavB
6722-
public class NullableReverseNavBConfiguration : IEntityTypeConfiguration<NullableReverseNavB>
6721+
// NullableReverseNavigationB
6722+
public class NullableReverseNavigationBConfiguration : IEntityTypeConfiguration<NullableReverseNavigationB>
67236723
{
6724-
public void Configure(EntityTypeBuilder<NullableReverseNavB> builder)
6724+
public void Configure(EntityTypeBuilder<NullableReverseNavigationB> builder)
67256725
{
6726-
builder.ToTable("NullableReverseNavB", "dbo");
6727-
builder.HasKey(x => x.Id).HasName("PK_NullableReverseNavB").IsClustered();
6726+
builder.ToTable("NullableReverseNavigationB", "dbo");
6727+
builder.HasKey(x => x.Id).HasName("PK_NullableReverseNavigationB").IsClustered();
67286728

67296729
builder.Property(x => x.Id).HasColumnName(@"Id").HasColumnType("uniqueidentifier").IsRequired().ValueGeneratedNever();
67306730
builder.Property(x => x.Data).HasColumnName(@"Data").HasColumnType("nvarchar(100)").IsRequired(false).HasMaxLength(100);
67316731

67326732
// Foreign keys
6733-
builder.HasOne(a => a.NullableReverseNavA).WithOne(b => b.NullableReverseNavB).HasForeignKey<NullableReverseNavB>(c => c.Id).OnDelete(DeleteBehavior.ClientSetNull).HasConstraintName("FK_NullableReverseNavB_A");
6733+
builder.HasOne(a => a.NullableReverseNavigationA).WithOne(b => b.NullableReverseNavigationB).HasForeignKey<NullableReverseNavigationB>(c => c.Id).OnDelete(DeleteBehavior.ClientSetNull).HasConstraintName("FK_NullableReverseNavigationB_Id");
67346734
}
67356735
}
67366736

0 commit comments

Comments
 (0)