diff --git a/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabase.cs b/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabase.cs
index 2ea68f2..2345283 100644
--- a/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabase.cs
+++ b/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabase.cs
@@ -9,7 +9,7 @@ namespace FlowerShopDatabaseImplement
{
if (optionsBuilder.IsConfigured == false)
{
- optionsBuilder.UseNpgsql(@"Host=localhost;Database=FlowerShopDatabaseTestFull;Username=postgres;Password=postgres");
+ optionsBuilder.UseNpgsql(@"Host=localhost;Database=FlowerShopDatabaseFull;Username=postgres;Password=postgres");
}
base.OnConfiguring(optionsBuilder);
AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
diff --git a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240422161656_InitCreate.Designer.cs b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240422161656_InitCreate.Designer.cs
deleted file mode 100644
index d6c1a9c..0000000
--- a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240422161656_InitCreate.Designer.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-//
-using System;
-using FlowerShopDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace FlowerShopDatabaseImplement.Migrations
-{
- [DbContext(typeof(FlowerShopDatabase))]
- [Migration("20240422161656_InitCreate")]
- partial class InitCreate
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "6.0.27")
- .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
- NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
- modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Client", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("integer");
-
- NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
-
- b.Property("ClientFIO")
- .IsRequired()
- .HasColumnType("text");
-
- b.Property("Email")
- .IsRequired()
- .HasColumnType("text");
-
- b.Property("Password")
- .IsRequired()
- .HasColumnType("text");
-
- b.HasKey("Id");
-
- b.ToTable("Clients");
- });
-
- modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Component", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("integer");
-
- NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
-
- b.Property("ComponentName")
- .IsRequired()
- .HasColumnType("text");
-
- b.Property("Cost")
- .HasColumnType("double precision");
-
- b.HasKey("Id");
-
- b.ToTable("Components");
- });
-
- modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Flower", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("integer");
-
- NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
-
- b.Property("FlowerName")
- .IsRequired()
- .HasColumnType("text");
-
- b.Property("Price")
- .HasColumnType("double precision");
-
- b.HasKey("Id");
-
- b.ToTable("Flowers");
- });
-
- modelBuilder.Entity("FlowerShopDatabaseImplement.Models.FlowerComponent", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("integer");
-
- NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
-
- b.Property("ComponentId")
- .HasColumnType("integer");
-
- b.Property("Count")
- .HasColumnType("integer");
-
- b.Property("FlowerId")
- .HasColumnType("integer");
-
- b.HasKey("Id");
-
- b.HasIndex("ComponentId");
-
- b.HasIndex("FlowerId");
-
- b.ToTable("FlowerComponents");
- });
-
- modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Implementer", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("integer");
-
- NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
-
- b.Property("ImplementerFIO")
- .IsRequired()
- .HasColumnType("text");
-
- b.Property("Password")
- .IsRequired()
- .HasColumnType("text");
-
- b.Property("Qualification")
- .HasColumnType("integer");
-
- b.Property("WorkExperience")
- .HasColumnType("integer");
-
- b.HasKey("Id");
-
- b.ToTable("Implementers");
- });
-
- modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Order", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("integer");
-
- NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
-
- b.Property("ClientId")
- .HasColumnType("integer");
-
- b.Property("Count")
- .HasColumnType("integer");
-
- b.Property("DateCreate")
- .HasColumnType("timestamp without time zone");
-
- b.Property("DateImplement")
- .HasColumnType("timestamp without time zone");
-
- b.Property("FlowerId")
- .HasColumnType("integer");
-
- b.Property("ImplementerId")
- .HasColumnType("integer");
-
- b.Property("Status")
- .HasColumnType("integer");
-
- b.Property("Sum")
- .HasColumnType("double precision");
-
- b.HasKey("Id");
-
- b.HasIndex("ClientId");
-
- b.HasIndex("FlowerId");
-
- b.HasIndex("ImplementerId");
-
- b.ToTable("Orders");
- });
-
- modelBuilder.Entity("FlowerShopDatabaseImplement.Models.FlowerComponent", b =>
- {
- b.HasOne("FlowerShopDatabaseImplement.Models.Component", "Component")
- .WithMany("FlowerComponents")
- .HasForeignKey("ComponentId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("FlowerShopDatabaseImplement.Models.Flower", "Flower")
- .WithMany("Components")
- .HasForeignKey("FlowerId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.Navigation("Component");
-
- b.Navigation("Flower");
- });
-
- modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Order", b =>
- {
- b.HasOne("FlowerShopDatabaseImplement.Models.Client", "Client")
- .WithMany()
- .HasForeignKey("ClientId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("FlowerShopDatabaseImplement.Models.Flower", "Flower")
- .WithMany("Orders")
- .HasForeignKey("FlowerId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("FlowerShopDatabaseImplement.Models.Implementer", "Implementer")
- .WithMany("Order")
- .HasForeignKey("ImplementerId");
-
- b.Navigation("Client");
-
- b.Navigation("Flower");
-
- b.Navigation("Implementer");
- });
-
- modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Component", b =>
- {
- b.Navigation("FlowerComponents");
- });
-
- modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Flower", b =>
- {
- b.Navigation("Components");
-
- b.Navigation("Orders");
- });
-
- modelBuilder.Entity("FlowerShopDatabaseImplement.Models.Implementer", b =>
- {
- b.Navigation("Order");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240422161656_InitCreate.cs b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240422161656_InitCreate.cs
deleted file mode 100644
index e3cb0dc..0000000
--- a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240422161656_InitCreate.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace FlowerShopDatabaseImplement.Migrations
-{
- public partial class InitCreate : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "Clients",
- columns: table => new
- {
- Id = table.Column(type: "integer", nullable: false)
- .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
- ClientFIO = table.Column(type: "text", nullable: false),
- Email = table.Column(type: "text", nullable: false),
- Password = table.Column(type: "text", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Clients", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "Components",
- columns: table => new
- {
- Id = table.Column(type: "integer", nullable: false)
- .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
- ComponentName = table.Column(type: "text", nullable: false),
- Cost = table.Column(type: "double precision", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Components", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "Flowers",
- columns: table => new
- {
- Id = table.Column(type: "integer", nullable: false)
- .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
- FlowerName = table.Column(type: "text", nullable: false),
- Price = table.Column(type: "double precision", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Flowers", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "Implementers",
- columns: table => new
- {
- Id = table.Column(type: "integer", nullable: false)
- .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
- ImplementerFIO = table.Column(type: "text", nullable: false),
- Password = table.Column(type: "text", nullable: false),
- WorkExperience = table.Column(type: "integer", nullable: false),
- Qualification = table.Column(type: "integer", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Implementers", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "FlowerComponents",
- columns: table => new
- {
- Id = table.Column(type: "integer", nullable: false)
- .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
- FlowerId = table.Column(type: "integer", nullable: false),
- ComponentId = table.Column(type: "integer", nullable: false),
- Count = table.Column(type: "integer", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_FlowerComponents", x => x.Id);
- table.ForeignKey(
- name: "FK_FlowerComponents_Components_ComponentId",
- column: x => x.ComponentId,
- principalTable: "Components",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- table.ForeignKey(
- name: "FK_FlowerComponents_Flowers_FlowerId",
- column: x => x.FlowerId,
- principalTable: "Flowers",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- });
-
- migrationBuilder.CreateTable(
- name: "Orders",
- columns: table => new
- {
- Id = table.Column(type: "integer", nullable: false)
- .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
- FlowerId = table.Column(type: "integer", nullable: false),
- ClientId = table.Column(type: "integer", nullable: false),
- ImplementerId = table.Column(type: "integer", nullable: true),
- Count = table.Column(type: "integer", nullable: false),
- Sum = table.Column(type: "double precision", nullable: false),
- Status = table.Column(type: "integer", nullable: false),
- DateCreate = table.Column(type: "timestamp without time zone", nullable: false),
- DateImplement = table.Column(type: "timestamp without time zone", nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_Orders", x => x.Id);
- table.ForeignKey(
- name: "FK_Orders_Clients_ClientId",
- column: x => x.ClientId,
- principalTable: "Clients",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- table.ForeignKey(
- name: "FK_Orders_Flowers_FlowerId",
- column: x => x.FlowerId,
- principalTable: "Flowers",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- table.ForeignKey(
- name: "FK_Orders_Implementers_ImplementerId",
- column: x => x.ImplementerId,
- principalTable: "Implementers",
- principalColumn: "Id");
- });
-
- migrationBuilder.CreateIndex(
- name: "IX_FlowerComponents_ComponentId",
- table: "FlowerComponents",
- column: "ComponentId");
-
- migrationBuilder.CreateIndex(
- name: "IX_FlowerComponents_FlowerId",
- table: "FlowerComponents",
- column: "FlowerId");
-
- migrationBuilder.CreateIndex(
- name: "IX_Orders_ClientId",
- table: "Orders",
- column: "ClientId");
-
- migrationBuilder.CreateIndex(
- name: "IX_Orders_FlowerId",
- table: "Orders",
- column: "FlowerId");
-
- migrationBuilder.CreateIndex(
- name: "IX_Orders_ImplementerId",
- table: "Orders",
- column: "ImplementerId");
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "FlowerComponents");
-
- migrationBuilder.DropTable(
- name: "Orders");
-
- migrationBuilder.DropTable(
- name: "Components");
-
- migrationBuilder.DropTable(
- name: "Clients");
-
- migrationBuilder.DropTable(
- name: "Flowers");
-
- migrationBuilder.DropTable(
- name: "Implementers");
- }
- }
-}
diff --git a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240502144838_test.Designer.cs b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240502144838_InitCreate.Designer.cs
similarity index 100%
rename from FlowerShop/FlowerShopDatabaseImplement/Migrations/20240502144838_test.Designer.cs
rename to FlowerShop/FlowerShopDatabaseImplement/Migrations/20240502144838_InitCreate.Designer.cs
diff --git a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240502144838_test.cs b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240502144838_InitCreate.cs
similarity index 96%
rename from FlowerShop/FlowerShopDatabaseImplement/Migrations/20240502144838_test.cs
rename to FlowerShop/FlowerShopDatabaseImplement/Migrations/20240502144838_InitCreate.cs
index 5cbc8ed..a42121e 100644
--- a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240502144838_test.cs
+++ b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20240502144838_InitCreate.cs
@@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
namespace FlowerShopDatabaseImplement.Migrations
{
- public partial class test : Migration
+ public partial class InitCreate : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{