diff --git a/Cicm.Database/Migrations/20180806201559_SingularizeModelNames.Designer.cs b/Cicm.Database/Migrations/20180806201559_SingularizeModelNames.Designer.cs
new file mode 100644
index 00000000..c4f513dd
--- /dev/null
+++ b/Cicm.Database/Migrations/20180806201559_SingularizeModelNames.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("20180806201559_SingularizeModelNames")]
+ partial class SingularizeModelNames
+ {
+ 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.Admin", 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.BrowserTest", 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.Company", 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.CompanyDescription", 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.CompanyLogo", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnName("id")
+ .HasColumnType("int(11)");
+
+ b.Property("CompanyId")
+ .HasColumnName("company_id")
+ .HasColumnType("int(11)");
+
+ b.Property("Guid")
+ .HasColumnName("logo_guid")
+ .HasColumnType("char(36)");
+
+ b.Property("Year")
+ .HasColumnName("year")
+ .HasColumnType("int(4)");
+
+ b.HasKey("Id", "CompanyId", "Guid");
+
+ b.HasIndex("CompanyId")
+ .HasName("idx_company_id");
+
+ b.HasIndex("Guid")
+ .HasName("idx_guid");
+
+ b.HasIndex("Id")
+ .IsUnique()
+ .HasName("idx_id");
+
+ 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.Gpu", 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.InstructionSet", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnName("id")
+ .HasColumnType("int(11)");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnName("instruction_set")
+ .HasColumnType("varchar(45)");
+
+ b.HasKey("Id");
+
+ b.ToTable("instruction_sets");
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.InstructionSetExtension", 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.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.Machine", 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.MachineFamily", 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.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.MoneyDonation", 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.OwnedComputer", 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.OwnedConsole", 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.Processor", 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.Resolution", 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.SoundSynth", 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.Company", b =>
+ {
+ b.HasOne("Cicm.Database.Models.Iso31661Numeric", "Country")
+ .WithMany("Companies")
+ .HasForeignKey("CountryId")
+ .HasConstraintName("fk_companies_country");
+
+ b.HasOne("Cicm.Database.Models.Company", "SoldTo")
+ .WithMany("InverseSoldToNavigation")
+ .HasForeignKey("SoldToId")
+ .HasConstraintName("fk_companies_sold_to");
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.CompanyDescription", b =>
+ {
+ b.HasOne("Cicm.Database.Models.Company", "Company")
+ .WithOne("Description")
+ .HasForeignKey("Cicm.Database.Models.CompanyDescription", "Id")
+ .HasConstraintName("fk_company_id")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.CompanyLogo", b =>
+ {
+ b.HasOne("Cicm.Database.Models.Company", "Company")
+ .WithMany("CompanyLogos")
+ .HasForeignKey("CompanyId")
+ .HasConstraintName("fk_company_logos_company1");
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.Gpu", b =>
+ {
+ b.HasOne("Cicm.Database.Models.Company", "Company")
+ .WithMany("Gpus")
+ .HasForeignKey("CompanyId")
+ .HasConstraintName("fk_gpus_company");
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.GpusByMachine", b =>
+ {
+ b.HasOne("Cicm.Database.Models.Gpu", "Gpu")
+ .WithMany("GpusByMachine")
+ .HasForeignKey("GpuId")
+ .HasConstraintName("fk_gpus_by_machine_gpu")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.HasOne("Cicm.Database.Models.Machine", "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.InstructionSetExtension", "Extension")
+ .WithMany("InstructionSetExtensionsByProcessor")
+ .HasForeignKey("ExtensionId")
+ .HasConstraintName("fk_extension_extension_id");
+
+ b.HasOne("Cicm.Database.Models.Processor", "Processor")
+ .WithMany("InstructionSetExtensions")
+ .HasForeignKey("ProcessorId")
+ .HasConstraintName("fk_extension_processor_id");
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.Machine", b =>
+ {
+ b.HasOne("Cicm.Database.Models.Company", "Company")
+ .WithMany("Machines")
+ .HasForeignKey("CompanyId")
+ .HasConstraintName("fk_machines_company");
+
+ b.HasOne("Cicm.Database.Models.MachineFamily", "Family")
+ .WithMany("Machines")
+ .HasForeignKey("FamilyId")
+ .HasConstraintName("fk_machines_family");
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.MachineFamily", b =>
+ {
+ b.HasOne("Cicm.Database.Models.Company", "Company")
+ .WithMany("MachineFamilies")
+ .HasForeignKey("CompanyId")
+ .HasConstraintName("fk_machine_families_company")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.MemoryByMachine", b =>
+ {
+ b.HasOne("Cicm.Database.Models.Machine", "Machine")
+ .WithMany("Memory")
+ .HasForeignKey("MachineId")
+ .HasConstraintName("fk_memory_by_machine_machine")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.Processor", b =>
+ {
+ b.HasOne("Cicm.Database.Models.Company", "Company")
+ .WithMany("Processors")
+ .HasForeignKey("CompanyId")
+ .HasConstraintName("fk_processors_company");
+
+ b.HasOne("Cicm.Database.Models.InstructionSet", "InstructionSet")
+ .WithMany("Processors")
+ .HasForeignKey("InstructionSetId")
+ .HasConstraintName("fk_processors_instruction_set");
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.ProcessorsByMachine", b =>
+ {
+ b.HasOne("Cicm.Database.Models.Machine", "Machine")
+ .WithMany("Processors")
+ .HasForeignKey("MachineId")
+ .HasConstraintName("fk_processors_by_machine_machine")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.HasOne("Cicm.Database.Models.Processor", "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.Gpu", "Gpu")
+ .WithMany("ResolutionsByGpu")
+ .HasForeignKey("GpuId")
+ .HasConstraintName("fk_resolutions_by_gpu_gpu")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.HasOne("Cicm.Database.Models.Resolution", "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.Machine", "Machine")
+ .WithMany("Sound")
+ .HasForeignKey("MachineId")
+ .HasConstraintName("fk_sound_by_machine_machine")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.HasOne("Cicm.Database.Models.SoundSynth", "SoundSynth")
+ .WithMany("SoundByMachine")
+ .HasForeignKey("SoundSynthId")
+ .HasConstraintName("fk_sound_by_machine_sound_synth")
+ .OnDelete(DeleteBehavior.Cascade);
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.SoundSynth", b =>
+ {
+ b.HasOne("Cicm.Database.Models.Company", "Company")
+ .WithMany("SoundSynths")
+ .HasForeignKey("CompanyId")
+ .HasConstraintName("fk_sound_synths_company");
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.StorageByMachine", b =>
+ {
+ b.HasOne("Cicm.Database.Models.Machine", "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/20180806201559_SingularizeModelNames.cs b/Cicm.Database/Migrations/20180806201559_SingularizeModelNames.cs
new file mode 100644
index 00000000..ba2ef5b5
--- /dev/null
+++ b/Cicm.Database/Migrations/20180806201559_SingularizeModelNames.cs
@@ -0,0 +1,11 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Cicm.Database.Migrations
+{
+ public partial class SingularizeModelNames : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder) { }
+
+ protected override void Down(MigrationBuilder migrationBuilder) { }
+ }
+}
\ No newline at end of file
diff --git a/Cicm.Database/Migrations/cicmContextModelSnapshot.cs b/Cicm.Database/Migrations/cicmContextModelSnapshot.cs
index 0772dca2..c772ba4e 100644
--- a/Cicm.Database/Migrations/cicmContextModelSnapshot.cs
+++ b/Cicm.Database/Migrations/cicmContextModelSnapshot.cs
@@ -16,7 +16,7 @@ namespace Cicm.Database.Migrations
modelBuilder.HasAnnotation("ProductVersion", "2.1.1-rtm-30846")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
- modelBuilder.Entity("Cicm.Database.Models.Admins", b =>
+ modelBuilder.Entity("Cicm.Database.Models.Admin", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -33,7 +33,7 @@ namespace Cicm.Database.Migrations
b.ToTable("admins");
});
- modelBuilder.Entity("Cicm.Database.Models.BrowserTests", b =>
+ modelBuilder.Entity("Cicm.Database.Models.BrowserTest", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -114,7 +114,7 @@ namespace Cicm.Database.Migrations
b.ToTable("cicm_db");
});
- modelBuilder.Entity("Cicm.Database.Models.Companies", b =>
+ modelBuilder.Entity("Cicm.Database.Models.Company", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -176,7 +176,7 @@ namespace Cicm.Database.Migrations
b.ToTable("companies");
});
- modelBuilder.Entity("Cicm.Database.Models.CompanyDescriptions", b =>
+ modelBuilder.Entity("Cicm.Database.Models.CompanyDescription", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -193,7 +193,7 @@ namespace Cicm.Database.Migrations
b.ToTable("company_descriptions");
});
- modelBuilder.Entity("Cicm.Database.Models.CompanyLogos", b =>
+ modelBuilder.Entity("Cicm.Database.Models.CompanyLogo", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -243,7 +243,7 @@ namespace Cicm.Database.Migrations
b.ToTable("forbidden");
});
- modelBuilder.Entity("Cicm.Database.Models.Gpus", b =>
+ modelBuilder.Entity("Cicm.Database.Models.Gpu", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -306,7 +306,18 @@ namespace Cicm.Database.Migrations
b.ToTable("gpus_by_machine");
});
- modelBuilder.Entity("Cicm.Database.Models.InstructionSetExtensions", b =>
+ modelBuilder.Entity("Cicm.Database.Models.InstructionSet", b =>
+ {
+ b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
+
+ b.Property("Name").IsRequired().HasColumnName("instruction_set").HasColumnType("varchar(45)");
+
+ b.HasKey("Id");
+
+ b.ToTable("instruction_sets");
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.InstructionSetExtension", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -334,18 +345,6 @@ namespace Cicm.Database.Migrations
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)");
@@ -388,24 +387,7 @@ namespace Cicm.Database.Migrations
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 =>
+ modelBuilder.Entity("Cicm.Database.Models.Machine", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -440,6 +422,23 @@ namespace Cicm.Database.Migrations
b.ToTable("machines");
});
+ modelBuilder.Entity("Cicm.Database.Models.MachineFamily", 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.MemoryByMachine", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("bigint(20)");
@@ -471,7 +470,7 @@ namespace Cicm.Database.Migrations
b.ToTable("memory_by_machine");
});
- modelBuilder.Entity("Cicm.Database.Models.MoneyDonations", b =>
+ modelBuilder.Entity("Cicm.Database.Models.MoneyDonation", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -514,7 +513,7 @@ namespace Cicm.Database.Migrations
b.ToTable("news");
});
- modelBuilder.Entity("Cicm.Database.Models.OwnedComputers", b =>
+ modelBuilder.Entity("Cicm.Database.Models.OwnedComputer", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -608,7 +607,7 @@ namespace Cicm.Database.Migrations
b.ToTable("owned_computers");
});
- modelBuilder.Entity("Cicm.Database.Models.OwnedConsoles", b =>
+ modelBuilder.Entity("Cicm.Database.Models.OwnedConsole", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -647,7 +646,7 @@ namespace Cicm.Database.Migrations
b.ToTable("owned_consoles");
});
- modelBuilder.Entity("Cicm.Database.Models.Processors", b =>
+ modelBuilder.Entity("Cicm.Database.Models.Processor", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -778,7 +777,7 @@ namespace Cicm.Database.Migrations
b.ToTable("processors_by_machine");
});
- modelBuilder.Entity("Cicm.Database.Models.Resolutions", b =>
+ modelBuilder.Entity("Cicm.Database.Models.Resolution", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -849,7 +848,7 @@ namespace Cicm.Database.Migrations
b.ToTable("sound_by_machine");
});
- modelBuilder.Entity("Cicm.Database.Models.SoundSynths", b =>
+ modelBuilder.Entity("Cicm.Database.Models.SoundSynth", b =>
{
b.Property("Id").ValueGeneratedOnAdd().HasColumnName("id").HasColumnType("int(11)");
@@ -926,131 +925,131 @@ namespace Cicm.Database.Migrations
b.ToTable("storage_by_machine");
});
- modelBuilder.Entity("Cicm.Database.Models.Companies", b =>
+ modelBuilder.Entity("Cicm.Database.Models.Company", 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")
+ b.HasOne("Cicm.Database.Models.Company", "SoldTo").WithMany("InverseSoldToNavigation")
.HasForeignKey("SoldToId").HasConstraintName("fk_companies_sold_to");
});
- modelBuilder.Entity("Cicm.Database.Models.CompanyDescriptions",
+ modelBuilder.Entity("Cicm.Database.Models.CompanyDescription",
b =>
{
- b.HasOne("Cicm.Database.Models.Companies", "Company").WithOne("Description")
- .HasForeignKey("Cicm.Database.Models.CompanyDescriptions", "Id")
+ b.HasOne("Cicm.Database.Models.Company", "Company").WithOne("Description")
+ .HasForeignKey("Cicm.Database.Models.CompanyDescription", "Id")
.HasConstraintName("fk_company_id").OnDelete(DeleteBehavior.Cascade);
});
- modelBuilder.Entity("Cicm.Database.Models.CompanyLogos",
+ modelBuilder.Entity("Cicm.Database.Models.CompanyLogo",
b =>
{
- b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("CompanyLogos")
+ b.HasOne("Cicm.Database.Models.Company", "Company").WithMany("CompanyLogos")
.HasForeignKey("CompanyId").HasConstraintName("fk_company_logos_company1");
});
- modelBuilder.Entity("Cicm.Database.Models.Gpus",
+ modelBuilder.Entity("Cicm.Database.Models.Gpu",
b =>
{
- b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("Gpus")
+ b.HasOne("Cicm.Database.Models.Company", "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")
+ b.HasOne("Cicm.Database.Models.Gpu", "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")
+ b.HasOne("Cicm.Database.Models.Machine", "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")
+ b.HasOne("Cicm.Database.Models.InstructionSetExtension", "Extension")
.WithMany("InstructionSetExtensionsByProcessor").HasForeignKey("ExtensionId")
.HasConstraintName("fk_extension_extension_id");
- b.HasOne("Cicm.Database.Models.Processors", "Processor").WithMany("InstructionSetExtensions")
+ b.HasOne("Cicm.Database.Models.Processor", "Processor").WithMany("InstructionSetExtensions")
.HasForeignKey("ProcessorId").HasConstraintName("fk_extension_processor_id");
});
- modelBuilder.Entity("Cicm.Database.Models.MachineFamilies",
+ modelBuilder.Entity("Cicm.Database.Models.Machine", b =>
+ {
+ b.HasOne("Cicm.Database.Models.Company", "Company").WithMany("Machines").HasForeignKey("CompanyId")
+ .HasConstraintName("fk_machines_company");
+
+ b.HasOne("Cicm.Database.Models.MachineFamily", "Family").WithMany("Machines").HasForeignKey("FamilyId")
+ .HasConstraintName("fk_machines_family");
+ });
+
+ modelBuilder.Entity("Cicm.Database.Models.MachineFamily",
b =>
{
- b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("MachineFamilies")
+ b.HasOne("Cicm.Database.Models.Company", "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")
+ b.HasOne("Cicm.Database.Models.Machine", "Machine").WithMany("Memory")
.HasForeignKey("MachineId").HasConstraintName("fk_memory_by_machine_machine")
.OnDelete(DeleteBehavior.Cascade);
});
- modelBuilder.Entity("Cicm.Database.Models.Processors", b =>
+ modelBuilder.Entity("Cicm.Database.Models.Processor", b =>
{
- b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("Processors").HasForeignKey("CompanyId")
+ b.HasOne("Cicm.Database.Models.Company", "Company").WithMany("Processors").HasForeignKey("CompanyId")
.HasConstraintName("fk_processors_company");
- b.HasOne("Cicm.Database.Models.InstructionSets", "InstructionSet").WithMany("Processors")
+ b.HasOne("Cicm.Database.Models.InstructionSet", "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")
+ b.HasOne("Cicm.Database.Models.Machine", "Machine").WithMany("Processors").HasForeignKey("MachineId")
.HasConstraintName("fk_processors_by_machine_machine").OnDelete(DeleteBehavior.Cascade);
- b.HasOne("Cicm.Database.Models.Processors", "Processor").WithMany("ProcessorsByMachine")
+ b.HasOne("Cicm.Database.Models.Processor", "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")
+ b.HasOne("Cicm.Database.Models.Gpu", "Gpu").WithMany("ResolutionsByGpu").HasForeignKey("GpuId")
.HasConstraintName("fk_resolutions_by_gpu_gpu").OnDelete(DeleteBehavior.Cascade);
- b.HasOne("Cicm.Database.Models.Resolutions", "Resolution").WithMany("ResolutionsByGpu")
+ b.HasOne("Cicm.Database.Models.Resolution", "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")
+ b.HasOne("Cicm.Database.Models.Machine", "Machine").WithMany("Sound").HasForeignKey("MachineId")
.HasConstraintName("fk_sound_by_machine_machine").OnDelete(DeleteBehavior.Cascade);
- b.HasOne("Cicm.Database.Models.SoundSynths", "SoundSynth").WithMany("SoundByMachine")
+ b.HasOne("Cicm.Database.Models.SoundSynth", "SoundSynth").WithMany("SoundByMachine")
.HasForeignKey("SoundSynthId").HasConstraintName("fk_sound_by_machine_sound_synth")
.OnDelete(DeleteBehavior.Cascade);
});
- modelBuilder.Entity("Cicm.Database.Models.SoundSynths",
+ modelBuilder.Entity("Cicm.Database.Models.SoundSynth",
b =>
{
- b.HasOne("Cicm.Database.Models.Companies", "Company").WithMany("SoundSynths")
+ b.HasOne("Cicm.Database.Models.Company", "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")
+ b.HasOne("Cicm.Database.Models.Machine", "Machine").WithMany("Storage")
.HasForeignKey("MachineId").HasConstraintName("fk_storage_by_machine_machine")
.OnDelete(DeleteBehavior.Cascade);
});
diff --git a/Cicm.Database/Models/Admins.cs b/Cicm.Database/Models/Admin.cs
similarity index 88%
rename from Cicm.Database/Models/Admins.cs
rename to Cicm.Database/Models/Admin.cs
index 478d1cf6..6dc67679 100644
--- a/Cicm.Database/Models/Admins.cs
+++ b/Cicm.Database/Models/Admin.cs
@@ -1,6 +1,6 @@
namespace Cicm.Database.Models
{
- public class Admins
+ public class Admin
{
public int Id { get; set; }
public string User { get; set; }
diff --git a/Cicm.Database/Models/BrowserTests.cs b/Cicm.Database/Models/BrowserTest.cs
similarity index 96%
rename from Cicm.Database/Models/BrowserTests.cs
rename to Cicm.Database/Models/BrowserTest.cs
index d84c4d57..07bd7b4d 100644
--- a/Cicm.Database/Models/BrowserTests.cs
+++ b/Cicm.Database/Models/BrowserTest.cs
@@ -1,6 +1,6 @@
namespace Cicm.Database.Models
{
- public class BrowserTests
+ public class BrowserTest
{
public int Id { get; set; }
public string UserAgent { get; set; }
diff --git a/Cicm.Database/Models/Companies.cs b/Cicm.Database/Models/Companies.cs
deleted file mode 100644
index 9085666e..00000000
--- a/Cicm.Database/Models/Companies.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Cicm.Database.Models
-{
- public class Companies
- {
- public Companies()
- {
- CompanyLogos = new HashSet();
- Gpus = new HashSet();
- InverseSoldToNavigation = new HashSet();
- MachineFamilies = new HashSet();
- Machines = new HashSet();
- Processors = new HashSet();
- SoundSynths = new HashSet();
- }
-
- public int Id { get; set; }
- public string Name { get; set; }
- public DateTime? Founded { get; set; }
- public string Website { get; set; }
- public string Twitter { get; set; }
- public string Facebook { get; set; }
- public DateTime? Sold { 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? CountryId { get; set; }
- public CompanyStatus Status { get; set; }
-
- public Iso31661Numeric Country { get; set; }
- public Companies SoldTo { get; set; }
- public CompanyDescriptions Description { get; set; }
- public ICollection CompanyLogos { get; set; }
- public ICollection Gpus { get; set; }
- public ICollection InverseSoldToNavigation { get; set; }
- public ICollection MachineFamilies { get; set; }
- public ICollection Machines { get; set; }
- public ICollection Processors { get; set; }
- public ICollection SoundSynths { get; set; }
- }
-}
\ No newline at end of file
diff --git a/Cicm.Database/Models/Company.cs b/Cicm.Database/Models/Company.cs
new file mode 100644
index 00000000..8b4c302f
--- /dev/null
+++ b/Cicm.Database/Models/Company.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+
+namespace Cicm.Database.Models
+{
+ public class Company
+ {
+ public Company()
+ {
+ CompanyLogos = new HashSet();
+ Gpus = new HashSet();
+ InverseSoldToNavigation = new HashSet();
+ MachineFamilies = new HashSet();
+ Machines = new HashSet();
+ Processors = new HashSet();
+ SoundSynths = new HashSet();
+ }
+
+ public int Id { get; set; }
+ public string Name { get; set; }
+ public DateTime? Founded { get; set; }
+ public string Website { get; set; }
+ public string Twitter { get; set; }
+ public string Facebook { get; set; }
+ public DateTime? Sold { 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? CountryId { get; set; }
+ public CompanyStatus Status { get; set; }
+
+ public Iso31661Numeric Country { get; set; }
+ public Company SoldTo { get; set; }
+ public CompanyDescription Description { get; set; }
+ public ICollection CompanyLogos { get; set; }
+ public ICollection Gpus { get; set; }
+ public ICollection InverseSoldToNavigation { get; set; }
+ public ICollection MachineFamilies { get; set; }
+ public ICollection Machines { get; set; }
+ public ICollection Processors { get; set; }
+ public ICollection SoundSynths { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/Cicm.Database/Models/CompanyDescriptions.cs b/Cicm.Database/Models/CompanyDescription.cs
similarity index 69%
rename from Cicm.Database/Models/CompanyDescriptions.cs
rename to Cicm.Database/Models/CompanyDescription.cs
index 49b376c9..13bf2954 100644
--- a/Cicm.Database/Models/CompanyDescriptions.cs
+++ b/Cicm.Database/Models/CompanyDescription.cs
@@ -1,11 +1,11 @@
namespace Cicm.Database.Models
{
- public class CompanyDescriptions
+ public class CompanyDescription
{
public int Id { get; set; }
public int CompanyId { get; set; }
public string Text { get; set; }
- public Companies Company { get; set; }
+ public Company Company { get; set; }
}
}
\ No newline at end of file
diff --git a/Cicm.Database/Models/CompanyLogos.cs b/Cicm.Database/Models/CompanyLogo.cs
similarity index 75%
rename from Cicm.Database/Models/CompanyLogos.cs
rename to Cicm.Database/Models/CompanyLogo.cs
index 615a2666..1272964a 100644
--- a/Cicm.Database/Models/CompanyLogos.cs
+++ b/Cicm.Database/Models/CompanyLogo.cs
@@ -1,12 +1,12 @@
namespace Cicm.Database.Models
{
- public class CompanyLogos
+ public class CompanyLogo
{
public int Id { get; set; }
public int CompanyId { get; set; }
public int? Year { get; set; }
public string Guid { get; set; }
- public Companies Company { get; set; }
+ public Company Company { get; set; }
}
}
\ No newline at end of file
diff --git a/Cicm.Database/Models/Gpus.cs b/Cicm.Database/Models/Gpu.cs
similarity index 89%
rename from Cicm.Database/Models/Gpus.cs
rename to Cicm.Database/Models/Gpu.cs
index 6d675f74..e2f886be 100644
--- a/Cicm.Database/Models/Gpus.cs
+++ b/Cicm.Database/Models/Gpu.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
namespace Cicm.Database.Models
{
- public class Gpus
+ public class Gpu
{
- public Gpus()
+ public Gpu()
{
GpusByMachine = new HashSet();
ResolutionsByGpu = new HashSet();
@@ -22,7 +22,7 @@ namespace Cicm.Database.Models
public float? DieSize { get; set; }
public long? Transistors { get; set; }
- public Companies Company { get; set; }
+ public Company Company { get; set; }
public ICollection GpusByMachine { get; set; }
public ICollection ResolutionsByGpu { get; set; }
}
diff --git a/Cicm.Database/Models/GpusByMachine.cs b/Cicm.Database/Models/GpusByMachine.cs
index 0d656a01..fd60a74a 100644
--- a/Cicm.Database/Models/GpusByMachine.cs
+++ b/Cicm.Database/Models/GpusByMachine.cs
@@ -6,7 +6,7 @@
public int MachineId { get; set; }
public long Id { get; set; }
- public Gpus Gpu { get; set; }
- public Machines Machine { get; set; }
+ public Gpu Gpu { get; set; }
+ public Machine Machine { get; set; }
}
}
\ No newline at end of file
diff --git a/Cicm.Database/Models/InstructionSet.cs b/Cicm.Database/Models/InstructionSet.cs
new file mode 100644
index 00000000..46acc535
--- /dev/null
+++ b/Cicm.Database/Models/InstructionSet.cs
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace Cicm.Database.Models
+{
+ public class InstructionSet
+ {
+ public InstructionSet()
+ {
+ Processors = new HashSet();
+ }
+
+ public int Id { get; set; }
+ public string Name { get; set; }
+
+ public ICollection Processors { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/Cicm.Database/Models/InstructionSetExtensions.cs b/Cicm.Database/Models/InstructionSetExtension.cs
similarity index 83%
rename from Cicm.Database/Models/InstructionSetExtensions.cs
rename to Cicm.Database/Models/InstructionSetExtension.cs
index 5929c2fe..21a8c5ce 100644
--- a/Cicm.Database/Models/InstructionSetExtensions.cs
+++ b/Cicm.Database/Models/InstructionSetExtension.cs
@@ -2,9 +2,9 @@
namespace Cicm.Database.Models
{
- public class InstructionSetExtensions
+ public class InstructionSetExtension
{
- public InstructionSetExtensions()
+ public InstructionSetExtension()
{
InstructionSetExtensionsByProcessor = new HashSet();
}
diff --git a/Cicm.Database/Models/InstructionSetExtensionsByProcessor.cs b/Cicm.Database/Models/InstructionSetExtensionsByProcessor.cs
index 262c97d6..33bb4823 100644
--- a/Cicm.Database/Models/InstructionSetExtensionsByProcessor.cs
+++ b/Cicm.Database/Models/InstructionSetExtensionsByProcessor.cs
@@ -6,7 +6,7 @@
public int ProcessorId { get; set; }
public int ExtensionId { get; set; }
- public InstructionSetExtensions Extension { get; set; }
- public Processors Processor { get; set; }
+ public InstructionSetExtension Extension { get; set; }
+ public Processor Processor { get; set; }
}
}
\ No newline at end of file
diff --git a/Cicm.Database/Models/InstructionSets.cs b/Cicm.Database/Models/InstructionSets.cs
deleted file mode 100644
index 056776bf..00000000
--- a/Cicm.Database/Models/InstructionSets.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-
-namespace Cicm.Database.Models
-{
- public class InstructionSets
- {
- public InstructionSets()
- {
- Processors = new HashSet();
- }
-
- public int Id { get; set; }
- public string InstructionSet { get; set; }
-
- public ICollection Processors { get; set; }
- }
-}
\ No newline at end of file
diff --git a/Cicm.Database/Models/Iso31661Numeric.cs b/Cicm.Database/Models/Iso31661Numeric.cs
index 08ff270e..b30b9811 100644
--- a/Cicm.Database/Models/Iso31661Numeric.cs
+++ b/Cicm.Database/Models/Iso31661Numeric.cs
@@ -6,12 +6,12 @@ namespace Cicm.Database.Models
{
public Iso31661Numeric()
{
- Companies = new HashSet();
+ Companies = new HashSet();
}
public short Id { get; set; }
public string Name { get; set; }
- public ICollection Companies { get; set; }
+ public ICollection Companies { get; set; }
}
}
\ No newline at end of file
diff --git a/Cicm.Database/Models/Machines.cs b/Cicm.Database/Models/Machine.cs
similarity index 86%
rename from Cicm.Database/Models/Machines.cs
rename to Cicm.Database/Models/Machine.cs
index 067284bb..2476b831 100644
--- a/Cicm.Database/Models/Machines.cs
+++ b/Cicm.Database/Models/Machine.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
namespace Cicm.Database.Models
{
- public class Machines
+ public class Machine
{
- public Machines()
+ public Machine()
{
Gpus = new HashSet();
Memory = new HashSet();
@@ -22,8 +22,8 @@ namespace Cicm.Database.Models
public int? FamilyId { get; set; }
public string Model { get; set; }
- public Companies Company { get; set; }
- public MachineFamilies Family { get; set; }
+ public Company Company { get; set; }
+ public MachineFamily Family { get; set; }
public ICollection Gpus { get; set; }
public ICollection Memory { get; set; }
public ICollection