Skip to content

Commit c464eef

Browse files
sjh37sjh37
committed
Merge branch 'Timestamp' into development
2 parents e1b20f4 + ec9aeb5 commit c464eef

31 files changed

+676
-5
lines changed

‎Tester.Integration.EFCore6/EfrpgTestData/Configuration/EnumTest_OpenDayConfiguration.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// <auto-generated>
2+
3+
using Microsoft.EntityFrameworkCore;
4+
using Microsoft.EntityFrameworkCore.Metadata.Builders;
5+
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
6+
7+
namespace V6EfrpgTest
8+
{
9+
// OpenDays
10+
public class EnumTest_OpenDayConfiguration : IEntityTypeConfiguration<EnumTest_OpenDay>
11+
{
12+
public void Configure(EntityTypeBuilder<EnumTest_OpenDay> builder)
13+
{
14+
builder.ToTable("OpenDays", "EnumTest");
15+
builder.HasKey(x => x.Id).HasName("PK_OpenDays").IsClustered();
16+
17+
builder.Property(x => x.Id).HasColumnName(@"Id").HasColumnType("int").IsRequired().ValueGeneratedOnAdd().UseIdentityColumn();
18+
builder.Property(x => x.EnumId).HasColumnName(@"EnumId").HasColumnType("int").IsRequired();
19+
20+
// Foreign keys
21+
builder.HasOne(a => a.EnumTest_DaysOfWeek).WithMany(b => b.EnumTest_OpenDays).HasForeignKey(c => c.EnumId).OnDelete(DeleteBehavior.ClientSetNull).HasConstraintName("Fk_OpenDays_EnumId");
22+
}
23+
}
24+
25+
}
26+
// </auto-generated>

‎Tester.Integration.EFCore6/EfrpgTestData/Configuration/VersionedConfiguration.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// <auto-generated>
2+
3+
using Microsoft.EntityFrameworkCore;
4+
using Microsoft.EntityFrameworkCore.Metadata.Builders;
5+
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
6+
7+
namespace V6EfrpgTest
8+
{
9+
// Versioned
10+
public class VersionedConfiguration : IEntityTypeConfiguration<Versioned>
11+
{
12+
public void Configure(EntityTypeBuilder<Versioned> builder)
13+
{
14+
builder.ToTable("Versioned", "dbo");
15+
builder.HasKey(x => x.Id).HasName("PK_Versioned").IsClustered();
16+
17+
builder.Property(x => x.Id).HasColumnName(@"Id").HasColumnType("int").IsRequired().ValueGeneratedOnAdd().UseIdentityColumn();
18+
builder.Property(x => x.Version).HasColumnName(@"Version").HasColumnType("timestamp").IsRequired().IsRowVersion().ValueGeneratedOnAddOrUpdate();
19+
builder.Property(x => x.Number).HasColumnName(@"Number").HasColumnType("int").IsRequired();
20+
}
21+
}
22+
23+
}
24+
// </auto-generated>

‎Tester.Integration.EFCore6/EfrpgTestData/Configuration/VersionedNullableConfiguration.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// <auto-generated>
2+
3+
using Microsoft.EntityFrameworkCore;
4+
using Microsoft.EntityFrameworkCore.Metadata.Builders;
5+
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
6+
7+
namespace V6EfrpgTest
8+
{
9+
// VersionedNullable
10+
public class VersionedNullableConfiguration : IEntityTypeConfiguration<VersionedNullable>
11+
{
12+
public void Configure(EntityTypeBuilder<VersionedNullable> builder)
13+
{
14+
builder.ToTable("VersionedNullable", "dbo");
15+
builder.HasKey(x => x.Id).HasName("PK_VersionedNullable").IsClustered();
16+
17+
builder.Property(x => x.Id).HasColumnName(@"Id").HasColumnType("int").IsRequired().ValueGeneratedOnAdd().UseIdentityColumn();
18+
builder.Property(x => x.Version).HasColumnName(@"Version").HasColumnType("timestamp").IsRequired(false).IsRowVersion().ValueGeneratedOnAddOrUpdate();
19+
builder.Property(x => x.Number).HasColumnName(@"Number").HasColumnType("int").IsRequired();
20+
}
21+
}
22+
23+
}
24+
// </auto-generated>

‎Tester.Integration.EFCore6/EfrpgTestData/Entities/ColourPivotReturnModel.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// <auto-generated>
2+
3+
using System;
4+
using System.Collections.Generic;
5+
6+
namespace V6EfrpgTest
7+
{
8+
public class ColourPivotReturnModel
9+
{
10+
public int? Blue { get; set; }
11+
public int? Green { get; set; }
12+
public int? Red { get; set; }
13+
}
14+
15+
}
16+
// </auto-generated>

‎Tester.Integration.EFCore6/EfrpgTestData/Entities/EnumTest_OpenDay.cs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// <auto-generated>
2+
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Threading;
6+
using System.Threading.Tasks;
7+
8+
namespace V6EfrpgTest
9+
{
10+
// OpenDays
11+
public class EnumTest_OpenDay
12+
{
13+
public int Id { get; set; } // Id (Primary key)
14+
public int EnumId { get; set; } // EnumId
15+
16+
// Foreign keys
17+
18+
/// <summary>
19+
/// Parent EnumTest_DaysOfWeek pointed by [OpenDays].([EnumId]) (Fk_OpenDays_EnumId)
20+
/// </summary>
21+
public virtual EnumTest_DaysOfWeek EnumTest_DaysOfWeek { get; set; } // Fk_OpenDays_EnumId
22+
}
23+
24+
}
25+
// </auto-generated>

