From c132d944d7bed527b06adc2069b5a2a1eb0b662d Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Fri, 2 Jun 2017 16:31:35 +0200 Subject: [PATCH] update inital migration --- .../20170602122539_Initial.Designer.cs} | 13 ++++++---- .../20170602122539_Initial.cs} | 25 +++++++++++-------- .../MarketingContextModelSnapshot.cs | 11 +++++--- 3 files changed, 30 insertions(+), 19 deletions(-) rename src/Services/Marketing/Marketing.API/{Migrations/20170601175200_Initial.Designer.cs => Infrastructure/MarketingMigrations/20170602122539_Initial.Designer.cs} (86%) rename src/Services/Marketing/Marketing.API/{Migrations/20170601175200_Initial.cs => Infrastructure/MarketingMigrations/20170602122539_Initial.cs} (77%) rename src/Services/Marketing/Marketing.API/{Migrations => Infrastructure/MarketingMigrations}/MarketingContextModelSnapshot.cs (87%) diff --git a/src/Services/Marketing/Marketing.API/Migrations/20170601175200_Initial.Designer.cs b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.Designer.cs similarity index 86% rename from src/Services/Marketing/Marketing.API/Migrations/20170601175200_Initial.Designer.cs rename to src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.Designer.cs index b0305f171..5a5a6b66d 100644 --- a/src/Services/Marketing/Marketing.API/Migrations/20170601175200_Initial.Designer.cs +++ b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.Designer.cs @@ -5,10 +5,10 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure; -namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations +namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.MarketingMigrations { [DbContext(typeof(MarketingContext))] - [Migration("20170601175200_Initial")] + [Migration("20170602122539_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -16,6 +16,7 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations modelBuilder .HasAnnotation("ProductVersion", "1.1.2") .HasAnnotation("SqlServer:Sequence:.campaign_hilo", "'campaign_hilo', '', '1', '10', '', '', 'Int64', 'False'") + .HasAnnotation("SqlServer:Sequence:.rule_hilo", "'rule_hilo', '', '1', '10', '', '', 'Int64', 'False'") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Campaign", b => @@ -45,7 +46,9 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Rule", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:HiLoSequenceName", "rule_hilo") + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.SequenceHiLo); b.Property("CampaignId"); @@ -59,7 +62,7 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations b.HasIndex("CampaignId"); - b.ToTable("Rules"); + b.ToTable("Rule"); b.HasDiscriminator("RuleTypeId"); }); @@ -98,7 +101,7 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Rule", b => { - b.HasOne("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Campaign", "Campaign") + b.HasOne("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Campaign") .WithMany("Rules") .HasForeignKey("CampaignId") .OnDelete(DeleteBehavior.Cascade); diff --git a/src/Services/Marketing/Marketing.API/Migrations/20170601175200_Initial.cs b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.cs similarity index 77% rename from src/Services/Marketing/Marketing.API/Migrations/20170601175200_Initial.cs rename to src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.cs index dee3aa12f..d33fbb3d0 100644 --- a/src/Services/Marketing/Marketing.API/Migrations/20170601175200_Initial.cs +++ b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/20170602122539_Initial.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Metadata; -namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations +namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.MarketingMigrations { public partial class Initial : Migration { @@ -13,6 +12,10 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations name: "campaign_hilo", incrementBy: 10); + migrationBuilder.CreateSequence( + name: "rule_hilo", + incrementBy: 10); + migrationBuilder.CreateTable( name: "Campaign", columns: table => new @@ -29,11 +32,10 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations }); migrationBuilder.CreateTable( - name: "Rules", + name: "Rule", columns: table => new { - Id = table.Column(nullable: false) - .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn), + Id = table.Column(nullable: false), CampaignId = table.Column(nullable: false), Description = table.Column(nullable: false), RuleTypeId = table.Column(nullable: false), @@ -41,9 +43,9 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations }, constraints: table => { - table.PrimaryKey("PK_Rules", x => x.Id); + table.PrimaryKey("PK_Rule", x => x.Id); table.ForeignKey( - name: "FK_Rules_Campaign_CampaignId", + name: "FK_Rule_Campaign_CampaignId", column: x => x.CampaignId, principalTable: "Campaign", principalColumn: "Id", @@ -51,21 +53,24 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations }); migrationBuilder.CreateIndex( - name: "IX_Rules_CampaignId", - table: "Rules", + name: "IX_Rule_CampaignId", + table: "Rule", column: "CampaignId"); } protected override void Down(MigrationBuilder migrationBuilder) { migrationBuilder.DropTable( - name: "Rules"); + name: "Rule"); migrationBuilder.DropTable( name: "Campaign"); migrationBuilder.DropSequence( name: "campaign_hilo"); + + migrationBuilder.DropSequence( + name: "rule_hilo"); } } } diff --git a/src/Services/Marketing/Marketing.API/Migrations/MarketingContextModelSnapshot.cs b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/MarketingContextModelSnapshot.cs similarity index 87% rename from src/Services/Marketing/Marketing.API/Migrations/MarketingContextModelSnapshot.cs rename to src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/MarketingContextModelSnapshot.cs index 3d954edcc..865daa028 100644 --- a/src/Services/Marketing/Marketing.API/Migrations/MarketingContextModelSnapshot.cs +++ b/src/Services/Marketing/Marketing.API/Infrastructure/MarketingMigrations/MarketingContextModelSnapshot.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure; -namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations +namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.MarketingMigrations { [DbContext(typeof(MarketingContext))] partial class MarketingContextModelSnapshot : ModelSnapshot @@ -15,6 +15,7 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations modelBuilder .HasAnnotation("ProductVersion", "1.1.2") .HasAnnotation("SqlServer:Sequence:.campaign_hilo", "'campaign_hilo', '', '1', '10', '', '', 'Int64', 'False'") + .HasAnnotation("SqlServer:Sequence:.rule_hilo", "'rule_hilo', '', '1', '10', '', '', 'Int64', 'False'") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Campaign", b => @@ -44,7 +45,9 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Rule", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:HiLoSequenceName", "rule_hilo") + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.SequenceHiLo); b.Property("CampaignId"); @@ -58,7 +61,7 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations b.HasIndex("CampaignId"); - b.ToTable("Rules"); + b.ToTable("Rule"); b.HasDiscriminator("RuleTypeId"); }); @@ -97,7 +100,7 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Migrations modelBuilder.Entity("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Rule", b => { - b.HasOne("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Campaign", "Campaign") + b.HasOne("Microsoft.eShopOnContainers.Services.Marketing.API.Model.Campaign") .WithMany("Rules") .HasForeignKey("CampaignId") .OnDelete(DeleteBehavior.Cascade);