From 3bade8859bcd938b85c39ab16eaa0dcf8e01535f Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Sat, 3 Jun 2023 07:41:46 +0300 Subject: Mass refactoring --- Migrations/20230303041621_Init.Designer.cs | 83 --------------------------- Migrations/20230303041621_Init.cs | 64 --------------------- Migrations/20230603040054_Initial.Designer.cs | 79 +++++++++++++++++++++++++ Migrations/20230603040054_Initial.cs | 62 ++++++++++++++++++++ Migrations/DataContextModelSnapshot.cs | 30 +++++----- 5 files changed, 154 insertions(+), 164 deletions(-) delete mode 100644 Migrations/20230303041621_Init.Designer.cs delete mode 100644 Migrations/20230303041621_Init.cs create mode 100644 Migrations/20230603040054_Initial.Designer.cs create mode 100644 Migrations/20230603040054_Initial.cs (limited to 'Migrations') diff --git a/Migrations/20230303041621_Init.Designer.cs b/Migrations/20230303041621_Init.Designer.cs deleted file mode 100644 index 833e097..0000000 --- a/Migrations/20230303041621_Init.Designer.cs +++ /dev/null @@ -1,83 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using MyDarling.Models; - -#nullable disable - -namespace MyDarling.Migrations -{ - [DbContext(typeof(DataContext))] - [Migration("20230303041621_Init")] - partial class Init - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "7.0.2"); - - modelBuilder.Entity("MyDarling.Models.Figure", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("INTEGER"); - - b.Property("Description") - .IsRequired() - .HasColumnType("TEXT"); - - b.Property("FilePath") - .IsRequired() - .HasColumnType("TEXT"); - - b.Property("UnderwearBundleId") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("UnderwearBundleId"); - - b.ToTable("Figures"); - }); - - modelBuilder.Entity("MyDarling.Models.UnderwearBundle", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("INTEGER"); - - b.Property("Description") - .IsRequired() - .HasColumnType("TEXT"); - - b.Property("Name") - .IsRequired() - .HasColumnType("TEXT"); - - b.Property("Price") - .HasColumnType("TEXT"); - - b.HasKey("Id"); - - b.ToTable("UnderwearBundles"); - }); - - modelBuilder.Entity("MyDarling.Models.Figure", b => - { - b.HasOne("MyDarling.Models.UnderwearBundle", null) - .WithMany("Figures") - .HasForeignKey("UnderwearBundleId"); - }); - - modelBuilder.Entity("MyDarling.Models.UnderwearBundle", b => - { - b.Navigation("Figures"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Migrations/20230303041621_Init.cs b/Migrations/20230303041621_Init.cs deleted file mode 100644 index 788d447..0000000 --- a/Migrations/20230303041621_Init.cs +++ /dev/null @@ -1,64 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace MyDarling.Migrations -{ - /// - public partial class Init : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "UnderwearBundles", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - Name = table.Column(type: "TEXT", nullable: false), - Description = table.Column(type: "TEXT", nullable: false), - Price = table.Column(type: "TEXT", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_UnderwearBundles", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Figures", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - Description = table.Column(type: "TEXT", nullable: false), - FilePath = table.Column(type: "TEXT", nullable: false), - UnderwearBundleId = table.Column(type: "INTEGER", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Figures", x => x.Id); - table.ForeignKey( - name: "FK_Figures_UnderwearBundles_UnderwearBundleId", - column: x => x.UnderwearBundleId, - principalTable: "UnderwearBundles", - principalColumn: "Id"); - }); - - migrationBuilder.CreateIndex( - name: "IX_Figures_UnderwearBundleId", - table: "Figures", - column: "UnderwearBundleId"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "Figures"); - - migrationBuilder.DropTable( - name: "UnderwearBundles"); - } - } -} diff --git a/Migrations/20230603040054_Initial.Designer.cs b/Migrations/20230603040054_Initial.Designer.cs new file mode 100644 index 0000000..cf1a728 --- /dev/null +++ b/Migrations/20230603040054_Initial.Designer.cs @@ -0,0 +1,79 @@ +// +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using MyDarling.Models; + +#nullable disable + +namespace MyDarling.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20230603040054_Initial")] + partial class Initial + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "7.0.2"); + + modelBuilder.Entity("MyDarling.Models.Figure", b => + { + b.Property("Id") + .HasColumnType("TEXT"); + + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ProductId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ProductId"); + + b.ToTable("Figures"); + }); + + modelBuilder.Entity("MyDarling.Models.Product", b => + { + b.Property("Id") + .HasColumnType("TEXT"); + + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Price") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Products"); + }); + + modelBuilder.Entity("MyDarling.Models.Figure", b => + { + b.HasOne("MyDarling.Models.Product", null) + .WithMany("Figures") + .HasForeignKey("ProductId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("MyDarling.Models.Product", b => + { + b.Navigation("Figures"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Migrations/20230603040054_Initial.cs b/Migrations/20230603040054_Initial.cs new file mode 100644 index 0000000..80b5601 --- /dev/null +++ b/Migrations/20230603040054_Initial.cs @@ -0,0 +1,62 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace MyDarling.Migrations +{ + /// + public partial class Initial : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Products", + columns: table => new + { + Id = table.Column(type: "TEXT", nullable: false), + Name = table.Column(type: "TEXT", nullable: false), + Description = table.Column(type: "TEXT", nullable: false), + Price = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Products", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Figures", + columns: table => new + { + Id = table.Column(type: "TEXT", nullable: false), + Description = table.Column(type: "TEXT", nullable: false), + ProductId = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Figures", x => x.Id); + table.ForeignKey( + name: "FK_Figures_Products_ProductId", + column: x => x.ProductId, + principalTable: "Products", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_Figures_ProductId", + table: "Figures", + column: "ProductId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Figures"); + + migrationBuilder.DropTable( + name: "Products"); + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index b2177d7..6a8e605 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -1,5 +1,4 @@ // -using System; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; @@ -19,33 +18,28 @@ namespace MyDarling.Migrations modelBuilder.Entity("MyDarling.Models.Figure", b => { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("INTEGER"); + b.Property("Id") + .HasColumnType("TEXT"); b.Property("Description") .IsRequired() .HasColumnType("TEXT"); - b.Property("FilePath") + b.Property("ProductId") .IsRequired() .HasColumnType("TEXT"); - b.Property("UnderwearBundleId") - .HasColumnType("INTEGER"); - b.HasKey("Id"); - b.HasIndex("UnderwearBundleId"); + b.HasIndex("ProductId"); b.ToTable("Figures"); }); - modelBuilder.Entity("MyDarling.Models.UnderwearBundle", b => + modelBuilder.Entity("MyDarling.Models.Product", b => { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("INTEGER"); + b.Property("Id") + .HasColumnType("TEXT"); b.Property("Description") .IsRequired() @@ -60,17 +54,19 @@ namespace MyDarling.Migrations b.HasKey("Id"); - b.ToTable("UnderwearBundles"); + b.ToTable("Products"); }); modelBuilder.Entity("MyDarling.Models.Figure", b => { - b.HasOne("MyDarling.Models.UnderwearBundle", null) + b.HasOne("MyDarling.Models.Product", null) .WithMany("Figures") - .HasForeignKey("UnderwearBundleId"); + .HasForeignKey("ProductId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); - modelBuilder.Entity("MyDarling.Models.UnderwearBundle", b => + modelBuilder.Entity("MyDarling.Models.Product", b => { b.Navigation("Figures"); }); -- cgit v1.2.3