‎Tester.Integration.EFCore6/EfrpgTestData/Entities/Versioned.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// <auto-generated>
2+
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Threading;
6+
using System.Threading.Tasks;
7+
8+
namespace V6EfrpgTest
9+
{
10+
// Versioned
11+
public class Versioned
12+
{
13+
public int Id { get; set; } // Id (Primary key)
14+
public byte[] Version { get; private set; } // Version (length: 8)
15+
public int Number { get; set; } // Number
16+
}
17+
18+
}
19+
// </auto-generated>

‎Tester.Integration.EFCore6/EfrpgTestData/Entities/VersionedNullable.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// <auto-generated>
2+
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Threading;
6+
using System.Threading.Tasks;
7+
8+
namespace V6EfrpgTest
9+
{
10+
// VersionedNullable
11+
public class VersionedNullable
12+
{
13+
public int Id { get; set; } // Id (Primary key)
14+
public byte[] Version { get; private set; } // Version (length: 8)
15+
public int Number { get; set; } // Number
16+
}
17+
18+
}
19+
// </auto-generated>

‎Tester.Integration.EFCore6/EnumForeignKey.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ public class EnumTest_DaysOfWeek
1818
// Reverse navigation
1919

2020
/// <summary>
21-
/// Child EnumTest_OpenDays where [OpenDays].[TypeId] point to this entity (Fk_OpenDays_TypeId)
21+
/// Child EnumTest_OpenDays where [OpenDays].[EnumId] point to this entity (Fk_OpenDays_EnumId)
2222
/// </summary>
23-
public virtual ICollection<EnumTest_OpenDay> EnumTest_OpenDays { get; set; } // OpenDays.Fk_OpenDays_TypeId
23+
public virtual ICollection<EnumTest_OpenDay> EnumTest_OpenDays { get; set; } // OpenDays.Fk_OpenDays_EnumId
2424

2525
public EnumTest_DaysOfWeek()
2626
{
@@ -32,14 +32,14 @@ public EnumTest_DaysOfWeek()
3232
public class EnumTest_OpenDay
3333
{
3434
public int Id { get; set; } // Id (Primary key)
35-
public DaysOfWeek TypeId { get; set; } // TypeId
35+
public int EnumId { get; set; } // EnumId
3636

3737
// Foreign keys
3838

3939
/// <summary>
40-
/// Parent EnumTest_DaysOfWeek pointed by [OpenDays].([TypeId]) (Fk_OpenDays_TypeId)
40+
/// Parent EnumTest_DaysOfWeek pointed by [OpenDays].([EnumId]) (Fk_OpenDays_EnumId)
4141
/// </summary>
42-
public virtual EnumTest_DaysOfWeek EnumTest_DaysOfWeek { get; set; } // Fk_OpenDays_TypeId
42+
public virtual EnumTest_DaysOfWeek EnumTest_DaysOfWeek { get; set; } // Fk_OpenDays_EnumId
4343
}
4444

4545

‎Tester.Integration.EFCore6/Single context many files/Configuration/VersionedConfiguration.cs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// <auto-generated>
2+
3+
using Microsoft.EntityFrameworkCore;
4+
using Microsoft.EntityFrameworkCore.Metadata.Builders;
5+
6+
namespace Tester.Integration.EFCore6.Single_context_many_files
7+
{
8+
// Versioned
9+
public class VersionedConfiguration : IEntityTypeConfiguration<Versioned>
10+
{
11+
public void Configure(EntityTypeBuilder<Versioned> builder)
12+
{
13+
builder.ToTable("Versioned", "dbo");
14+
builder.HasKey(x => x.Id).HasName("PK_Versioned").IsClustered();
15+
16+
builder.Property(x => x.Id).HasColumnName(@"Id").HasColumnType("int").IsRequired().ValueGeneratedOnAdd().UseIdentityColumn();
17+
builder.Property(x => x.Version).HasColumnName(@"Version").HasColumnType("timestamp").IsRequired().IsRowVersion().ValueGeneratedOnAddOrUpdate();
18+
builder.Property(x => x.Number).HasColumnName(@"Number").HasColumnType("int").IsRequired();
19+
}
20+
}
21+
22+
}
23+
// </auto-generated>

‎Tester.Integration.EFCore6/Single context many files/Configuration/VersionedNullableConfiguration.cs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// <auto-generated>
2+
3+
using Microsoft.EntityFrameworkCore;
4+
using Microsoft.EntityFrameworkCore.Metadata.Builders;
5+
6+
namespace Tester.Integration.EFCore6.Single_context_many_files
7+
{
8+
// VersionedNullable
9+
public class VersionedNullableConfiguration : IEntityTypeConfiguration<VersionedNullable>
10+
{
11+
public void Configure(EntityTypeBuilder<VersionedNullable> builder)
12+
{
13+
builder.ToTable("VersionedNullable", "dbo");
14+
builder.HasKey(x => x.Id).HasName("PK_VersionedNullable").IsClustered();
15+
16+
builder.Property(x => x.Id).HasColumnName(@"Id").HasColumnType("int").IsRequired().ValueGeneratedOnAdd().UseIdentityColumn();
17+
builder.Property(x => x.Version).HasColumnName(@"Version").HasColumnType("timestamp").IsRequired(false).IsRowVersion().ValueGeneratedOnAddOrUpdate();
18+
builder.Property(x => x.Number).HasColumnName(@"Number").HasColumnType("int").IsRequired();
19+
}
20+
}
21+
22+
}
23+
// </auto-generated>

0 commit comments

Comments
 (0)