From b4f5559fc91ee75ac7e83dc6a6ce3f27f4d1446c Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Tue, 18 Dec 2018 16:54:40 +0300 Subject: [PATCH] Fix migrations on startup templates for AuditLogId duplication (see #652). --- ....cs => 20181218134206_Initial.Designer.cs} | 2 +- ...4_Initial.cs => 20181218134206_Initial.cs} | 0 ...MyCompanyName.MyProjectName.DemoApp.csproj | 4 +++ ....cs => 20181218134025_Initial.Designer.cs} | 22 ++----------- ...6_Initial.cs => 20181218134025_Initial.cs} | 32 +++---------------- .../MyProjectNameDbContextModelSnapshot.cs | 20 ++---------- ...e.MyProjectName.EntityFrameworkCore.csproj | 2 ++ .../IdentityServerHost.csproj | 4 +++ ....cs => 20181218135354_Initial.Designer.cs} | 2 +- ...4_Initial.cs => 20181218135354_Initial.cs} | 0 ....cs => 20181218135310_Initial.Designer.cs} | 22 ++----------- ...2_Initial.cs => 20181218135310_Initial.cs} | 28 ++-------------- .../DemoAppDbContextModelSnapshot.cs | 20 ++---------- .../MyCompanyName.MyProjectName.Host.csproj | 4 +++ 14 files changed, 32 insertions(+), 130 deletions(-) rename templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/{20181212114934_Initial.Designer.cs => 20181218134206_Initial.Designer.cs} (99%) rename templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/{20181212114934_Initial.cs => 20181218134206_Initial.cs} (100%) rename templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/{20181212113826_Initial.Designer.cs => 20181218134025_Initial.Designer.cs} (97%) rename templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/{20181212113826_Initial.cs => 20181218134025_Initial.cs} (95%) rename templates/service/host/IdentityServerHost/Migrations/{20181212121034_Initial.Designer.cs => 20181218135354_Initial.Designer.cs} (99%) rename templates/service/host/IdentityServerHost/Migrations/{20181212121034_Initial.cs => 20181218135354_Initial.cs} (100%) rename templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/{20181212121232_Initial.Designer.cs => 20181218135310_Initial.Designer.cs} (94%) rename templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/{20181212121232_Initial.cs => 20181218135310_Initial.cs} (89%) diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20181212114934_Initial.Designer.cs b/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20181218134206_Initial.Designer.cs similarity index 99% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20181212114934_Initial.Designer.cs rename to templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20181218134206_Initial.Designer.cs index 9f8a2b4adf..3ab0c0721f 100644 --- a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20181212114934_Initial.Designer.cs +++ b/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20181218134206_Initial.Designer.cs @@ -10,7 +10,7 @@ using MyCompanyName.MyProjectName.DemoApp; namespace MyCompanyName.MyProjectName.DemoApp.Migrations { [DbContext(typeof(DemoAppDbContext))] - [Migration("20181212114934_Initial")] + [Migration("20181218134206_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20181212114934_Initial.cs b/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20181218134206_Initial.cs similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20181212114934_Initial.cs rename to templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20181218134206_Initial.cs diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj b/templates/module/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj index c42f5f663c..2ec0453f90 100644 --- a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj +++ b/templates/module/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj @@ -33,4 +33,8 @@ + + + + diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20181212113826_Initial.Designer.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20181218134025_Initial.Designer.cs similarity index 97% rename from templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20181212113826_Initial.Designer.cs rename to templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20181218134025_Initial.Designer.cs index 8afbe89363..7821feff86 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20181212113826_Initial.Designer.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20181218134025_Initial.Designer.cs @@ -11,7 +11,7 @@ using Volo.Abp.BackgroundJobs; namespace MyCompanyName.MyProjectName.Migrations { [DbContext(typeof(MyProjectNameDbContext))] - [Migration("20181212113826_Initial")] + [Migration("20181218134025_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -101,8 +101,6 @@ namespace MyCompanyName.MyProjectName.Migrations b.Property("AuditLogId") .HasColumnName("AuditLogId"); - b.Property("AuditLogId1"); - b.Property("ExecutionDuration") .HasColumnName("ExecutionDuration"); @@ -130,8 +128,6 @@ namespace MyCompanyName.MyProjectName.Migrations b.HasIndex("AuditLogId"); - b.HasIndex("AuditLogId1"); - b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); b.ToTable("AbpAuditLogActions"); @@ -145,8 +141,6 @@ namespace MyCompanyName.MyProjectName.Migrations b.Property("AuditLogId") .HasColumnName("AuditLogId"); - b.Property("AuditLogId1"); - b.Property("ChangeTime") .HasColumnName("ChangeTime"); @@ -173,8 +167,6 @@ namespace MyCompanyName.MyProjectName.Migrations b.HasIndex("AuditLogId"); - b.HasIndex("AuditLogId1"); - b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); b.ToTable("AbpEntityChanges"); @@ -608,25 +600,17 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany() + .WithMany("Actions") .HasForeignKey("AuditLogId") .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("Actions") - .HasForeignKey("AuditLogId1"); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany() + .WithMany("EntityChanges") .HasForeignKey("AuditLogId") .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("EntityChanges") - .HasForeignKey("AuditLogId1"); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20181212113826_Initial.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20181218134025_Initial.cs similarity index 95% rename from templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20181212113826_Initial.cs rename to templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20181218134025_Initial.cs index 5dd6559191..1f76a505a8 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20181212113826_Initial.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20181218134025_Initial.cs @@ -12,6 +12,7 @@ namespace MyCompanyName.MyProjectName.Migrations columns: table => new { Id = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true), ConcurrencyStamp = table.Column(nullable: true), UserId = table.Column(nullable: true), UserName = table.Column(maxLength: 256, nullable: true), @@ -27,8 +28,7 @@ namespace MyCompanyName.MyProjectName.Migrations Url = table.Column(maxLength: 256, nullable: true), Exceptions = table.Column(maxLength: 4000, nullable: true), Comments = table.Column(maxLength: 256, nullable: true), - HttpStatusCode = table.Column(nullable: true), - ExtraProperties = table.Column(nullable: true) + HttpStatusCode = table.Column(nullable: true) }, constraints: table => { @@ -173,8 +173,7 @@ namespace MyCompanyName.MyProjectName.Migrations Parameters = table.Column(maxLength: 2000, nullable: true), ExecutionTime = table.Column(nullable: false), ExecutionDuration = table.Column(nullable: false), - ExtraProperties = table.Column(nullable: true), - AuditLogId1 = table.Column(nullable: true) + ExtraProperties = table.Column(nullable: true) }, constraints: table => { @@ -185,12 +184,6 @@ namespace MyCompanyName.MyProjectName.Migrations principalTable: "AbpAuditLogs", principalColumn: "Id", onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_AbpAuditLogActions_AbpAuditLogs_AuditLogId1", - column: x => x.AuditLogId1, - principalTable: "AbpAuditLogs", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); }); migrationBuilder.CreateTable( @@ -204,8 +197,7 @@ namespace MyCompanyName.MyProjectName.Migrations ChangeType = table.Column(nullable: false), EntityId = table.Column(maxLength: 128, nullable: false), EntityTypeFullName = table.Column(maxLength: 128, nullable: false), - ExtraProperties = table.Column(nullable: true), - AuditLogId1 = table.Column(nullable: true) + ExtraProperties = table.Column(nullable: true) }, constraints: table => { @@ -216,12 +208,6 @@ namespace MyCompanyName.MyProjectName.Migrations principalTable: "AbpAuditLogs", principalColumn: "Id", onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_AbpEntityChanges_AbpAuditLogs_AuditLogId1", - column: x => x.AuditLogId1, - principalTable: "AbpAuditLogs", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); }); migrationBuilder.CreateTable( @@ -368,11 +354,6 @@ namespace MyCompanyName.MyProjectName.Migrations table: "AbpAuditLogActions", column: "AuditLogId"); - migrationBuilder.CreateIndex( - name: "IX_AbpAuditLogActions_AuditLogId1", - table: "AbpAuditLogActions", - column: "AuditLogId1"); - migrationBuilder.CreateIndex( name: "IX_AbpAuditLogActions_TenantId_ServiceName_MethodName_ExecutionTime", table: "AbpAuditLogActions", @@ -398,11 +379,6 @@ namespace MyCompanyName.MyProjectName.Migrations table: "AbpEntityChanges", column: "AuditLogId"); - migrationBuilder.CreateIndex( - name: "IX_AbpEntityChanges_AuditLogId1", - table: "AbpEntityChanges", - column: "AuditLogId1"); - migrationBuilder.CreateIndex( name: "IX_AbpEntityChanges_TenantId_EntityTypeFullName_EntityId", table: "AbpEntityChanges", diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs index 8a05ab5bc3..2ff93f8fde 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs @@ -99,8 +99,6 @@ namespace MyCompanyName.MyProjectName.Migrations b.Property("AuditLogId") .HasColumnName("AuditLogId"); - b.Property("AuditLogId1"); - b.Property("ExecutionDuration") .HasColumnName("ExecutionDuration"); @@ -128,8 +126,6 @@ namespace MyCompanyName.MyProjectName.Migrations b.HasIndex("AuditLogId"); - b.HasIndex("AuditLogId1"); - b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); b.ToTable("AbpAuditLogActions"); @@ -143,8 +139,6 @@ namespace MyCompanyName.MyProjectName.Migrations b.Property("AuditLogId") .HasColumnName("AuditLogId"); - b.Property("AuditLogId1"); - b.Property("ChangeTime") .HasColumnName("ChangeTime"); @@ -171,8 +165,6 @@ namespace MyCompanyName.MyProjectName.Migrations b.HasIndex("AuditLogId"); - b.HasIndex("AuditLogId1"); - b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); b.ToTable("AbpEntityChanges"); @@ -606,25 +598,17 @@ namespace MyCompanyName.MyProjectName.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany() + .WithMany("Actions") .HasForeignKey("AuditLogId") .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("Actions") - .HasForeignKey("AuditLogId1"); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany() + .WithMany("EntityChanges") .HasForeignKey("AuditLogId") .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("EntityChanges") - .HasForeignKey("AuditLogId1"); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj index c393a58161..877987ae14 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj @@ -7,6 +7,8 @@ + + diff --git a/templates/service/host/IdentityServerHost/IdentityServerHost.csproj b/templates/service/host/IdentityServerHost/IdentityServerHost.csproj index 5dc44682e9..f2b60aba11 100644 --- a/templates/service/host/IdentityServerHost/IdentityServerHost.csproj +++ b/templates/service/host/IdentityServerHost/IdentityServerHost.csproj @@ -25,4 +25,8 @@ + + + + diff --git a/templates/service/host/IdentityServerHost/Migrations/20181212121034_Initial.Designer.cs b/templates/service/host/IdentityServerHost/Migrations/20181218135354_Initial.Designer.cs similarity index 99% rename from templates/service/host/IdentityServerHost/Migrations/20181212121034_Initial.Designer.cs rename to templates/service/host/IdentityServerHost/Migrations/20181218135354_Initial.Designer.cs index 63b2af58a7..757aa9d169 100644 --- a/templates/service/host/IdentityServerHost/Migrations/20181212121034_Initial.Designer.cs +++ b/templates/service/host/IdentityServerHost/Migrations/20181218135354_Initial.Designer.cs @@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace IdentityServerHost.Migrations { [DbContext(typeof(DemoAppDbContext))] - [Migration("20181212121034_Initial")] + [Migration("20181218135354_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/templates/service/host/IdentityServerHost/Migrations/20181212121034_Initial.cs b/templates/service/host/IdentityServerHost/Migrations/20181218135354_Initial.cs similarity index 100% rename from templates/service/host/IdentityServerHost/Migrations/20181212121034_Initial.cs rename to templates/service/host/IdentityServerHost/Migrations/20181218135354_Initial.cs diff --git a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20181212121232_Initial.Designer.cs b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20181218135310_Initial.Designer.cs similarity index 94% rename from templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20181212121232_Initial.Designer.cs rename to templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20181218135310_Initial.Designer.cs index 1644e14900..67977b2f6a 100644 --- a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20181212121232_Initial.Designer.cs +++ b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20181218135310_Initial.Designer.cs @@ -10,7 +10,7 @@ using MyCompanyName.MyProjectName.Host; namespace MyCompanyName.MyProjectName.Host.Migrations { [DbContext(typeof(DemoAppDbContext))] - [Migration("20181212121232_Initial")] + [Migration("20181218135310_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -100,8 +100,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations b.Property("AuditLogId") .HasColumnName("AuditLogId"); - b.Property("AuditLogId1"); - b.Property("ExecutionDuration") .HasColumnName("ExecutionDuration"); @@ -129,8 +127,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations b.HasIndex("AuditLogId"); - b.HasIndex("AuditLogId1"); - b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); b.ToTable("AbpAuditLogActions"); @@ -144,8 +140,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations b.Property("AuditLogId") .HasColumnName("AuditLogId"); - b.Property("AuditLogId1"); - b.Property("ChangeTime") .HasColumnName("ChangeTime"); @@ -172,8 +166,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations b.HasIndex("AuditLogId"); - b.HasIndex("AuditLogId1"); - b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); b.ToTable("AbpEntityChanges"); @@ -272,25 +264,17 @@ namespace MyCompanyName.MyProjectName.Host.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany() + .WithMany("Actions") .HasForeignKey("AuditLogId") .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("Actions") - .HasForeignKey("AuditLogId1"); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany() + .WithMany("EntityChanges") .HasForeignKey("AuditLogId") .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("EntityChanges") - .HasForeignKey("AuditLogId1"); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => diff --git a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20181212121232_Initial.cs b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20181218135310_Initial.cs similarity index 89% rename from templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20181212121232_Initial.cs rename to templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20181218135310_Initial.cs index c191391cc9..fd1c985c5d 100644 --- a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20181212121232_Initial.cs +++ b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/20181218135310_Initial.cs @@ -77,8 +77,7 @@ namespace MyCompanyName.MyProjectName.Host.Migrations Parameters = table.Column(maxLength: 2000, nullable: true), ExecutionTime = table.Column(nullable: false), ExecutionDuration = table.Column(nullable: false), - ExtraProperties = table.Column(nullable: true), - AuditLogId1 = table.Column(nullable: true) + ExtraProperties = table.Column(nullable: true) }, constraints: table => { @@ -89,12 +88,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations principalTable: "AbpAuditLogs", principalColumn: "Id", onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_AbpAuditLogActions_AbpAuditLogs_AuditLogId1", - column: x => x.AuditLogId1, - principalTable: "AbpAuditLogs", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); }); migrationBuilder.CreateTable( @@ -108,8 +101,7 @@ namespace MyCompanyName.MyProjectName.Host.Migrations ChangeType = table.Column(nullable: false), EntityId = table.Column(maxLength: 128, nullable: false), EntityTypeFullName = table.Column(maxLength: 128, nullable: false), - ExtraProperties = table.Column(nullable: true), - AuditLogId1 = table.Column(nullable: true) + ExtraProperties = table.Column(nullable: true) }, constraints: table => { @@ -120,12 +112,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations principalTable: "AbpAuditLogs", principalColumn: "Id", onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_AbpEntityChanges_AbpAuditLogs_AuditLogId1", - column: x => x.AuditLogId1, - principalTable: "AbpAuditLogs", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); }); migrationBuilder.CreateTable( @@ -163,11 +149,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations table: "AbpAuditLogActions", column: "AuditLogId"); - migrationBuilder.CreateIndex( - name: "IX_AbpAuditLogActions_AuditLogId1", - table: "AbpAuditLogActions", - column: "AuditLogId1"); - migrationBuilder.CreateIndex( name: "IX_AbpAuditLogActions_TenantId_ServiceName_MethodName_ExecutionTime", table: "AbpAuditLogActions", @@ -188,11 +169,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations table: "AbpEntityChanges", column: "AuditLogId"); - migrationBuilder.CreateIndex( - name: "IX_AbpEntityChanges_AuditLogId1", - table: "AbpEntityChanges", - column: "AuditLogId1"); - migrationBuilder.CreateIndex( name: "IX_AbpEntityChanges_TenantId_EntityTypeFullName_EntityId", table: "AbpEntityChanges", diff --git a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/DemoAppDbContextModelSnapshot.cs b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/DemoAppDbContextModelSnapshot.cs index 69e2cc0ae2..c5e59b55fd 100644 --- a/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/DemoAppDbContextModelSnapshot.cs +++ b/templates/service/host/MyCompanyName.MyProjectName.Host/Migrations/DemoAppDbContextModelSnapshot.cs @@ -98,8 +98,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations b.Property("AuditLogId") .HasColumnName("AuditLogId"); - b.Property("AuditLogId1"); - b.Property("ExecutionDuration") .HasColumnName("ExecutionDuration"); @@ -127,8 +125,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations b.HasIndex("AuditLogId"); - b.HasIndex("AuditLogId1"); - b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); b.ToTable("AbpAuditLogActions"); @@ -142,8 +138,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations b.Property("AuditLogId") .HasColumnName("AuditLogId"); - b.Property("AuditLogId1"); - b.Property("ChangeTime") .HasColumnName("ChangeTime"); @@ -170,8 +164,6 @@ namespace MyCompanyName.MyProjectName.Host.Migrations b.HasIndex("AuditLogId"); - b.HasIndex("AuditLogId1"); - b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); b.ToTable("AbpEntityChanges"); @@ -270,25 +262,17 @@ namespace MyCompanyName.MyProjectName.Host.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany() + .WithMany("Actions") .HasForeignKey("AuditLogId") .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("Actions") - .HasForeignKey("AuditLogId1"); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany() + .WithMany("EntityChanges") .HasForeignKey("AuditLogId") .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("EntityChanges") - .HasForeignKey("AuditLogId1"); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => diff --git a/templates/service/host/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/service/host/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj index 979261471c..fb6d365ca6 100644 --- a/templates/service/host/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj +++ b/templates/service/host/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj @@ -30,4 +30,8 @@ + + + +