diff --git a/Cicm.Database/Migrations/20180806184309_RenameModelFields.Designer.cs b/Cicm.Database/Migrations/20180806184309_RenameModelFields.Designer.cs new file mode 100644 index 00000000..f3edf9e8 --- /dev/null +++ b/Cicm.Database/Migrations/20180806184309_RenameModelFields.Designer.cs @@ -0,0 +1,1721 @@ +// +using System; +using Cicm.Database.Models; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +namespace Cicm.Database.Migrations +{ + [DbContext(typeof(cicmContext))] + [Migration("20180806184309_RenameModelFields")] + partial class RenameModelFields + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.1.1-rtm-30846") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("Cicm.Database.Models.Admins", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("Password") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("password") + .HasColumnType("char(50)") + .HasDefaultValueSql("''"); + + b.Property("User") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("user") + .HasColumnType("char(50)") + .HasDefaultValueSql("''"); + + b.HasKey("Id"); + + b.HasIndex("User") + .HasName("idx_admins_user"); + + b.ToTable("admins"); + }); + + modelBuilder.Entity("Cicm.Database.Models.BrowserTests", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("Agif") + .ValueGeneratedOnAdd() + .HasColumnName("agif") + .HasColumnType("tinyint(1)") + .HasDefaultValueSql("'0'"); + + b.Property("Browser") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("browser") + .HasColumnType("varchar(64)") + .HasDefaultValueSql("''"); + + b.Property("Colors") + .ValueGeneratedOnAdd() + .HasColumnName("colors") + .HasColumnType("tinyint(1)") + .HasDefaultValueSql("'0'"); + + b.Property("Flash") + .ValueGeneratedOnAdd() + .HasColumnName("flash") + .HasColumnType("tinyint(1)") + .HasDefaultValueSql("'0'"); + + b.Property("Frames") + .ValueGeneratedOnAdd() + .HasColumnName("frames") + .HasColumnType("tinyint(1)") + .HasDefaultValueSql("'0'"); + + b.Property("Gif87") + .ValueGeneratedOnAdd() + .HasColumnName("gif87") + .HasColumnType("tinyint(1)") + .HasDefaultValueSql("'0'"); + + b.Property("Gif89") + .ValueGeneratedOnAdd() + .HasColumnName("gif89") + .HasColumnType("tinyint(1)") + .HasDefaultValueSql("'0'"); + + b.Property("Jpeg") + .ValueGeneratedOnAdd() + .HasColumnName("jpeg") + .HasColumnType("tinyint(1)") + .HasDefaultValueSql("'0'"); + + b.Property("Js") + .ValueGeneratedOnAdd() + .HasColumnName("js") + .HasColumnType("tinyint(1)") + .HasDefaultValueSql("'0'"); + + b.Property("Os") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("os") + .HasColumnType("varchar(32)") + .HasDefaultValueSql("''"); + + b.Property("Platform") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("platform") + .HasColumnType("varchar(8)") + .HasDefaultValueSql("''"); + + b.Property("Png") + .ValueGeneratedOnAdd() + .HasColumnName("png") + .HasColumnType("tinyint(1)") + .HasDefaultValueSql("'0'"); + + b.Property("Pngt") + .ValueGeneratedOnAdd() + .HasColumnName("pngt") + .HasColumnType("tinyint(1)") + .HasDefaultValueSql("'0'"); + + b.Property("Table") + .ValueGeneratedOnAdd() + .HasColumnName("table") + .HasColumnType("tinyint(1)") + .HasDefaultValueSql("'0'"); + + b.Property("UserAgent") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("user_agent") + .HasColumnType("varchar(128)") + .HasDefaultValueSql("''"); + + b.Property("Version") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("version") + .HasColumnType("varchar(16)") + .HasDefaultValueSql("''"); + + b.HasKey("Id"); + + b.HasIndex("Browser") + .HasName("idx_browser_tests_browser"); + + b.HasIndex("Os") + .HasName("idx_browser_tests_os"); + + b.HasIndex("Platform") + .HasName("idx_browser_tests_platform"); + + b.HasIndex("UserAgent") + .HasName("idx_browser_tests_user_agent"); + + b.HasIndex("Version") + .HasName("idx_browser_tests_version"); + + b.ToTable("browser_tests"); + }); + + modelBuilder.Entity("Cicm.Database.Models.CicmDb", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("Updated") + .ValueGeneratedOnAdd() + .HasColumnName("updated") + .HasColumnType("datetime") + .HasDefaultValueSql("'CURRENT_TIMESTAMP'"); + + b.Property("Version") + .HasColumnName("version") + .HasColumnType("int(11)"); + + b.HasKey("Id"); + + b.ToTable("cicm_db"); + }); + + modelBuilder.Entity("Cicm.Database.Models.Companies", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("Address") + .HasColumnName("address") + .HasColumnType("varchar(80)"); + + b.Property("City") + .HasColumnName("city") + .HasColumnType("varchar(80)"); + + b.Property("CountryId") + .HasColumnName("country") + .HasColumnType("smallint(3)"); + + b.Property("Facebook") + .HasColumnName("facebook") + .HasColumnType("varchar(45)"); + + b.Property("Founded") + .HasColumnName("founded") + .HasColumnType("datetime"); + + b.Property("Name") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("name") + .HasColumnType("varchar(128)") + .HasDefaultValueSql("''"); + + b.Property("PostalCode") + .HasColumnName("postal_code") + .HasColumnType("varchar(25)"); + + b.Property("Province") + .HasColumnName("province") + .HasColumnType("varchar(80)"); + + b.Property("Sold") + .HasColumnName("sold") + .HasColumnType("datetime"); + + b.Property("SoldToId") + .HasColumnName("sold_to") + .HasColumnType("int(11)"); + + b.Property("Status") + .HasColumnName("status") + .HasColumnType("int(11)"); + + b.Property("Twitter") + .HasColumnName("twitter") + .HasColumnType("varchar(45)"); + + b.Property("Website") + .HasColumnName("website") + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("Address") + .HasName("idx_companies_address"); + + b.HasIndex("City") + .HasName("idx_companies_city"); + + b.HasIndex("CountryId") + .HasName("idx_companies_country"); + + b.HasIndex("Facebook") + .HasName("idx_companies_facebook"); + + b.HasIndex("Founded") + .HasName("idx_companies_founded"); + + b.HasIndex("Name") + .HasName("idx_companies_name"); + + b.HasIndex("PostalCode") + .HasName("idx_companies_postal_code"); + + b.HasIndex("Province") + .HasName("idx_companies_province"); + + b.HasIndex("Sold") + .HasName("idx_companies_sold"); + + b.HasIndex("SoldToId") + .HasName("idx_companies_sold_to"); + + b.HasIndex("Status") + .HasName("idx_companies_status"); + + b.HasIndex("Twitter") + .HasName("idx_companies_twitter"); + + b.HasIndex("Website") + .HasName("idx_companies_website"); + + b.ToTable("companies"); + }); + + modelBuilder.Entity("Cicm.Database.Models.CompanyDescriptions", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("CompanyId") + .HasColumnName("company_id") + .HasColumnType("int(11)"); + + b.Property("Text") + .HasColumnName("text") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("CompanyId") + .IsUnique() + .HasName("idx_company_id"); + + b.HasIndex("Text") + .HasName("idx_text"); + + b.ToTable("company_descriptions"); + }); + + modelBuilder.Entity("Cicm.Database.Models.CompanyLogos", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("CompanyId") + .HasColumnName("company_id") + .HasColumnType("int(11)"); + + b.Property("LogoGuid") + .HasColumnName("logo_guid") + .HasColumnType("char(36)"); + + b.Property("Year") + .HasColumnName("year") + .HasColumnType("int(4)"); + + b.HasKey("Id", "CompanyId", "LogoGuid"); + + b.HasIndex("CompanyId") + .HasName("idx_company_id"); + + b.HasIndex("Id") + .IsUnique() + .HasName("idx_id"); + + b.HasIndex("LogoGuid") + .HasName("idx_guid"); + + b.ToTable("company_logos"); + }); + + modelBuilder.Entity("Cicm.Database.Models.Forbidden", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("Browser") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("browser") + .HasColumnType("char(128)") + .HasDefaultValueSql("''"); + + b.Property("Date") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("date") + .HasColumnType("char(20)") + .HasDefaultValueSql("''"); + + b.Property("Ip") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("ip") + .HasColumnType("char(16)") + .HasDefaultValueSql("''"); + + b.Property("Referer") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("referer") + .HasColumnType("char(255)") + .HasDefaultValueSql("''"); + + b.HasKey("Id"); + + b.HasIndex("Browser") + .HasName("idx_forbidden_browser"); + + b.HasIndex("Date") + .HasName("idx_forbidden_date"); + + b.HasIndex("Ip") + .HasName("idx_forbidden_ip"); + + b.HasIndex("Referer") + .HasName("idx_forbidden_referer"); + + b.ToTable("forbidden"); + }); + + modelBuilder.Entity("Cicm.Database.Models.Gpus", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("CompanyId") + .HasColumnName("company") + .HasColumnType("int(11)"); + + b.Property("DieSize") + .HasColumnName("die_size"); + + b.Property("Introduced") + .HasColumnName("introduced") + .HasColumnType("datetime"); + + b.Property("ModelCode") + .HasColumnName("model_code") + .HasColumnType("varchar(45)"); + + b.Property("Name") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("name") + .HasColumnType("char(128)") + .HasDefaultValueSql("''"); + + b.Property("Package") + .HasColumnName("package") + .HasColumnType("varchar(45)"); + + b.Property("Process") + .HasColumnName("process") + .HasColumnType("varchar(45)"); + + b.Property("ProcessNm") + .HasColumnName("process_nm"); + + b.Property("Transistors") + .HasColumnName("transistors") + .HasColumnType("bigint(20)"); + + b.HasKey("Id"); + + b.HasIndex("CompanyId") + .HasName("idx_gpus_company"); + + b.HasIndex("DieSize") + .HasName("idx_gpus_die_size"); + + b.HasIndex("Introduced") + .HasName("idx_gpus_introduced"); + + b.HasIndex("ModelCode") + .HasName("idx_gpus_model_code"); + + b.HasIndex("Name") + .HasName("idx_gpus_name"); + + b.HasIndex("Package") + .HasName("idx_gpus_package"); + + b.HasIndex("Process") + .HasName("idx_gpus_process"); + + b.HasIndex("ProcessNm") + .HasName("idx_gpus_process_nm"); + + b.HasIndex("Transistors") + .HasName("idx_gpus_transistors"); + + b.ToTable("gpus"); + }); + + modelBuilder.Entity("Cicm.Database.Models.GpusByMachine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("bigint(20)"); + + b.Property("GpuId") + .HasColumnName("gpu") + .HasColumnType("int(11)"); + + b.Property("MachineId") + .HasColumnName("machine") + .HasColumnType("int(11)"); + + b.HasKey("Id"); + + b.HasIndex("GpuId") + .HasName("idx_gpus_by_machine_gpus"); + + b.HasIndex("MachineId") + .HasName("idx_gpus_by_machine_machine"); + + b.ToTable("gpus_by_machine"); + }); + + modelBuilder.Entity("Cicm.Database.Models.InstructionSetExtensions", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("Extension") + .IsRequired() + .HasColumnName("extension") + .HasColumnType("varchar(45)"); + + b.HasKey("Id"); + + b.ToTable("instruction_set_extensions"); + }); + + modelBuilder.Entity("Cicm.Database.Models.InstructionSetExtensionsByProcessor", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("ProcessorId") + .HasColumnName("processor_id") + .HasColumnType("int(11)"); + + b.Property("ExtensionId") + .HasColumnName("extension_id") + .HasColumnType("int(11)"); + + b.HasKey("Id", "ProcessorId", "ExtensionId"); + + b.HasIndex("ExtensionId") + .HasName("idx_setextension_extension"); + + b.HasIndex("ProcessorId") + .HasName("idx_setextension_processor"); + + b.ToTable("instruction_set_extensions_by_processor"); + }); + + modelBuilder.Entity("Cicm.Database.Models.InstructionSets", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("InstructionSet") + .IsRequired() + .HasColumnName("instruction_set") + .HasColumnType("varchar(45)"); + + b.HasKey("Id"); + + b.ToTable("instruction_sets"); + }); + + modelBuilder.Entity("Cicm.Database.Models.Iso31661Numeric", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("smallint(3)"); + + b.Property("Name") + .IsRequired() + .HasColumnName("name") + .HasColumnType("varchar(64)"); + + b.HasKey("Id"); + + b.HasIndex("Name") + .HasName("idx_name"); + + b.ToTable("iso3166_1_numeric"); + }); + + modelBuilder.Entity("Cicm.Database.Models.Log", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("Browser") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("browser") + .HasColumnType("char(128)") + .HasDefaultValueSql("''"); + + b.Property("Date") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("date") + .HasColumnType("char(20)") + .HasDefaultValueSql("''"); + + b.Property("Ip") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("ip") + .HasColumnType("char(16)") + .HasDefaultValueSql("''"); + + b.Property("Referer") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("referer") + .HasColumnType("char(255)") + .HasDefaultValueSql("''"); + + b.HasKey("Id"); + + b.HasIndex("Browser") + .HasName("idx_log_browser"); + + b.HasIndex("Date") + .HasName("idx_log_date"); + + b.HasIndex("Ip") + .HasName("idx_log_ip"); + + b.HasIndex("Referer") + .HasName("idx_log_referer"); + + b.ToTable("log"); + }); + + modelBuilder.Entity("Cicm.Database.Models.MachineFamilies", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("CompanyId") + .HasColumnName("company") + .HasColumnType("int(11)"); + + b.Property("Name") + .IsRequired() + .HasColumnName("name") + .HasColumnType("varchar(255)"); + + b.HasKey("Id"); + + b.HasIndex("CompanyId") + .HasName("idx_machine_families_company"); + + b.HasIndex("Name") + .HasName("idx_machine_families_name"); + + b.ToTable("machine_families"); + }); + + modelBuilder.Entity("Cicm.Database.Models.Machines", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("CompanyId") + .ValueGeneratedOnAdd() + .HasColumnName("company") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("FamilyId") + .HasColumnName("family") + .HasColumnType("int(11)"); + + b.Property("Introduced") + .HasColumnName("introduced") + .HasColumnType("datetime"); + + b.Property("Model") + .HasColumnName("model") + .HasColumnType("varchar(50)"); + + b.Property("Name") + .IsRequired() + .HasColumnName("name") + .HasColumnType("varchar(255)"); + + b.Property("Type") + .ValueGeneratedOnAdd() + .HasColumnName("type") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.HasKey("Id"); + + b.HasIndex("CompanyId") + .HasName("idx_machines_company"); + + b.HasIndex("FamilyId") + .HasName("idx_machines_family"); + + b.HasIndex("Introduced") + .HasName("idx_machines_introduced"); + + b.HasIndex("Model") + .HasName("idx_machines_model"); + + b.HasIndex("Name") + .HasName("idx_machines_name"); + + b.HasIndex("Type") + .HasName("idx_machines_type"); + + b.ToTable("machines"); + }); + + modelBuilder.Entity("Cicm.Database.Models.MemoryByMachine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("bigint(20)"); + + b.Property("MachineId") + .HasColumnName("machine") + .HasColumnType("int(11)"); + + b.Property("Size") + .HasColumnName("size") + .HasColumnType("bigint(20)"); + + b.Property("Speed") + .HasColumnName("speed"); + + b.Property("Type") + .ValueGeneratedOnAdd() + .HasColumnName("type") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Usage") + .ValueGeneratedOnAdd() + .HasColumnName("usage") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.HasKey("Id"); + + b.HasIndex("MachineId") + .HasName("idx_memory_by_machine_machine"); + + b.HasIndex("Size") + .HasName("idx_memory_by_machine_size"); + + b.HasIndex("Speed") + .HasName("idx_memory_by_machine_speed"); + + b.HasIndex("Type") + .HasName("idx_memory_by_machine_type"); + + b.HasIndex("Usage") + .HasName("idx_memory_by_machine_usage"); + + b.ToTable("memory_by_machine"); + }); + + modelBuilder.Entity("Cicm.Database.Models.MoneyDonations", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("Donator") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("donator") + .HasColumnType("char(128)") + .HasDefaultValueSql("''"); + + b.Property("Quantity") + .ValueGeneratedOnAdd() + .HasColumnName("quantity") + .HasColumnType("decimal(11,2)") + .HasDefaultValueSql("'0.00'"); + + b.HasKey("Id"); + + b.HasIndex("Donator") + .HasName("idx_money_donations_donator"); + + b.HasIndex("Quantity") + .HasName("idx_money_donations_quantity"); + + b.ToTable("money_donations"); + }); + + modelBuilder.Entity("Cicm.Database.Models.News", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("AddedId") + .ValueGeneratedOnAdd() + .HasColumnName("added_id") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Date") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("date") + .HasColumnType("char(20)") + .HasDefaultValueSql("''"); + + b.Property("Type") + .ValueGeneratedOnAdd() + .HasColumnName("type") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.HasKey("Id"); + + b.HasIndex("AddedId") + .HasName("idx_news_ip"); + + b.HasIndex("Date") + .HasName("idx_news_date"); + + b.HasIndex("Type") + .HasName("idx_news_type"); + + b.ToTable("news"); + }); + + modelBuilder.Entity("Cicm.Database.Models.OwnedComputers", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("Boxed") + .ValueGeneratedOnAdd() + .HasColumnName("boxed") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Cap1") + .ValueGeneratedOnAdd() + .HasColumnName("cap1") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Cap2") + .ValueGeneratedOnAdd() + .HasColumnName("cap2") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Cpu1") + .ValueGeneratedOnAdd() + .HasColumnName("cpu1") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Cpu2") + .ValueGeneratedOnAdd() + .HasColumnName("cpu2") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Date") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("date") + .HasColumnType("varchar(20)") + .HasDefaultValueSql("''"); + + b.Property("DbId") + .ValueGeneratedOnAdd() + .HasColumnName("db_id") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Disk1") + .ValueGeneratedOnAdd() + .HasColumnName("disk1") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Disk2") + .ValueGeneratedOnAdd() + .HasColumnName("disk2") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Manuals") + .ValueGeneratedOnAdd() + .HasColumnName("manuals") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Mhz1") + .ValueGeneratedOnAdd() + .HasColumnName("mhz1") + .HasColumnType("decimal(10,0)") + .HasDefaultValueSql("'0'"); + + b.Property("Mhz2") + .ValueGeneratedOnAdd() + .HasColumnName("mhz2") + .HasColumnType("decimal(10,0)") + .HasDefaultValueSql("'0'"); + + b.Property("Ram") + .ValueGeneratedOnAdd() + .HasColumnName("ram") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Rigid") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("rigid") + .HasColumnType("varchar(64)") + .HasDefaultValueSql("''"); + + b.Property("Status") + .ValueGeneratedOnAdd() + .HasColumnName("status") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Trade") + .ValueGeneratedOnAdd() + .HasColumnName("trade") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Vram") + .ValueGeneratedOnAdd() + .HasColumnName("vram") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.HasKey("Id"); + + b.HasIndex("Boxed") + .HasName("idx_owned_computers_boxed"); + + b.HasIndex("Cap1") + .HasName("idx_owned_computers_cap1"); + + b.HasIndex("Cap2") + .HasName("idx_owned_computers_cap2"); + + b.HasIndex("Cpu1") + .HasName("idx_owned_computers_cpu1"); + + b.HasIndex("Cpu2") + .HasName("idx_owned_computers_cpu2"); + + b.HasIndex("Date") + .HasName("idx_owned_computers_date"); + + b.HasIndex("DbId") + .HasName("idx_owned_computers_db_id"); + + b.HasIndex("Disk1") + .HasName("idx_owned_computers_disk1"); + + b.HasIndex("Disk2") + .HasName("idx_owned_computers_disk2"); + + b.HasIndex("Manuals") + .HasName("idx_owned_computers_manuals"); + + b.HasIndex("Mhz1") + .HasName("idx_owned_computers_mhz1"); + + b.HasIndex("Mhz2") + .HasName("idx_owned_computers_mhz2"); + + b.HasIndex("Ram") + .HasName("idx_owned_computers_ram"); + + b.HasIndex("Rigid") + .HasName("idx_owned_computers_rigid"); + + b.HasIndex("Status") + .HasName("idx_owned_computers_status"); + + b.HasIndex("Trade") + .HasName("idx_owned_computers_trade"); + + b.HasIndex("Vram") + .HasName("idx_owned_computers_vram"); + + b.ToTable("owned_computers"); + }); + + modelBuilder.Entity("Cicm.Database.Models.OwnedConsoles", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("Boxed") + .ValueGeneratedOnAdd() + .HasColumnName("boxed") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Date") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("date") + .HasColumnType("char(20)") + .HasDefaultValueSql("''"); + + b.Property("DbId") + .ValueGeneratedOnAdd() + .HasColumnName("db_id") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Manuals") + .ValueGeneratedOnAdd() + .HasColumnName("manuals") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Status") + .ValueGeneratedOnAdd() + .HasColumnName("status") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Trade") + .ValueGeneratedOnAdd() + .HasColumnName("trade") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.HasKey("Id"); + + b.HasIndex("Boxed") + .HasName("idx_owned_consoles_boxed"); + + b.HasIndex("Date") + .HasName("idx_owned_consoles_date"); + + b.HasIndex("DbId") + .HasName("idx_owned_consoles_db_id"); + + b.HasIndex("Manuals") + .HasName("idx_owned_consoles_manuals"); + + b.HasIndex("Status") + .HasName("idx_owned_consoles_status"); + + b.HasIndex("Trade") + .HasName("idx_owned_consoles_trade"); + + b.ToTable("owned_consoles"); + }); + + modelBuilder.Entity("Cicm.Database.Models.Processors", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("AddrBus") + .HasColumnName("addr_bus") + .HasColumnType("int(11)"); + + b.Property("CompanyId") + .HasColumnName("company") + .HasColumnType("int(11)"); + + b.Property("Cores") + .HasColumnName("cores") + .HasColumnType("int(11)"); + + b.Property("DataBus") + .HasColumnName("data_bus") + .HasColumnType("int(11)"); + + b.Property("DieSize") + .HasColumnName("die_size"); + + b.Property("FprSize") + .HasColumnName("FPR_size") + .HasColumnType("int(11)"); + + b.Property("Fprs") + .HasColumnName("FPRs") + .HasColumnType("int(11)"); + + b.Property("GprSize") + .HasColumnName("GPR_size") + .HasColumnType("int(11)"); + + b.Property("Gprs") + .HasColumnName("GPRs") + .HasColumnType("int(11)"); + + b.Property("InstructionSetId") + .HasColumnName("instruction_set") + .HasColumnType("int(11)"); + + b.Property("Introduced") + .HasColumnName("introduced") + .HasColumnType("datetime"); + + b.Property("L1Data") + .HasColumnName("L1_data"); + + b.Property("L1Instruction") + .HasColumnName("L1_instruction"); + + b.Property("L2"); + + b.Property("L3"); + + b.Property("ModelCode") + .HasColumnName("model_code") + .HasColumnType("varchar(45)"); + + b.Property("Name") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("name") + .HasColumnType("char(50)") + .HasDefaultValueSql("''"); + + b.Property("Package") + .HasColumnName("package") + .HasColumnType("varchar(45)"); + + b.Property("Process") + .HasColumnName("process") + .HasColumnType("varchar(45)"); + + b.Property("ProcessNm") + .HasColumnName("process_nm"); + + b.Property("SimdRegisters") + .HasColumnName("SIMD_registers") + .HasColumnType("int(11)"); + + b.Property("SimdSize") + .HasColumnName("SIMD_size") + .HasColumnType("int(11)"); + + b.Property("Speed") + .HasColumnName("speed"); + + b.Property("ThreadsPerCore") + .HasColumnName("threads_per_core") + .HasColumnType("int(11)"); + + b.Property("Transistors") + .HasColumnName("transistors") + .HasColumnType("bigint(20)"); + + b.HasKey("Id"); + + b.HasIndex("AddrBus") + .HasName("idx_processors_addr_bus"); + + b.HasIndex("CompanyId") + .HasName("idx_processors_company"); + + b.HasIndex("Cores") + .HasName("idx_processors_cores"); + + b.HasIndex("DataBus") + .HasName("idx_processors_data_bus"); + + b.HasIndex("DieSize") + .HasName("idx_processors_die_size"); + + b.HasIndex("FprSize") + .HasName("idx_processors_FPR_size"); + + b.HasIndex("Fprs") + .HasName("idx_processors_FPRs"); + + b.HasIndex("GprSize") + .HasName("idx_processors_GPR_size"); + + b.HasIndex("Gprs") + .HasName("idx_processors_GPRs"); + + b.HasIndex("InstructionSetId") + .HasName("idx_processors_instruction_set"); + + b.HasIndex("Introduced") + .HasName("idx_processors_introduced"); + + b.HasIndex("L1Data") + .HasName("idx_processors_L1_data"); + + b.HasIndex("L1Instruction") + .HasName("idx_processors_L1_instruction"); + + b.HasIndex("L2") + .HasName("idx_processors_L2"); + + b.HasIndex("L3") + .HasName("idx_processors_L3"); + + b.HasIndex("ModelCode") + .HasName("idx_processors_model_code"); + + b.HasIndex("Name") + .HasName("idx_processors_name"); + + b.HasIndex("Package") + .HasName("idx_processors_package"); + + b.HasIndex("Process") + .HasName("idx_processors_process"); + + b.HasIndex("ProcessNm") + .HasName("idx_processors_process_nm"); + + b.HasIndex("SimdRegisters") + .HasName("idx_processors_SIMD_registers"); + + b.HasIndex("SimdSize") + .HasName("idx_processors_SIMD_size"); + + b.HasIndex("Speed") + .HasName("idx_processors_speed"); + + b.HasIndex("ThreadsPerCore") + .HasName("idx_processors_threads_per_core"); + + b.HasIndex("Transistors") + .HasName("idx_processors_transistors"); + + b.ToTable("processors"); + }); + + modelBuilder.Entity("Cicm.Database.Models.ProcessorsByMachine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("bigint(20)"); + + b.Property("MachineId") + .HasColumnName("machine") + .HasColumnType("int(11)"); + + b.Property("ProcessorId") + .HasColumnName("processor") + .HasColumnType("int(11)"); + + b.Property("Speed") + .HasColumnName("speed"); + + b.HasKey("Id"); + + b.HasIndex("MachineId") + .HasName("idx_processors_by_machine_machine"); + + b.HasIndex("ProcessorId") + .HasName("idx_processors_by_machine_processor"); + + b.HasIndex("Speed") + .HasName("idx_processors_by_machine_speed"); + + b.ToTable("processors_by_machine"); + }); + + modelBuilder.Entity("Cicm.Database.Models.Resolutions", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("Chars") + .ValueGeneratedOnAdd() + .HasColumnName("chars") + .HasColumnType("tinyint(1)") + .HasDefaultValueSql("'0'"); + + b.Property("Colors") + .HasColumnName("colors") + .HasColumnType("bigint(20)"); + + b.Property("Height") + .ValueGeneratedOnAdd() + .HasColumnName("height") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("Palette") + .HasColumnName("palette") + .HasColumnType("bigint(20)"); + + b.Property("Width") + .ValueGeneratedOnAdd() + .HasColumnName("width") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.HasKey("Id"); + + b.HasIndex("Colors") + .HasName("idx_resolutions_colors"); + + b.HasIndex("Height") + .HasName("idx_resolutions_height"); + + b.HasIndex("Palette") + .HasName("idx_resolutions_palette"); + + b.HasIndex("Width") + .HasName("idx_resolutions_width"); + + b.HasIndex("Width", "Height") + .HasName("idx_resolutions_resolution"); + + b.HasIndex("Width", "Height", "Colors") + .HasName("idx_resolutions_resolution_with_color"); + + b.HasIndex("Width", "Height", "Colors", "Palette") + .HasName("idx_resolutions_resolution_with_color_and_palette"); + + b.ToTable("resolutions"); + }); + + modelBuilder.Entity("Cicm.Database.Models.ResolutionsByGpu", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("bigint(20)"); + + b.Property("GpuId") + .HasColumnName("gpu") + .HasColumnType("int(11)"); + + b.Property("ResolutionId") + .HasColumnName("resolution") + .HasColumnType("int(11)"); + + b.HasKey("Id"); + + b.HasIndex("GpuId") + .HasName("idx_resolutions_by_gpu_gpu"); + + b.HasIndex("ResolutionId") + .HasName("idx_resolutions_by_gpu_resolution"); + + b.ToTable("resolutions_by_gpu"); + }); + + modelBuilder.Entity("Cicm.Database.Models.SoundByMachine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("bigint(20)"); + + b.Property("MachineId") + .HasColumnName("machine") + .HasColumnType("int(11)"); + + b.Property("SoundSynthId") + .HasColumnName("sound_synth") + .HasColumnType("int(11)"); + + b.HasKey("Id"); + + b.HasIndex("MachineId") + .HasName("idx_sound_by_machine_machine"); + + b.HasIndex("SoundSynthId") + .HasName("idx_sound_by_machine_sound_synth"); + + b.ToTable("sound_by_machine"); + }); + + modelBuilder.Entity("Cicm.Database.Models.SoundSynths", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("int(11)"); + + b.Property("CompanyId") + .HasColumnName("company") + .HasColumnType("int(11)"); + + b.Property("Depth") + .HasColumnName("depth") + .HasColumnType("int(11)"); + + b.Property("Frequency") + .HasColumnName("frequency"); + + b.Property("Introduced") + .HasColumnName("introduced") + .HasColumnType("datetime"); + + b.Property("ModelCode") + .HasColumnName("model_code") + .HasColumnType("varchar(45)"); + + b.Property("Name") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnName("name") + .HasColumnType("char(50)") + .HasDefaultValueSql("''"); + + b.Property("SquareWave") + .HasColumnName("square_wave") + .HasColumnType("int(11)"); + + b.Property("Type") + .HasColumnName("type") + .HasColumnType("int(11)"); + + b.Property("Voices") + .HasColumnName("voices") + .HasColumnType("int(11)"); + + b.Property("WhiteNoise") + .HasColumnName("white_noise") + .HasColumnType("int(11)"); + + b.HasKey("Id"); + + b.HasIndex("CompanyId") + .HasName("idx_sound_synths_company"); + + b.HasIndex("Depth") + .HasName("idx_sound_synths_depth"); + + b.HasIndex("Frequency") + .HasName("idx_sound_synths_frequency"); + + b.HasIndex("Introduced") + .HasName("idx_sound_synths_introduced"); + + b.HasIndex("ModelCode") + .HasName("idx_sound_synths_model_code"); + + b.HasIndex("Name") + .HasName("idx_sound_synths_name"); + + b.HasIndex("SquareWave") + .HasName("idx_sound_synths_square_wave"); + + b.HasIndex("Type") + .HasName("idx_sound_synths_type"); + + b.HasIndex("Voices") + .HasName("idx_sound_synths_voices"); + + b.HasIndex("WhiteNoise") + .HasName("idx_sound_synths_white_noise"); + + b.ToTable("sound_synths"); + }); + + modelBuilder.Entity("Cicm.Database.Models.StorageByMachine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnName("id") + .HasColumnType("bigint(20)"); + + b.Property("Capacity") + .HasColumnName("capacity") + .HasColumnType("bigint(20)"); + + b.Property("Interface") + .ValueGeneratedOnAdd() + .HasColumnName("interface") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.Property("MachineId") + .HasColumnName("machine") + .HasColumnType("int(11)"); + + b.Property("Type") + .ValueGeneratedOnAdd() + .HasColumnName("type") + .HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); + + b.HasKey("Id"); + + b.HasIndex("Capacity") + .HasName("idx_storage_capacity"); + + b.HasIndex("Interface") + .HasName("idx_storage_interface"); + + b.HasIndex("MachineId") + .HasName("idx_storage_machine"); + + b.HasIndex("Type") + .HasName("idx_storage_type"); + + b.ToTable("storage_by_machine"); + }); + + modelBuilder.Entity("Cicm.Database.Models.Companies", b => + { + b.HasOne("Cicm.Database.Models.Iso31661Numeric", "Country") + .WithMany("Companies") + .HasForeignKey("CountryId") + .HasConstraintName("fk_companies_country"); + + b.HasOne("Cicm.Database.Models.Companies", "SoldTo") + .WithMany("InverseSoldToNavigation") + .HasForeignKey("SoldToId") + .HasConstraintName("fk_companies_sold_to"); + }); + + modelBuilder.Entity("Cicm.Database.Models.CompanyDescriptions", b => + { + b.HasOne("Cicm.Database.Models.Companies", "Company") + .WithOne("CompanyDescriptions") + .HasForeignKey("Cicm.Database.Models.CompanyDescriptions", "Id") + .HasConstraintName("fk_company_id") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Cicm.Database.Models.CompanyLogos", b => + { + b.HasOne("Cicm.Database.Models.Companies", "Company") + .WithMany("CompanyLogos") + .HasForeignKey("CompanyId") + .HasConstraintName("fk_company_logos_company1"); + }); + + modelBuilder.Entity("Cicm.Database.Models.Gpus", b => + { + b.HasOne("Cicm.Database.Models.Companies", "Company") + .WithMany("Gpus") + .HasForeignKey("CompanyId") + .HasConstraintName("fk_gpus_company"); + }); + + modelBuilder.Entity("Cicm.Database.Models.GpusByMachine", b => + { + b.HasOne("Cicm.Database.Models.Gpus", "Gpu") + .WithMany("GpusByMachine") + .HasForeignKey("GpuId") + .HasConstraintName("fk_gpus_by_machine_gpu") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Cicm.Database.Models.Machines", "Machine") + .WithMany("Gpus") + .HasForeignKey("MachineId") + .HasConstraintName("fk_gpus_by_machine_machine") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Cicm.Database.Models.InstructionSetExtensionsByProcessor", b => + { + b.HasOne("Cicm.Database.Models.InstructionSetExtensions", "Extension") + .WithMany("InstructionSetExtensionsByProcessor") + .HasForeignKey("ExtensionId") + .HasConstraintName("fk_extension_extension_id"); + + b.HasOne("Cicm.Database.Models.Processors", "Processor") + .WithMany("InstructionSetExtensions") + .HasForeignKey("ProcessorId") + .HasConstraintName("fk_extension_processor_id"); + }); + + modelBuilder.Entity("Cicm.Database.Models.MachineFamilies", b => + { + b.HasOne("Cicm.Database.Models.Companies", "Company") + .WithMany("MachineFamilies") + .HasForeignKey("CompanyId") + .HasConstraintName("fk_machine_families_company") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Cicm.Database.Models.Machines", b => + { + b.HasOne("Cicm.Database.Models.Companies", "Company") + .WithMany("Machines") + .HasForeignKey("CompanyId") + .HasConstraintName("fk_machines_company"); + + b.HasOne("Cicm.Database.Models.MachineFamilies", "Family") + .WithMany("Machines") + .HasForeignKey("FamilyId") + .HasConstraintName("fk_machines_family"); + }); + + modelBuilder.Entity("Cicm.Database.Models.MemoryByMachine", b => + { + b.HasOne("Cicm.Database.Models.Machines", "Machine") + .WithMany("Memory") + .HasForeignKey("MachineId") + .HasConstraintName("fk_memory_by_machine_machine") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Cicm.Database.Models.Processors", b => + { + b.HasOne("Cicm.Database.Models.Companies", "Company") + .WithMany("Processors") + .HasForeignKey("CompanyId") + .HasConstraintName("fk_processors_company"); + + b.HasOne("Cicm.Database.Models.InstructionSets", "InstructionSet") + .WithMany("Processors") + .HasForeignKey("InstructionSetId") + .HasConstraintName("fk_processors_instruction_set"); + }); + + modelBuilder.Entity("Cicm.Database.Models.ProcessorsByMachine", b => + { + b.HasOne("Cicm.Database.Models.Machines", "Machine") + .WithMany("Processors") + .HasForeignKey("MachineId") + .HasConstraintName("fk_processors_by_machine_machine") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Cicm.Database.Models.Processors", "Processor") + .WithMany("ProcessorsByMachine") + .HasForeignKey("ProcessorId") + .HasConstraintName("fk_processors_by_machine_processor") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Cicm.Database.Models.ResolutionsByGpu", b => + { + b.HasOne("Cicm.Database.Models.Gpus", "Gpu") + .WithMany("ResolutionsByGpu") + .HasForeignKey("GpuId") + .HasConstraintName("fk_resolutions_by_gpu_gpu") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Cicm.Database.Models.Resolutions", "Resolution") + .WithMany("ResolutionsByGpu") + .HasForeignKey("ResolutionId") + .HasConstraintName("fk_resolutions_by_gpu_resolution") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Cicm.Database.Models.SoundByMachine", b => + { + b.HasOne("Cicm.Database.Models.Machines", "Machine") + .WithMany("Sound") + .HasForeignKey("MachineId") + .HasConstraintName("fk_sound_by_machine_machine") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Cicm.Database.Models.SoundSynths", "SoundSynth") + .WithMany("SoundByMachine") + .HasForeignKey("SoundSynthId") + .HasConstraintName("fk_sound_by_machine_sound_synth") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Cicm.Database.Models.SoundSynths", b => + { + b.HasOne("Cicm.Database.Models.Companies", "Company") + .WithMany("SoundSynths") + .HasForeignKey("CompanyId") + .HasConstraintName("fk_sound_synths_company"); + }); + + modelBuilder.Entity("Cicm.Database.Models.StorageByMachine", b => + { + b.HasOne("Cicm.Database.Models.Machines", "Machine") + .WithMany("Storage") + .HasForeignKey("MachineId") + .HasConstraintName("fk_storage_by_machine_machine") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Cicm.Database/Migrations/20180806184309_RenameModelFields.cs b/Cicm.Database/Migrations/20180806184309_RenameModelFields.cs new file mode 100644 index 00000000..be017f19 --- /dev/null +++ b/Cicm.Database/Migrations/20180806184309_RenameModelFields.cs @@ -0,0 +1,21 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace Cicm.Database.Migrations +{ + public partial class RenameModelFields : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropIndex("idx_company_id", "company_descriptions"); + + migrationBuilder.CreateIndex("idx_company_id", "company_descriptions", "company_id", unique: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropIndex("idx_company_id", "company_descriptions"); + + migrationBuilder.CreateIndex("idx_company_id", "company_descriptions", "company_id"); + } + } +} \ No newline at end of file diff --git a/Cicm.Database/Migrations/cicmContextModelSnapshot.cs b/Cicm.Database/Migrations/cicmContextModelSnapshot.cs index 2d37553f..54e0dce8 100644 --- a/Cicm.Database/Migrations/cicmContextModelSnapshot.cs +++ b/Cicm.Database/Migrations/cicmContextModelSnapshot.cs @@ -122,7 +122,7 @@ namespace Cicm.Database.Migrations b.Property("City").HasColumnName("city").HasColumnType("varchar(80)"); - b.Property("Country").HasColumnName("country").HasColumnType("smallint(3)"); + b.Property("CountryId").HasColumnName("country").HasColumnType("smallint(3)"); b.Property("Facebook").HasColumnName("facebook").HasColumnType("varchar(45)"); @@ -137,7 +137,7 @@ namespace Cicm.Database.Migrations b.Property("Sold").HasColumnName("sold").HasColumnType("datetime"); - b.Property("SoldTo").HasColumnName("sold_to").HasColumnType("int(11)"); + b.Property("SoldToId").HasColumnName("sold_to").HasColumnType("int(11)"); b.Property("Status").HasColumnName("status").HasColumnType("int(11)"); @@ -151,7 +151,7 @@ namespace Cicm.Database.Migrations b.HasIndex("City").HasName("idx_companies_city"); - b.HasIndex("Country").HasName("idx_companies_country"); + b.HasIndex("CountryId").HasName("idx_companies_country"); b.HasIndex("Facebook").HasName("idx_companies_facebook"); @@ -165,7 +165,7 @@ namespace Cicm.Database.Migrations b.HasIndex("Sold").HasName("idx_companies_sold"); - b.HasIndex("SoldTo").HasName("idx_companies_sold_to"); + b.HasIndex("SoldToId").HasName("idx_companies_sold_to"); b.HasIndex("Status").HasName("idx_companies_status"); @@ -186,7 +186,7 @@ namespace Cicm.Database.Migrations b.HasKey("Id"); - b.HasIndex("CompanyId").HasName("idx_company_id"); + b.HasIndex("CompanyId").IsUnique().HasName("idx_company_id"); b.HasIndex("Text").HasName("idx_text"); @@ -247,7 +247,7 @@ namespace Cicm.Database.Migrations { b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)"); - b.Property("Company").HasColumnName("company").HasColumnType("int(11)"); + b.Property("CompanyId").HasColumnName("company").HasColumnType("int(11)"); b.Property("DieSize").HasColumnName("die_size"); @@ -268,7 +268,7 @@ namespace Cicm.Database.Migrations b.HasKey("Id"); - b.HasIndex("Company").HasName("idx_gpus_company"); + b.HasIndex("CompanyId").HasName("idx_gpus_company"); b.HasIndex("DieSize").HasName("idx_gpus_die_size"); @@ -293,15 +293,15 @@ namespace Cicm.Database.Migrations { b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("bigint(20)"); - b.Property("Gpu").HasColumnName("gpu").HasColumnType("int(11)"); + b.Property("GpuId").HasColumnName("gpu").HasColumnType("int(11)"); - b.Property("Machine").HasColumnName("machine").HasColumnType("int(11)"); + b.Property("MachineId").HasColumnName("machine").HasColumnType("int(11)"); b.HasKey("Id"); - b.HasIndex("Gpu").HasName("idx_gpus_by_machine_gpus"); + b.HasIndex("GpuId").HasName("idx_gpus_by_machine_gpus"); - b.HasIndex("Machine").HasName("idx_gpus_by_machine_machine"); + b.HasIndex("MachineId").HasName("idx_gpus_by_machine_machine"); b.ToTable("gpus_by_machine"); }); @@ -392,13 +392,13 @@ namespace Cicm.Database.Migrations { b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)"); - b.Property("Company").HasColumnName("company").HasColumnType("int(11)"); + b.Property("CompanyId").HasColumnName("company").HasColumnType("int(11)"); b.Property("Name").IsRequired().HasColumnName("name").HasColumnType("varchar(255)"); b.HasKey("Id"); - b.HasIndex("Company").HasName("idx_machine_families_company"); + b.HasIndex("CompanyId").HasName("idx_machine_families_company"); b.HasIndex("Name").HasName("idx_machine_families_name"); @@ -409,9 +409,10 @@ namespace Cicm.Database.Migrations { b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)"); - b.Property("Company").HasColumnName("company").HasColumnType("int(11)").HasDefaultValueSql("'0'"); + b.Property("CompanyId").ValueGeneratedOnAdd().HasColumnName("company").HasColumnType("int(11)") + .HasDefaultValueSql("'0'"); - b.Property("Family").HasColumnName("family").HasColumnType("int(11)"); + b.Property("FamilyId").HasColumnName("family").HasColumnType("int(11)"); b.Property("Introduced").HasColumnName("introduced").HasColumnType("datetime"); @@ -424,9 +425,9 @@ namespace Cicm.Database.Migrations b.HasKey("Id"); - b.HasIndex("Company").HasName("idx_machines_company"); + b.HasIndex("CompanyId").HasName("idx_machines_company"); - b.HasIndex("Family").HasName("idx_machines_family"); + b.HasIndex("FamilyId").HasName("idx_machines_family"); b.HasIndex("Introduced").HasName("idx_machines_introduced"); @@ -443,7 +444,7 @@ namespace Cicm.Database.Migrations { b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("bigint(20)"); - b.Property("Machine").HasColumnName("machine").HasColumnType("int(11)"); + b.Property("MachineId").HasColumnName("machine").HasColumnType("int(11)"); b.Property("Size").HasColumnName("size").HasColumnType("bigint(20)"); @@ -457,7 +458,7 @@ namespace Cicm.Database.Migrations b.HasKey("Id"); - b.HasIndex("Machine").HasName("idx_memory_by_machine_machine"); + b.HasIndex("MachineId").HasName("idx_memory_by_machine_machine"); b.HasIndex("Size").HasName("idx_memory_by_machine_size"); @@ -652,7 +653,7 @@ namespace Cicm.Database.Migrations b.Property("AddrBus").HasColumnName("addr_bus").HasColumnType("int(11)"); - b.Property("Company").HasColumnName("company").HasColumnType("int(11)"); + b.Property("CompanyId").HasColumnName("company").HasColumnType("int(11)"); b.Property("Cores").HasColumnName("cores").HasColumnType("int(11)"); @@ -668,7 +669,7 @@ namespace Cicm.Database.Migrations b.Property("Gprs").HasColumnName("GPRs").HasColumnType("int(11)"); - b.Property("InstructionSet").HasColumnName("instruction_set").HasColumnType("int(11)"); + b.Property("InstructionSetId").HasColumnName("instruction_set").HasColumnType("int(11)"); b.Property("Introduced").HasColumnName("introduced").HasColumnType("datetime"); @@ -705,7 +706,7 @@ namespace Cicm.Database.Migrations b.HasIndex("AddrBus").HasName("idx_processors_addr_bus"); - b.HasIndex("Company").HasName("idx_processors_company"); + b.HasIndex("CompanyId").HasName("idx_processors_company"); b.HasIndex("Cores").HasName("idx_processors_cores"); @@ -721,7 +722,7 @@ namespace Cicm.Database.Migrations b.HasIndex("Gprs").HasName("idx_processors_GPRs"); - b.HasIndex("InstructionSet").HasName("idx_processors_instruction_set"); + b.HasIndex("InstructionSetId").HasName("idx_processors_instruction_set"); b.HasIndex("Introduced").HasName("idx_processors_introduced"); @@ -760,17 +761,17 @@ namespace Cicm.Database.Migrations { b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("bigint(20)"); - b.Property("Machine").HasColumnName("machine").HasColumnType("int(11)"); + b.Property("MachineId").HasColumnName("machine").HasColumnType("int(11)"); - b.Property("Processor").HasColumnName("processor").HasColumnType("int(11)"); + b.Property("ProcessorId").HasColumnName("processor").HasColumnType("int(11)"); b.Property("Speed").HasColumnName("speed"); b.HasKey("Id"); - b.HasIndex("Machine").HasName("idx_processors_by_machine_machine"); + b.HasIndex("MachineId").HasName("idx_processors_by_machine_machine"); - b.HasIndex("Processor").HasName("idx_processors_by_machine_processor"); + b.HasIndex("ProcessorId").HasName("idx_processors_by_machine_processor"); b.HasIndex("Speed").HasName("idx_processors_by_machine_speed"); @@ -818,15 +819,15 @@ namespace Cicm.Database.Migrations { b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("bigint(20)"); - b.Property("Gpu").HasColumnName("gpu").HasColumnType("int(11)"); + b.Property("GpuId").HasColumnName("gpu").HasColumnType("int(11)"); - b.Property("Resolution").HasColumnName("resolution").HasColumnType("int(11)"); + b.Property("ResolutionId").HasColumnName("resolution").HasColumnType("int(11)"); b.HasKey("Id"); - b.HasIndex("Gpu").HasName("idx_resolutions_by_gpu_gpu"); + b.HasIndex("GpuId").HasName("idx_resolutions_by_gpu_gpu"); - b.HasIndex("Resolution").HasName("idx_resolutions_by_gpu_resolution"); + b.HasIndex("ResolutionId").HasName("idx_resolutions_by_gpu_resolution"); b.ToTable("resolutions_by_gpu"); }); @@ -835,15 +836,15 @@ namespace Cicm.Database.Migrations { b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("bigint(20)"); - b.Property("Machine").HasColumnName("machine").HasColumnType("int(11)"); + b.Property("MachineId").HasColumnName("machine").HasColumnType("int(11)"); - b.Property("SoundSynth").HasColumnName("sound_synth").HasColumnType("int(11)"); + b.Property("SoundSynthId").HasColumnName("sound_synth").HasColumnType("int(11)"); b.HasKey("Id"); - b.HasIndex("Machine").HasName("idx_sound_by_machine_machine"); + b.HasIndex("MachineId").HasName("idx_sound_by_machine_machine"); - b.HasIndex("SoundSynth").HasName("idx_sound_by_machine_sound_synth"); + b.HasIndex("SoundSynthId").HasName("idx_sound_by_machine_sound_synth"); b.ToTable("sound_by_machine"); }); @@ -852,7 +853,7 @@ namespace Cicm.Database.Migrations { b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)"); - b.Property("Company").HasColumnName("company").HasColumnType("int(11)"); + b.Property("CompanyId").HasColumnName("company").HasColumnType("int(11)"); b.Property("Depth").HasColumnName("depth").HasColumnType("int(11)"); @@ -875,7 +876,7 @@ namespace Cicm.Database.Migrations b.HasKey("Id"); - b.HasIndex("Company").HasName("idx_sound_synths_company"); + b.HasIndex("CompanyId").HasName("idx_sound_synths_company"); b.HasIndex("Depth").HasName("idx_sound_synths_depth"); @@ -907,7 +908,7 @@ namespace Cicm.Database.Migrations b.Property("Interface").ValueGeneratedOnAdd().HasColumnName("interface").HasColumnType("int(11)") .HasDefaultValueSql("'0'"); - b.Property("Machine").HasColumnName("machine").HasColumnType("int(11)"); + b.Property("MachineId").HasColumnName("machine").HasColumnType("int(11)"); b.Property("Type").ValueGeneratedOnAdd().HasColumnName("type").HasColumnType("int(11)") .HasDefaultValueSql("'0'"); @@ -918,7 +919,7 @@ namespace Cicm.Database.Migrations b.HasIndex("Interface").HasName("idx_storage_interface"); - b.HasIndex("Machine").HasName("idx_storage_machine"); + b.HasIndex("MachineId").HasName("idx_storage_machine"); b.HasIndex("Type").HasName("idx_storage_type"); @@ -927,18 +928,17 @@ namespace Cicm.Database.Migrations modelBuilder.Entity("Cicm.Database.Models.Companies", b => { - b.HasOne("Cicm.Database.Models.Iso31661Numeric", "CountryNavigation").WithMany("Companies") - .HasForeignKey("Country").HasConstraintName("fk_companies_country"); + b.HasOne("Cicm.Database.Models.Iso31661Numeric", "Country").WithMany("Companies") + .HasForeignKey("CountryId").HasConstraintName("fk_companies_country"); - b.HasOne("Cicm.Database.Models.Companies", "SoldToNavigation").WithMany("InverseSoldToNavigation") - .HasForeignKey("SoldTo").HasConstraintName("fk_companies_sold_to"); + b.HasOne("Cicm.Database.Models.Companies", "SoldTo").WithMany("InverseSoldToNavigation") + .HasForeignKey("SoldToId").HasConstraintName("fk_companies_sold_to"); }); modelBuilder.Entity("Cicm.Database.Models.CompanyDescriptions", b => { - b.HasOne("Cicm.Database.Models.Companies", "IdNavigation") - .WithOne("CompanyDescriptions") + b.HasOne("Cicm.Database.Models.Companies", "Company").WithOne("CompanyDescriptions") .HasForeignKey("Cicm.Database.Models.CompanyDescriptions", "Id") .HasConstraintName("fk_company_id").OnDelete(DeleteBehavior.Cascade); }); @@ -953,18 +953,17 @@ namespace Cicm.Database.Migrations modelBuilder.Entity("Cicm.Database.Models.Gpus", b => { - b.HasOne("Cicm.Database.Models.Companies", "CompanyNavigation").WithMany("Gpus") - .HasForeignKey("Company").HasConstraintName("fk_gpus_company"); + b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("Gpus") + .HasForeignKey("CompanyId").HasConstraintName("fk_gpus_company"); }); modelBuilder.Entity("Cicm.Database.Models.GpusByMachine", b => { - b.HasOne("Cicm.Database.Models.Gpus", "GpuNavigation").WithMany("GpusByMachine").HasForeignKey("Gpu") + b.HasOne("Cicm.Database.Models.Gpus", "Gpu").WithMany("GpusByMachine").HasForeignKey("GpuId") .HasConstraintName("fk_gpus_by_machine_gpu").OnDelete(DeleteBehavior.Cascade); - b.HasOne("Cicm.Database.Models.Machines", "MachineNavigation").WithMany("GpusByMachine") - .HasForeignKey("Machine").HasConstraintName("fk_gpus_by_machine_machine") - .OnDelete(DeleteBehavior.Cascade); + b.HasOne("Cicm.Database.Models.Machines", "Machine").WithMany("Gpus").HasForeignKey("MachineId") + .HasConstraintName("fk_gpus_by_machine_machine").OnDelete(DeleteBehavior.Cascade); }); modelBuilder.Entity("Cicm.Database.Models.InstructionSetExtensionsByProcessor", b => @@ -973,91 +972,86 @@ namespace Cicm.Database.Migrations .WithMany("InstructionSetExtensionsByProcessor").HasForeignKey("ExtensionId") .HasConstraintName("fk_extension_extension_id"); - b.HasOne("Cicm.Database.Models.Processors", "Processor").WithMany("InstructionSetExtensionsByProcessor") + b.HasOne("Cicm.Database.Models.Processors", "Processor").WithMany("InstructionSetExtensions") .HasForeignKey("ProcessorId").HasConstraintName("fk_extension_processor_id"); }); modelBuilder.Entity("Cicm.Database.Models.MachineFamilies", b => { - b.HasOne("Cicm.Database.Models.Companies", "CompanyNavigation") - .WithMany("MachineFamilies").HasForeignKey("Company") - .HasConstraintName("fk_machine_families_company").OnDelete(DeleteBehavior.Cascade); + b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("MachineFamilies") + .HasForeignKey("CompanyId").HasConstraintName("fk_machine_families_company") + .OnDelete(DeleteBehavior.Cascade); }); modelBuilder.Entity("Cicm.Database.Models.Machines", b => { - b.HasOne("Cicm.Database.Models.Companies", "CompanyNavigation").WithMany("Machines") - .HasForeignKey("Company").HasConstraintName("fk_machines_company"); + b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("Machines").HasForeignKey("CompanyId") + .HasConstraintName("fk_machines_company"); - b.HasOne("Cicm.Database.Models.MachineFamilies", "FamilyNavigation").WithMany("Machines") - .HasForeignKey("Family").HasConstraintName("fk_machines_family"); + b.HasOne("Cicm.Database.Models.MachineFamilies", "Family").WithMany("Machines") + .HasForeignKey("FamilyId").HasConstraintName("fk_machines_family"); }); modelBuilder.Entity("Cicm.Database.Models.MemoryByMachine", b => { - b.HasOne("Cicm.Database.Models.Machines", "MachineNavigation") - .WithMany("MemoryByMachine").HasForeignKey("Machine") - .HasConstraintName("fk_memory_by_machine_machine") + b.HasOne("Cicm.Database.Models.Machines", "Machine").WithMany("Memory") + .HasForeignKey("MachineId").HasConstraintName("fk_memory_by_machine_machine") .OnDelete(DeleteBehavior.Cascade); }); modelBuilder.Entity("Cicm.Database.Models.Processors", b => { - b.HasOne("Cicm.Database.Models.Companies", "CompanyNavigation").WithMany("Processors") - .HasForeignKey("Company").HasConstraintName("fk_processors_company"); + b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("Processors").HasForeignKey("CompanyId") + .HasConstraintName("fk_processors_company"); - b.HasOne("Cicm.Database.Models.InstructionSets", "InstructionSetNavigation").WithMany("Processors") - .HasForeignKey("InstructionSet").HasConstraintName("fk_processors_instruction_set"); + b.HasOne("Cicm.Database.Models.InstructionSets", "InstructionSet").WithMany("Processors") + .HasForeignKey("InstructionSetId").HasConstraintName("fk_processors_instruction_set"); }); modelBuilder.Entity("Cicm.Database.Models.ProcessorsByMachine", b => { - b.HasOne("Cicm.Database.Models.Machines", "MachineNavigation").WithMany("ProcessorsByMachine") - .HasForeignKey("Machine").HasConstraintName("fk_processors_by_machine_machine") - .OnDelete(DeleteBehavior.Cascade); + b.HasOne("Cicm.Database.Models.Machines", "Machine").WithMany("Processors").HasForeignKey("MachineId") + .HasConstraintName("fk_processors_by_machine_machine").OnDelete(DeleteBehavior.Cascade); - b.HasOne("Cicm.Database.Models.Processors", "ProcessorNavigation").WithMany("ProcessorsByMachine") - .HasForeignKey("Processor").HasConstraintName("fk_processors_by_machine_processor") + b.HasOne("Cicm.Database.Models.Processors", "Processor").WithMany("ProcessorsByMachine") + .HasForeignKey("ProcessorId").HasConstraintName("fk_processors_by_machine_processor") .OnDelete(DeleteBehavior.Cascade); }); modelBuilder.Entity("Cicm.Database.Models.ResolutionsByGpu", b => { - b.HasOne("Cicm.Database.Models.Gpus", "GpuNavigation").WithMany("ResolutionsByGpu").HasForeignKey("Gpu") + b.HasOne("Cicm.Database.Models.Gpus", "Gpu").WithMany("ResolutionsByGpu").HasForeignKey("GpuId") .HasConstraintName("fk_resolutions_by_gpu_gpu").OnDelete(DeleteBehavior.Cascade); - b.HasOne("Cicm.Database.Models.Resolutions", "ResolutionNavigation").WithMany("ResolutionsByGpu") - .HasForeignKey("Resolution").HasConstraintName("fk_resolutions_by_gpu_resolution") + b.HasOne("Cicm.Database.Models.Resolutions", "Resolution").WithMany("ResolutionsByGpu") + .HasForeignKey("ResolutionId").HasConstraintName("fk_resolutions_by_gpu_resolution") .OnDelete(DeleteBehavior.Cascade); }); modelBuilder.Entity("Cicm.Database.Models.SoundByMachine", b => { - b.HasOne("Cicm.Database.Models.Machines", "MachineNavigation").WithMany("SoundByMachine") - .HasForeignKey("Machine").HasConstraintName("fk_sound_by_machine_machine") - .OnDelete(DeleteBehavior.Cascade); + b.HasOne("Cicm.Database.Models.Machines", "Machine").WithMany("Sound").HasForeignKey("MachineId") + .HasConstraintName("fk_sound_by_machine_machine").OnDelete(DeleteBehavior.Cascade); - b.HasOne("Cicm.Database.Models.SoundSynths", "SoundSynthNavigation").WithMany("SoundByMachine") - .HasForeignKey("SoundSynth").HasConstraintName("fk_sound_by_machine_sound_synth") + b.HasOne("Cicm.Database.Models.SoundSynths", "SoundSynth").WithMany("SoundByMachine") + .HasForeignKey("SoundSynthId").HasConstraintName("fk_sound_by_machine_sound_synth") .OnDelete(DeleteBehavior.Cascade); }); modelBuilder.Entity("Cicm.Database.Models.SoundSynths", b => { - b.HasOne("Cicm.Database.Models.Companies", "CompanyNavigation") - .WithMany("SoundSynths").HasForeignKey("Company") - .HasConstraintName("fk_sound_synths_company"); + b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("SoundSynths") + .HasForeignKey("CompanyId").HasConstraintName("fk_sound_synths_company"); }); modelBuilder.Entity("Cicm.Database.Models.StorageByMachine", b => { - b.HasOne("Cicm.Database.Models.Machines", "MachineNavigation") - .WithMany("StorageByMachine").HasForeignKey("Machine") - .HasConstraintName("fk_storage_by_machine_machine") + b.HasOne("Cicm.Database.Models.Machines", "Machine").WithMany("Storage") + .HasForeignKey("MachineId").HasConstraintName("fk_storage_by_machine_machine") .OnDelete(DeleteBehavior.Cascade); }); #pragma warning restore 612, 618 diff --git a/Cicm.Database/Models/Companies.cs b/Cicm.Database/Models/Companies.cs index 1c3ba7a4..37bf08c9 100644 --- a/Cicm.Database/Models/Companies.cs +++ b/Cicm.Database/Models/Companies.cs @@ -23,16 +23,16 @@ namespace Cicm.Database.Models public string Twitter { get; set; } public string Facebook { get; set; } public DateTime? Sold { get; set; } - public int? SoldTo { get; set; } + public int? SoldToId { get; set; } public string Address { get; set; } public string City { get; set; } public string Province { get; set; } public string PostalCode { get; set; } - public short? Country { get; set; } + public short? CountryId { get; set; } public int Status { get; set; } - public Iso31661Numeric CountryNavigation { get; set; } - public Companies SoldToNavigation { get; set; } + public Iso31661Numeric Country { get; set; } + public Companies SoldTo { get; set; } public CompanyDescriptions CompanyDescriptions { get; set; } public ICollection CompanyLogos { get; set; } public ICollection Gpus { get; set; } diff --git a/Cicm.Database/Models/CompanyDescriptions.cs b/Cicm.Database/Models/CompanyDescriptions.cs index ba21964c..49b376c9 100644 --- a/Cicm.Database/Models/CompanyDescriptions.cs +++ b/Cicm.Database/Models/CompanyDescriptions.cs @@ -6,6 +6,6 @@ public int CompanyId { get; set; } public string Text { get; set; } - public Companies IdNavigation { get; set; } + public Companies Company { get; set; } } } \ No newline at end of file diff --git a/Cicm.Database/Models/Gpus.cs b/Cicm.Database/Models/Gpus.cs index 5f31b96b..6d675f74 100644 --- a/Cicm.Database/Models/Gpus.cs +++ b/Cicm.Database/Models/Gpus.cs @@ -13,7 +13,7 @@ namespace Cicm.Database.Models public int Id { get; set; } public string Name { get; set; } - public int? Company { get; set; } + public int? CompanyId { get; set; } public string ModelCode { get; set; } public DateTime? Introduced { get; set; } public string Package { get; set; } @@ -22,8 +22,8 @@ namespace Cicm.Database.Models public float? DieSize { get; set; } public long? Transistors { get; set; } - public Companies CompanyNavigation { get; set; } - public ICollection GpusByMachine { get; set; } - public ICollection ResolutionsByGpu { get; set; } + public Companies Company { get; set; } + public ICollection GpusByMachine { get; set; } + public ICollection ResolutionsByGpu { get; set; } } } \ No newline at end of file diff --git a/Cicm.Database/Models/GpusByMachine.cs b/Cicm.Database/Models/GpusByMachine.cs index 65d0b777..0d656a01 100644 --- a/Cicm.Database/Models/GpusByMachine.cs +++ b/Cicm.Database/Models/GpusByMachine.cs @@ -2,11 +2,11 @@ { public class GpusByMachine { - public int Gpu { get; set; } - public int Machine { get; set; } - public long Id { get; set; } + public int GpuId { get; set; } + public int MachineId { get; set; } + public long Id { get; set; } - public Gpus GpuNavigation { get; set; } - public Machines MachineNavigation { get; set; } + public Gpus Gpu { get; set; } + public Machines Machine { get; set; } } } \ No newline at end of file diff --git a/Cicm.Database/Models/MachineFamilies.cs b/Cicm.Database/Models/MachineFamilies.cs index 6fbc76ed..9aef949f 100644 --- a/Cicm.Database/Models/MachineFamilies.cs +++ b/Cicm.Database/Models/MachineFamilies.cs @@ -9,11 +9,11 @@ namespace Cicm.Database.Models Machines = new HashSet(); } - public int Id { get; set; } - public int Company { get; set; } - public string Name { get; set; } + public int Id { get; set; } + public int CompanyId { get; set; } + public string Name { get; set; } - public Companies CompanyNavigation { get; set; } - public ICollection Machines { get; set; } + public Companies Company { get; set; } + public ICollection Machines { get; set; } } } \ No newline at end of file diff --git a/Cicm.Database/Models/Machines.cs b/Cicm.Database/Models/Machines.cs index a01a155e..a51a84c9 100644 --- a/Cicm.Database/Models/Machines.cs +++ b/Cicm.Database/Models/Machines.cs @@ -7,27 +7,27 @@ namespace Cicm.Database.Models { public Machines() { - GpusByMachine = new HashSet(); - MemoryByMachine = new HashSet(); - ProcessorsByMachine = new HashSet(); - SoundByMachine = new HashSet(); - StorageByMachine = new HashSet(); + Gpus = new HashSet(); + Memory = new HashSet(); + Processors = new HashSet(); + Sound = new HashSet(); + Storage = new HashSet(); } public int Id { get; set; } - public int Company { get; set; } + public int CompanyId { get; set; } public string Name { get; set; } public int Type { get; set; } public DateTime? Introduced { get; set; } - public int? Family { get; set; } + public int? FamilyId { get; set; } public string Model { get; set; } - public Companies CompanyNavigation { get; set; } - public MachineFamilies FamilyNavigation { get; set; } - public ICollection GpusByMachine { get; set; } - public ICollection MemoryByMachine { get; set; } - public ICollection ProcessorsByMachine { get; set; } - public ICollection SoundByMachine { get; set; } - public ICollection StorageByMachine { get; set; } + public Companies Company { get; set; } + public MachineFamilies Family { get; set; } + public ICollection Gpus { get; set; } + public ICollection Memory { get; set; } + public ICollection Processors { get; set; } + public ICollection Sound { get; set; } + public ICollection Storage { get; set; } } } \ No newline at end of file diff --git a/Cicm.Database/Models/MemoryByMachine.cs b/Cicm.Database/Models/MemoryByMachine.cs index 2ac198aa..0bbe1484 100644 --- a/Cicm.Database/Models/MemoryByMachine.cs +++ b/Cicm.Database/Models/MemoryByMachine.cs @@ -2,13 +2,13 @@ { public class MemoryByMachine { - public int Machine { get; set; } - public int Type { get; set; } - public int Usage { get; set; } - public long? Size { get; set; } - public double? Speed { get; set; } - public long Id { get; set; } + public int MachineId { get; set; } + public int Type { get; set; } + public int Usage { get; set; } + public long? Size { get; set; } + public double? Speed { get; set; } + public long Id { get; set; } - public Machines MachineNavigation { get; set; } + public Machines Machine { get; set; } } } \ No newline at end of file diff --git a/Cicm.Database/Models/Processors.cs b/Cicm.Database/Models/Processors.cs index a84c9c6c..3c34720c 100644 --- a/Cicm.Database/Models/Processors.cs +++ b/Cicm.Database/Models/Processors.cs @@ -7,40 +7,40 @@ namespace Cicm.Database.Models { public Processors() { - InstructionSetExtensionsByProcessor = new HashSet(); - ProcessorsByMachine = new HashSet(); + InstructionSetExtensions = new HashSet(); + ProcessorsByMachine = new HashSet(); } - public int Id { get; set; } - public string Name { get; set; } - public int? Company { get; set; } - public string ModelCode { get; set; } - public DateTime? Introduced { get; set; } - public int? InstructionSet { get; set; } - public double? Speed { get; set; } - public string Package { get; set; } - public int? Gprs { get; set; } - public int? GprSize { get; set; } - public int? Fprs { get; set; } - public int? FprSize { get; set; } - public int? Cores { get; set; } - public int? ThreadsPerCore { get; set; } - public string Process { get; set; } - public float? ProcessNm { get; set; } - public float? DieSize { get; set; } - public long? Transistors { get; set; } - public int? DataBus { get; set; } - public int? AddrBus { get; set; } - public int? SimdRegisters { get; set; } - public int? SimdSize { get; set; } - public float? L1Instruction { get; set; } - public float? L1Data { get; set; } - public float? L2 { get; set; } - public float? L3 { get; set; } + public int Id { get; set; } + public string Name { get; set; } + public int? CompanyId { get; set; } + public string ModelCode { get; set; } + public DateTime? Introduced { get; set; } + public int? InstructionSetId { get; set; } + public double? Speed { get; set; } + public string Package { get; set; } + public int? Gprs { get; set; } + public int? GprSize { get; set; } + public int? Fprs { get; set; } + public int? FprSize { get; set; } + public int? Cores { get; set; } + public int? ThreadsPerCore { get; set; } + public string Process { get; set; } + public float? ProcessNm { get; set; } + public float? DieSize { get; set; } + public long? Transistors { get; set; } + public int? DataBus { get; set; } + public int? AddrBus { get; set; } + public int? SimdRegisters { get; set; } + public int? SimdSize { get; set; } + public float? L1Instruction { get; set; } + public float? L1Data { get; set; } + public float? L2 { get; set; } + public float? L3 { get; set; } - public Companies CompanyNavigation { get; set; } - public InstructionSets InstructionSetNavigation { get; set; } - public ICollection InstructionSetExtensionsByProcessor { get; set; } - public ICollection ProcessorsByMachine { get; set; } + public Companies Company { get; set; } + public InstructionSets InstructionSet { get; set; } + public ICollection InstructionSetExtensions { get; set; } + public ICollection ProcessorsByMachine { get; set; } } } \ No newline at end of file diff --git a/Cicm.Database/Models/ProcessorsByMachine.cs b/Cicm.Database/Models/ProcessorsByMachine.cs index 884d85fc..f026a276 100644 --- a/Cicm.Database/Models/ProcessorsByMachine.cs +++ b/Cicm.Database/Models/ProcessorsByMachine.cs @@ -2,12 +2,12 @@ { public class ProcessorsByMachine { - public int Processor { get; set; } - public int Machine { get; set; } - public float? Speed { get; set; } - public long Id { get; set; } + public int ProcessorId { get; set; } + public int MachineId { get; set; } + public float? Speed { get; set; } + public long Id { get; set; } - public Machines MachineNavigation { get; set; } - public Processors ProcessorNavigation { get; set; } + public Machines Machine { get; set; } + public Processors Processor { get; set; } } } \ No newline at end of file diff --git a/Cicm.Database/Models/ResolutionsByGpu.cs b/Cicm.Database/Models/ResolutionsByGpu.cs index 0025ab59..da6b1ffb 100644 --- a/Cicm.Database/Models/ResolutionsByGpu.cs +++ b/Cicm.Database/Models/ResolutionsByGpu.cs @@ -2,11 +2,11 @@ { public class ResolutionsByGpu { - public int Gpu { get; set; } - public int Resolution { get; set; } - public long Id { get; set; } + public int GpuId { get; set; } + public int ResolutionId { get; set; } + public long Id { get; set; } - public Gpus GpuNavigation { get; set; } - public Resolutions ResolutionNavigation { get; set; } + public Gpus Gpu { get; set; } + public Resolutions Resolution { get; set; } } } \ No newline at end of file diff --git a/Cicm.Database/Models/SoundByMachine.cs b/Cicm.Database/Models/SoundByMachine.cs index 2ad4e0b1..2819518a 100644 --- a/Cicm.Database/Models/SoundByMachine.cs +++ b/Cicm.Database/Models/SoundByMachine.cs @@ -2,11 +2,11 @@ { public class SoundByMachine { - public int SoundSynth { get; set; } - public int Machine { get; set; } - public long Id { get; set; } + public int SoundSynthId { get; set; } + public int MachineId { get; set; } + public long Id { get; set; } - public Machines MachineNavigation { get; set; } - public SoundSynths SoundSynthNavigation { get; set; } + public Machines Machine { get; set; } + public SoundSynths SoundSynth { get; set; } } } \ No newline at end of file diff --git a/Cicm.Database/Models/SoundSynths.cs b/Cicm.Database/Models/SoundSynths.cs index 2c6fa34d..db8d0188 100644 --- a/Cicm.Database/Models/SoundSynths.cs +++ b/Cicm.Database/Models/SoundSynths.cs @@ -12,7 +12,7 @@ namespace Cicm.Database.Models public int Id { get; set; } public string Name { get; set; } - public int? Company { get; set; } + public int? CompanyId { get; set; } public string ModelCode { get; set; } public DateTime? Introduced { get; set; } public int? Voices { get; set; } @@ -22,7 +22,7 @@ namespace Cicm.Database.Models public int? WhiteNoise { get; set; } public int? Type { get; set; } - public Companies CompanyNavigation { get; set; } - public ICollection SoundByMachine { get; set; } + public Companies Company { get; set; } + public ICollection SoundByMachine { get; set; } } } \ No newline at end of file diff --git a/Cicm.Database/Models/StorageByMachine.cs b/Cicm.Database/Models/StorageByMachine.cs index a52ba1a5..a542987c 100644 --- a/Cicm.Database/Models/StorageByMachine.cs +++ b/Cicm.Database/Models/StorageByMachine.cs @@ -2,12 +2,12 @@ { public class StorageByMachine { - public int Machine { get; set; } + public int MachineId { get; set; } public int Type { get; set; } public int Interface { get; set; } public long? Capacity { get; set; } public long Id { get; set; } - public Machines MachineNavigation { get; set; } + public Machines Machine { get; set; } } } \ No newline at end of file diff --git a/Cicm.Database/Models/cicmContext.cs b/Cicm.Database/Models/cicmContext.cs index db46658f..9103c24f 100644 --- a/Cicm.Database/Models/cicmContext.cs +++ b/Cicm.Database/Models/cicmContext.cs @@ -37,6 +37,15 @@ namespace Cicm.Database.Models public virtual DbSet SoundSynths { get; set; } public virtual DbSet StorageByMachine { get; set; } + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + if(!optionsBuilder.IsConfigured) + { + #warning To protect potentially sensitive information in your connection string, you should move it out of source code. See http://go.microsoft.com/fwlink/?LinkId=723263 for guidance on storing connection strings. + optionsBuilder.UseMySql("server=localhost;port=3306;user=cicm;password=cicmpass;database=cicm"); + } + } + protected override void OnModelCreating(ModelBuilder modelBuilder) { modelBuilder.Entity(entity => @@ -137,7 +146,7 @@ namespace Cicm.Database.Models entity.HasIndex(e => e.City).HasName("idx_companies_city"); - entity.HasIndex(e => e.Country).HasName("idx_companies_country"); + entity.HasIndex(e => e.CountryId).HasName("idx_companies_country"); entity.HasIndex(e => e.Facebook).HasName("idx_companies_facebook"); @@ -151,7 +160,7 @@ namespace Cicm.Database.Models entity.HasIndex(e => e.Sold).HasName("idx_companies_sold"); - entity.HasIndex(e => e.SoldTo).HasName("idx_companies_sold_to"); + entity.HasIndex(e => e.SoldToId).HasName("idx_companies_sold_to"); entity.HasIndex(e => e.Status).HasName("idx_companies_status"); @@ -165,7 +174,7 @@ namespace Cicm.Database.Models entity.Property(e => e.City).HasColumnName("city").HasColumnType("varchar(80)"); - entity.Property(e => e.Country).HasColumnName("country").HasColumnType("smallint(3)"); + entity.Property(e => e.CountryId).HasColumnName("country").HasColumnType("smallint(3)"); entity.Property(e => e.Facebook).HasColumnName("facebook").HasColumnType("varchar(45)"); @@ -180,7 +189,7 @@ namespace Cicm.Database.Models entity.Property(e => e.Sold).HasColumnName("sold").HasColumnType("datetime"); - entity.Property(e => e.SoldTo).HasColumnName("sold_to").HasColumnType("int(11)"); + entity.Property(e => e.SoldToId).HasColumnName("sold_to").HasColumnType("int(11)"); entity.Property(e => e.Status).HasColumnName("status").HasColumnType("int(11)"); @@ -188,11 +197,11 @@ namespace Cicm.Database.Models entity.Property(e => e.Website).HasColumnName("website").HasColumnType("varchar(255)"); - entity.HasOne(d => d.CountryNavigation).WithMany(p => p.Companies).HasForeignKey(d => d.Country) + entity.HasOne(d => d.Country).WithMany(p => p.Companies).HasForeignKey(d => d.CountryId) .HasConstraintName("fk_companies_country"); - entity.HasOne(d => d.SoldToNavigation).WithMany(p => p.InverseSoldToNavigation) - .HasForeignKey(d => d.SoldTo).HasConstraintName("fk_companies_sold_to"); + entity.HasOne(d => d.SoldTo).WithMany(p => p.InverseSoldToNavigation).HasForeignKey(d => d.SoldToId) + .HasConstraintName("fk_companies_sold_to"); }); modelBuilder.Entity(entity => @@ -209,7 +218,7 @@ namespace Cicm.Database.Models entity.Property(e => e.Text).HasColumnName("text").HasColumnType("text"); - entity.HasOne(d => d.IdNavigation).WithOne(p => p.CompanyDescriptions) + entity.HasOne(d => d.Company).WithOne(p => p.CompanyDescriptions) .HasForeignKey(d => d.Id).HasConstraintName("fk_company_id"); }); @@ -268,7 +277,7 @@ namespace Cicm.Database.Models { entity.ToTable("gpus"); - entity.HasIndex(e => e.Company).HasName("idx_gpus_company"); + entity.HasIndex(e => e.CompanyId).HasName("idx_gpus_company"); entity.HasIndex(e => e.DieSize).HasName("idx_gpus_die_size"); @@ -288,7 +297,7 @@ namespace Cicm.Database.Models entity.Property(e => e.Id).HasColumnName("id").HasColumnType("int(11)"); - entity.Property(e => e.Company).HasColumnName("company").HasColumnType("int(11)"); + entity.Property(e => e.CompanyId).HasColumnName("company").HasColumnType("int(11)"); entity.Property(e => e.DieSize).HasColumnName("die_size"); @@ -307,7 +316,7 @@ namespace Cicm.Database.Models entity.Property(e => e.Transistors).HasColumnName("transistors").HasColumnType("bigint(20)"); - entity.HasOne(d => d.CompanyNavigation).WithMany(p => p.Gpus).HasForeignKey(d => d.Company) + entity.HasOne(d => d.Company).WithMany(p => p.Gpus).HasForeignKey(d => d.CompanyId) .HasConstraintName("fk_gpus_company"); }); @@ -315,20 +324,20 @@ namespace Cicm.Database.Models { entity.ToTable("gpus_by_machine"); - entity.HasIndex(e => e.Gpu).HasName("idx_gpus_by_machine_gpus"); + entity.HasIndex(e => e.GpuId).HasName("idx_gpus_by_machine_gpus"); - entity.HasIndex(e => e.Machine).HasName("idx_gpus_by_machine_machine"); + entity.HasIndex(e => e.MachineId).HasName("idx_gpus_by_machine_machine"); entity.Property(e => e.Id).HasColumnName("id").HasColumnType("bigint(20)"); - entity.Property(e => e.Gpu).HasColumnName("gpu").HasColumnType("int(11)"); + entity.Property(e => e.GpuId).HasColumnName("gpu").HasColumnType("int(11)"); - entity.Property(e => e.Machine).HasColumnName("machine").HasColumnType("int(11)"); + entity.Property(e => e.MachineId).HasColumnName("machine").HasColumnType("int(11)"); - entity.HasOne(d => d.GpuNavigation).WithMany(p => p.GpusByMachine).HasForeignKey(d => d.Gpu) + entity.HasOne(d => d.Gpu).WithMany(p => p.GpusByMachine).HasForeignKey(d => d.GpuId) .HasConstraintName("fk_gpus_by_machine_gpu"); - entity.HasOne(d => d.MachineNavigation).WithMany(p => p.GpusByMachine).HasForeignKey(d => d.Machine) + entity.HasOne(d => d.Machine).WithMany(p => p.Gpus).HasForeignKey(d => d.MachineId) .HasConstraintName("fk_gpus_by_machine_machine"); }); @@ -361,7 +370,7 @@ namespace Cicm.Database.Models .HasForeignKey(d => d.ExtensionId).OnDelete(DeleteBehavior.ClientSetNull) .HasConstraintName("fk_extension_extension_id"); - entity.HasOne(d => d.Processor).WithMany(p => p.InstructionSetExtensionsByProcessor) + entity.HasOne(d => d.Processor).WithMany(p => p.InstructionSetExtensions) .HasForeignKey(d => d.ProcessorId).OnDelete(DeleteBehavior.ClientSetNull) .HasConstraintName("fk_extension_processor_id"); }); @@ -418,17 +427,17 @@ namespace Cicm.Database.Models { entity.ToTable("machine_families"); - entity.HasIndex(e => e.Company).HasName("idx_machine_families_company"); + entity.HasIndex(e => e.CompanyId).HasName("idx_machine_families_company"); entity.HasIndex(e => e.Name).HasName("idx_machine_families_name"); entity.Property(e => e.Id).HasColumnName("id").HasColumnType("int(11)"); - entity.Property(e => e.Company).HasColumnName("company").HasColumnType("int(11)"); + entity.Property(e => e.CompanyId).HasColumnName("company").HasColumnType("int(11)"); entity.Property(e => e.Name).IsRequired().HasColumnName("name").HasColumnType("varchar(255)"); - entity.HasOne(d => d.CompanyNavigation).WithMany(p => p.MachineFamilies).HasForeignKey(d => d.Company) + entity.HasOne(d => d.Company).WithMany(p => p.MachineFamilies).HasForeignKey(d => d.CompanyId) .HasConstraintName("fk_machine_families_company"); }); @@ -436,9 +445,9 @@ namespace Cicm.Database.Models { entity.ToTable("machines"); - entity.HasIndex(e => e.Company).HasName("idx_machines_company"); + entity.HasIndex(e => e.CompanyId).HasName("idx_machines_company"); - entity.HasIndex(e => e.Family).HasName("idx_machines_family"); + entity.HasIndex(e => e.FamilyId).HasName("idx_machines_family"); entity.HasIndex(e => e.Introduced).HasName("idx_machines_introduced"); @@ -450,10 +459,10 @@ namespace Cicm.Database.Models entity.Property(e => e.Id).HasColumnName("id").HasColumnType("int(11)"); - entity.Property(e => e.Company).HasColumnName("company").HasColumnType("int(11)") + entity.Property(e => e.CompanyId).HasColumnName("company").HasColumnType("int(11)") .HasDefaultValueSql("'0'"); - entity.Property(e => e.Family).HasColumnName("family").HasColumnType("int(11)"); + entity.Property(e => e.FamilyId).HasColumnName("family").HasColumnType("int(11)"); entity.Property(e => e.Introduced).HasColumnName("introduced").HasColumnType("datetime"); @@ -463,10 +472,10 @@ namespace Cicm.Database.Models entity.Property(e => e.Type).HasColumnName("type").HasColumnType("int(11)").HasDefaultValueSql("'0'"); - entity.HasOne(d => d.CompanyNavigation).WithMany(p => p.Machines).HasForeignKey(d => d.Company) + entity.HasOne(d => d.Company).WithMany(p => p.Machines).HasForeignKey(d => d.CompanyId) .OnDelete(DeleteBehavior.ClientSetNull).HasConstraintName("fk_machines_company"); - entity.HasOne(d => d.FamilyNavigation).WithMany(p => p.Machines).HasForeignKey(d => d.Family) + entity.HasOne(d => d.Family).WithMany(p => p.Machines).HasForeignKey(d => d.FamilyId) .HasConstraintName("fk_machines_family"); }); @@ -474,7 +483,7 @@ namespace Cicm.Database.Models { entity.ToTable("memory_by_machine"); - entity.HasIndex(e => e.Machine).HasName("idx_memory_by_machine_machine"); + entity.HasIndex(e => e.MachineId).HasName("idx_memory_by_machine_machine"); entity.HasIndex(e => e.Size).HasName("idx_memory_by_machine_size"); @@ -486,7 +495,7 @@ namespace Cicm.Database.Models entity.Property(e => e.Id).HasColumnName("id").HasColumnType("bigint(20)"); - entity.Property(e => e.Machine).HasColumnName("machine").HasColumnType("int(11)"); + entity.Property(e => e.MachineId).HasColumnName("machine").HasColumnType("int(11)"); entity.Property(e => e.Size).HasColumnName("size").HasColumnType("bigint(20)"); @@ -496,7 +505,7 @@ namespace Cicm.Database.Models entity.Property(e => e.Usage).HasColumnName("usage").HasColumnType("int(11)").HasDefaultValueSql("'0'"); - entity.HasOne(d => d.MachineNavigation).WithMany(p => p.MemoryByMachine).HasForeignKey(d => d.Machine) + entity.HasOne(d => d.Machine).WithMany(p => p.Memory).HasForeignKey(d => d.MachineId) .HasConstraintName("fk_memory_by_machine_machine"); }); @@ -659,7 +668,7 @@ namespace Cicm.Database.Models entity.HasIndex(e => e.AddrBus).HasName("idx_processors_addr_bus"); - entity.HasIndex(e => e.Company).HasName("idx_processors_company"); + entity.HasIndex(e => e.CompanyId).HasName("idx_processors_company"); entity.HasIndex(e => e.Cores).HasName("idx_processors_cores"); @@ -675,7 +684,7 @@ namespace Cicm.Database.Models entity.HasIndex(e => e.Gprs).HasName("idx_processors_GPRs"); - entity.HasIndex(e => e.InstructionSet).HasName("idx_processors_instruction_set"); + entity.HasIndex(e => e.InstructionSetId).HasName("idx_processors_instruction_set"); entity.HasIndex(e => e.Introduced).HasName("idx_processors_introduced"); @@ -711,7 +720,7 @@ namespace Cicm.Database.Models entity.Property(e => e.AddrBus).HasColumnName("addr_bus").HasColumnType("int(11)"); - entity.Property(e => e.Company).HasColumnName("company").HasColumnType("int(11)"); + entity.Property(e => e.CompanyId).HasColumnName("company").HasColumnType("int(11)"); entity.Property(e => e.Cores).HasColumnName("cores").HasColumnType("int(11)"); @@ -727,7 +736,7 @@ namespace Cicm.Database.Models entity.Property(e => e.Gprs).HasColumnName("GPRs").HasColumnType("int(11)"); - entity.Property(e => e.InstructionSet).HasColumnName("instruction_set").HasColumnType("int(11)"); + entity.Property(e => e.InstructionSetId).HasColumnName("instruction_set").HasColumnType("int(11)"); entity.Property(e => e.Introduced).HasColumnName("introduced").HasColumnType("datetime"); @@ -756,36 +765,36 @@ namespace Cicm.Database.Models entity.Property(e => e.Transistors).HasColumnName("transistors").HasColumnType("bigint(20)"); - entity.HasOne(d => d.CompanyNavigation).WithMany(p => p.Processors).HasForeignKey(d => d.Company) + entity.HasOne(d => d.Company).WithMany(p => p.Processors).HasForeignKey(d => d.CompanyId) .HasConstraintName("fk_processors_company"); - entity.HasOne(d => d.InstructionSetNavigation).WithMany(p => p.Processors) - .HasForeignKey(d => d.InstructionSet).HasConstraintName("fk_processors_instruction_set"); + entity.HasOne(d => d.InstructionSet).WithMany(p => p.Processors).HasForeignKey(d => d.InstructionSetId) + .HasConstraintName("fk_processors_instruction_set"); }); modelBuilder.Entity(entity => { entity.ToTable("processors_by_machine"); - entity.HasIndex(e => e.Machine).HasName("idx_processors_by_machine_machine"); + entity.HasIndex(e => e.MachineId).HasName("idx_processors_by_machine_machine"); - entity.HasIndex(e => e.Processor).HasName("idx_processors_by_machine_processor"); + entity.HasIndex(e => e.ProcessorId).HasName("idx_processors_by_machine_processor"); entity.HasIndex(e => e.Speed).HasName("idx_processors_by_machine_speed"); entity.Property(e => e.Id).HasColumnName("id").HasColumnType("bigint(20)"); - entity.Property(e => e.Machine).HasColumnName("machine").HasColumnType("int(11)"); + entity.Property(e => e.MachineId).HasColumnName("machine").HasColumnType("int(11)"); - entity.Property(e => e.Processor).HasColumnName("processor").HasColumnType("int(11)"); + entity.Property(e => e.ProcessorId).HasColumnName("processor").HasColumnType("int(11)"); entity.Property(e => e.Speed).HasColumnName("speed"); - entity.HasOne(d => d.MachineNavigation).WithMany(p => p.ProcessorsByMachine) - .HasForeignKey(d => d.Machine).HasConstraintName("fk_processors_by_machine_machine"); + entity.HasOne(d => d.Machine).WithMany(p => p.Processors).HasForeignKey(d => d.MachineId) + .HasConstraintName("fk_processors_by_machine_machine"); - entity.HasOne(d => d.ProcessorNavigation).WithMany(p => p.ProcessorsByMachine) - .HasForeignKey(d => d.Processor).HasConstraintName("fk_processors_by_machine_processor"); + entity.HasOne(d => d.Processor).WithMany(p => p.ProcessorsByMachine).HasForeignKey(d => d.ProcessorId) + .HasConstraintName("fk_processors_by_machine_processor"); }); modelBuilder.Entity(entity => @@ -827,49 +836,49 @@ namespace Cicm.Database.Models { entity.ToTable("resolutions_by_gpu"); - entity.HasIndex(e => e.Gpu).HasName("idx_resolutions_by_gpu_gpu"); + entity.HasIndex(e => e.GpuId).HasName("idx_resolutions_by_gpu_gpu"); - entity.HasIndex(e => e.Resolution).HasName("idx_resolutions_by_gpu_resolution"); + entity.HasIndex(e => e.ResolutionId).HasName("idx_resolutions_by_gpu_resolution"); entity.Property(e => e.Id).HasColumnName("id").HasColumnType("bigint(20)"); - entity.Property(e => e.Gpu).HasColumnName("gpu").HasColumnType("int(11)"); + entity.Property(e => e.GpuId).HasColumnName("gpu").HasColumnType("int(11)"); - entity.Property(e => e.Resolution).HasColumnName("resolution").HasColumnType("int(11)"); + entity.Property(e => e.ResolutionId).HasColumnName("resolution").HasColumnType("int(11)"); - entity.HasOne(d => d.GpuNavigation).WithMany(p => p.ResolutionsByGpu).HasForeignKey(d => d.Gpu) + entity.HasOne(d => d.Gpu).WithMany(p => p.ResolutionsByGpu).HasForeignKey(d => d.GpuId) .HasConstraintName("fk_resolutions_by_gpu_gpu"); - entity.HasOne(d => d.ResolutionNavigation).WithMany(p => p.ResolutionsByGpu) - .HasForeignKey(d => d.Resolution).HasConstraintName("fk_resolutions_by_gpu_resolution"); + entity.HasOne(d => d.Resolution).WithMany(p => p.ResolutionsByGpu).HasForeignKey(d => d.ResolutionId) + .HasConstraintName("fk_resolutions_by_gpu_resolution"); }); modelBuilder.Entity(entity => { entity.ToTable("sound_by_machine"); - entity.HasIndex(e => e.Machine).HasName("idx_sound_by_machine_machine"); + entity.HasIndex(e => e.MachineId).HasName("idx_sound_by_machine_machine"); - entity.HasIndex(e => e.SoundSynth).HasName("idx_sound_by_machine_sound_synth"); + entity.HasIndex(e => e.SoundSynthId).HasName("idx_sound_by_machine_sound_synth"); entity.Property(e => e.Id).HasColumnName("id").HasColumnType("bigint(20)"); - entity.Property(e => e.Machine).HasColumnName("machine").HasColumnType("int(11)"); + entity.Property(e => e.MachineId).HasColumnName("machine").HasColumnType("int(11)"); - entity.Property(e => e.SoundSynth).HasColumnName("sound_synth").HasColumnType("int(11)"); + entity.Property(e => e.SoundSynthId).HasColumnName("sound_synth").HasColumnType("int(11)"); - entity.HasOne(d => d.MachineNavigation).WithMany(p => p.SoundByMachine).HasForeignKey(d => d.Machine) + entity.HasOne(d => d.Machine).WithMany(p => p.Sound).HasForeignKey(d => d.MachineId) .HasConstraintName("fk_sound_by_machine_machine"); - entity.HasOne(d => d.SoundSynthNavigation).WithMany(p => p.SoundByMachine) - .HasForeignKey(d => d.SoundSynth).HasConstraintName("fk_sound_by_machine_sound_synth"); + entity.HasOne(d => d.SoundSynth).WithMany(p => p.SoundByMachine).HasForeignKey(d => d.SoundSynthId) + .HasConstraintName("fk_sound_by_machine_sound_synth"); }); modelBuilder.Entity(entity => { entity.ToTable("sound_synths"); - entity.HasIndex(e => e.Company).HasName("idx_sound_synths_company"); + entity.HasIndex(e => e.CompanyId).HasName("idx_sound_synths_company"); entity.HasIndex(e => e.Depth).HasName("idx_sound_synths_depth"); @@ -891,7 +900,7 @@ namespace Cicm.Database.Models entity.Property(e => e.Id).HasColumnName("id").HasColumnType("int(11)"); - entity.Property(e => e.Company).HasColumnName("company").HasColumnType("int(11)"); + entity.Property(e => e.CompanyId).HasColumnName("company").HasColumnType("int(11)"); entity.Property(e => e.Depth).HasColumnName("depth").HasColumnType("int(11)"); @@ -912,7 +921,7 @@ namespace Cicm.Database.Models entity.Property(e => e.WhiteNoise).HasColumnName("white_noise").HasColumnType("int(11)"); - entity.HasOne(d => d.CompanyNavigation).WithMany(p => p.SoundSynths).HasForeignKey(d => d.Company) + entity.HasOne(d => d.Company).WithMany(p => p.SoundSynths).HasForeignKey(d => d.CompanyId) .HasConstraintName("fk_sound_synths_company"); }); @@ -924,7 +933,7 @@ namespace Cicm.Database.Models entity.HasIndex(e => e.Interface).HasName("idx_storage_interface"); - entity.HasIndex(e => e.Machine).HasName("idx_storage_machine"); + entity.HasIndex(e => e.MachineId).HasName("idx_storage_machine"); entity.HasIndex(e => e.Type).HasName("idx_storage_type"); @@ -935,11 +944,11 @@ namespace Cicm.Database.Models entity.Property(e => e.Interface).HasColumnName("interface").HasColumnType("int(11)") .HasDefaultValueSql("'0'"); - entity.Property(e => e.Machine).HasColumnName("machine").HasColumnType("int(11)"); + entity.Property(e => e.MachineId).HasColumnName("machine").HasColumnType("int(11)"); entity.Property(e => e.Type).HasColumnName("type").HasColumnType("int(11)").HasDefaultValueSql("'0'"); - entity.HasOne(d => d.MachineNavigation).WithMany(p => p.StorageByMachine).HasForeignKey(d => d.Machine) + entity.HasOne(d => d.Machine).WithMany(p => p.Storage).HasForeignKey(d => d.MachineId) .HasConstraintName("fk_storage_by_machine_machine"); }); }