diff --git a/Cicm.Database/Operations/Admin.cs b/Cicm.Database/Operations/Admin.cs index 1d3ef395..60fe9958 100644 --- a/Cicm.Database/Operations/Admin.cs +++ b/Cicm.Database/Operations/Admin.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/BrowserTest.cs b/Cicm.Database/Operations/BrowserTest.cs index 0f214d19..81c9dffc 100644 --- a/Cicm.Database/Operations/BrowserTest.cs +++ b/Cicm.Database/Operations/BrowserTest.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/Company.cs b/Cicm.Database/Operations/Company.cs index 3bcda67b..7b460c68 100644 --- a/Cicm.Database/Operations/Company.cs +++ b/Cicm.Database/Operations/Company.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/CompanyDescription.cs b/Cicm.Database/Operations/CompanyDescription.cs index cbcd5671..c7796715 100644 --- a/Cicm.Database/Operations/CompanyDescription.cs +++ b/Cicm.Database/Operations/CompanyDescription.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/CompanyLogos.cs b/Cicm.Database/Operations/CompanyLogos.cs index 63f754b3..56faa24f 100644 --- a/Cicm.Database/Operations/CompanyLogos.cs +++ b/Cicm.Database/Operations/CompanyLogos.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/Computer.cs b/Cicm.Database/Operations/Computer.cs index d4bb45cb..8737fbfa 100644 --- a/Cicm.Database/Operations/Computer.cs +++ b/Cicm.Database/Operations/Computer.cs @@ -86,7 +86,8 @@ namespace Cicm.Database try { - string sql = $"SELECT * FROM machines WHERE company = '{company}' AND type = '{(int)MachineType.Computer}'"; + string sql = + $"SELECT * FROM machines WHERE company = '{company}' AND type = '{(int)MachineType.Computer}'"; IDbCommand dbCmd = dbCon.CreateCommand(); IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter(); @@ -123,7 +124,8 @@ namespace Cicm.Database try { - string sql = $"SELECT * FROM machines LIMIT {start}, {count} WHERE type = '{(int)MachineType.Computer}'"; + string sql = + $"SELECT * FROM machines LIMIT {start}, {count} WHERE type = '{(int)MachineType.Computer}'"; IDbCommand dbCmd = dbCon.CreateCommand(); IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter(); diff --git a/Cicm.Database/Operations/Console.cs b/Cicm.Database/Operations/Console.cs index aa608bc3..51189a03 100644 --- a/Cicm.Database/Operations/Console.cs +++ b/Cicm.Database/Operations/Console.cs @@ -86,7 +86,8 @@ namespace Cicm.Database try { - string sql = $"SELECT * FROM machines WHERE company = '{company}' AND type = '{(int)MachineType.Console}'"; + string sql = + $"SELECT * FROM machines WHERE company = '{company}' AND type = '{(int)MachineType.Console}'"; IDbCommand dbCmd = dbCon.CreateCommand(); IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter(); diff --git a/Cicm.Database/Operations/Forbidden.cs b/Cicm.Database/Operations/Forbidden.cs index 18e32adc..d81e1b80 100644 --- a/Cicm.Database/Operations/Forbidden.cs +++ b/Cicm.Database/Operations/Forbidden.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/GpuByMachine.cs b/Cicm.Database/Operations/GpuByMachine.cs index 3de94984..146966b6 100644 --- a/Cicm.Database/Operations/GpuByMachine.cs +++ b/Cicm.Database/Operations/GpuByMachine.cs @@ -134,11 +134,7 @@ namespace Cicm.Database foreach(DataRow dataRow in dataTable.Rows) { - GpuByMachine entry = new GpuByMachine - { - Machine = (int)dataRow["machine"], - Gpu = (int)dataRow["gpu"] - }; + GpuByMachine entry = new GpuByMachine {Machine = (int)dataRow["machine"], Gpu = (int)dataRow["gpu"]}; entries.Add(entry); } diff --git a/Cicm.Database/Operations/InstructionSet.cs b/Cicm.Database/Operations/InstructionSet.cs index 1c55c8cc..1cc88966 100644 --- a/Cicm.Database/Operations/InstructionSet.cs +++ b/Cicm.Database/Operations/InstructionSet.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/InstructionSetExtension.cs b/Cicm.Database/Operations/InstructionSetExtension.cs index 6ee12342..9ebb34dd 100644 --- a/Cicm.Database/Operations/InstructionSetExtension.cs +++ b/Cicm.Database/Operations/InstructionSetExtension.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/Iso3166.cs b/Cicm.Database/Operations/Iso3166.cs index 0065ec13..97193bf9 100644 --- a/Cicm.Database/Operations/Iso3166.cs +++ b/Cicm.Database/Operations/Iso3166.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/Log.cs b/Cicm.Database/Operations/Log.cs index 4f8637fb..4df201df 100644 --- a/Cicm.Database/Operations/Log.cs +++ b/Cicm.Database/Operations/Log.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/MemoryByMachine.cs b/Cicm.Database/Operations/MemoryByMachine.cs index 6a4db0d2..6603bdc2 100644 --- a/Cicm.Database/Operations/MemoryByMachine.cs +++ b/Cicm.Database/Operations/MemoryByMachine.cs @@ -132,7 +132,7 @@ namespace Cicm.Database param1.Value = entry.Machine; param2.Value = entry.Type; param3.Value = entry.Usage; - param4.Value = entry.Size == 0 ? (object)null : entry.Size; + param4.Value = entry.Size == 0 ? (object)null : entry.Size; param5.Value = entry.Speed <= 0 ? (object)null : entry.Speed; dbcmd.Parameters.Add(param1); @@ -156,7 +156,7 @@ namespace Cicm.Database Type = (MemoryType)dataRow["type"], Usage = (MemoryUsage)dataRow["usage"], Size = dataRow["size"] == DBNull.Value ? 0 : (long)dataRow["size"], - Speed = dataRow["speed"] == DBNull.Value ? 0 : (double)dataRow["speed"], + Speed = dataRow["speed"] == DBNull.Value ? 0 : (double)dataRow["speed"] }; entries.Add(entry); diff --git a/Cicm.Database/Operations/MoneyDonation.cs b/Cicm.Database/Operations/MoneyDonation.cs index 8f1ef85b..dbfc88e1 100644 --- a/Cicm.Database/Operations/MoneyDonation.cs +++ b/Cicm.Database/Operations/MoneyDonation.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/News.cs b/Cicm.Database/Operations/News.cs index 82d3622f..04acc28a 100644 --- a/Cicm.Database/Operations/News.cs +++ b/Cicm.Database/Operations/News.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/OwnedConsole.cs b/Cicm.Database/Operations/OwnedConsole.cs index c44e08a2..f2b35715 100644 --- a/Cicm.Database/Operations/OwnedConsole.cs +++ b/Cicm.Database/Operations/OwnedConsole.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/Processor.cs b/Cicm.Database/Operations/Processor.cs index 1c160d00..c0efdb5e 100644 --- a/Cicm.Database/Operations/Processor.cs +++ b/Cicm.Database/Operations/Processor.cs @@ -32,7 +32,6 @@ using System; using System.Collections.Generic; using System.Data; using Cicm.Database.Schemas; -using Console = System.Console; namespace Cicm.Database { diff --git a/Cicm.Database/Operations/Update.cs b/Cicm.Database/Operations/Update.cs index 0e98a267..96932a31 100644 --- a/Cicm.Database/Operations/Update.cs +++ b/Cicm.Database/Operations/Update.cs @@ -2554,8 +2554,8 @@ namespace Cicm.Database Console.WriteLine("Updating database to version 23"); Console.WriteLine("Altering `browser_tests` primary key"); - IDbCommand dbCmd = dbCon.CreateCommand(); - IDbTransaction trans = dbCon.BeginTransaction(); + IDbCommand dbCmd = dbCon.CreateCommand(); + IDbTransaction trans = dbCon.BeginTransaction(); dbCmd.Transaction = trans; dbCmd.CommandText = "ALTER TABLE browser_tests MODIFY id int NOT NULL auto_increment;"; dbCmd.ExecuteNonQuery(); @@ -2570,7 +2570,7 @@ namespace Cicm.Database dbCmd.ExecuteNonQuery(); trans.Commit(); dbCmd.Dispose(); - + Console.WriteLine("Altering `iso3166_1_numeric` primary key"); dbCmd = dbCon.CreateCommand(); trans = dbCon.BeginTransaction(); @@ -2584,8 +2584,7 @@ namespace Cicm.Database dbCmd = dbCon.CreateCommand(); trans = dbCon.BeginTransaction(); dbCmd.Transaction = trans; - dbCmd.CommandText = - "ALTER TABLE companies MODIFY country smallint(3);"; + dbCmd.CommandText = "ALTER TABLE companies MODIFY country smallint(3);"; dbCmd.ExecuteNonQuery(); trans.Commit(); dbCmd.Dispose(); @@ -2599,7 +2598,7 @@ namespace Cicm.Database dbCmd.ExecuteNonQuery(); trans.Commit(); dbCmd.Dispose(); - + Console.WriteLine("Adding primary keys to several tables"); dbCmd = dbCon.CreateCommand(); trans = dbCon.BeginTransaction(); @@ -2621,6 +2620,7 @@ namespace Cicm.Database dbCmd.ExecuteNonQuery(); dbCmd.Dispose(); } + void OptimizeDatabase() { IDbCommand dbCmd = dbCon.CreateCommand(); diff --git a/Cicm.Database/Schemas/Company.cs b/Cicm.Database/Schemas/Company.cs index 75889fbf..de53ffd6 100644 --- a/Cicm.Database/Schemas/Company.cs +++ b/Cicm.Database/Schemas/Company.cs @@ -41,6 +41,8 @@ namespace Cicm.Database.Schemas public string City; /// Country public Iso3166 Country; + /// Description + public string Description; /// Facebook account public string Facebook; /// Founding date @@ -67,7 +69,5 @@ namespace Cicm.Database.Schemas public string Twitter; /// Website public string Website; - /// Description - public string Description; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/CompanyDescription.cs b/Cicm.Database/Schemas/CompanyDescription.cs index 443bb432..2aa1d9fe 100644 --- a/Cicm.Database/Schemas/CompanyDescription.cs +++ b/Cicm.Database/Schemas/CompanyDescription.cs @@ -28,17 +28,15 @@ // Copyright © 2003-2018 Natalia Portillo *******************************************************************************/ -using System; - namespace Cicm.Database.Schemas { /// Company description public class CompanyDescription { - /// ID - public int Id; /// Company ID public int CompanyId; + /// ID + public int Id; /// Description public string Text; } diff --git a/Cicm.Database/Schemas/GpuByMachine.cs b/Cicm.Database/Schemas/GpuByMachine.cs index 9551f810..76875fbd 100644 --- a/Cicm.Database/Schemas/GpuByMachine.cs +++ b/Cicm.Database/Schemas/GpuByMachine.cs @@ -33,9 +33,9 @@ namespace Cicm.Database.Schemas /// Computer public class GpuByMachine { - /// Machine ID - public int Machine; /// GPU ID public int Gpu; + /// Machine ID + public int Machine; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/MemoryByMachine.cs b/Cicm.Database/Schemas/MemoryByMachine.cs index 7c8efcb4..c64ca6b8 100644 --- a/Cicm.Database/Schemas/MemoryByMachine.cs +++ b/Cicm.Database/Schemas/MemoryByMachine.cs @@ -35,13 +35,13 @@ namespace Cicm.Database.Schemas { /// Machine ID public int Machine; - /// Memory type - public MemoryType Type; - /// Memory usage - public MemoryUsage Usage; /// Memory size in bytes public long Size; /// Memory speed in Hz public double Speed; + /// Memory type + public MemoryType Type; + /// Memory usage + public MemoryUsage Usage; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/Sql/V3.cs b/Cicm.Database/Schemas/Sql/V3.cs index 657380ef..9ee17c71 100644 --- a/Cicm.Database/Schemas/Sql/V3.cs +++ b/Cicm.Database/Schemas/Sql/V3.cs @@ -215,7 +215,7 @@ namespace Cicm.Database.Schemas.Sql `manuals` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`id`) );"; - + public static readonly string Processors = @"CREATE TABLE IF NOT EXISTS `processors` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` char(50) NOT NULL DEFAULT '', diff --git a/Cicm.Database/Schemas/Sql/V5.cs b/Cicm.Database/Schemas/Sql/V5.cs index e3b3fdd0..44bb8db0 100644 --- a/Cicm.Database/Schemas/Sql/V5.cs +++ b/Cicm.Database/Schemas/Sql/V5.cs @@ -72,24 +72,26 @@ namespace Cicm.Database.Schemas.Sql public static readonly string SoundSynths = V4.SoundSynths; - public static readonly string ComputersForeignKeys = "ALTER TABLE computers ADD FOREIGN KEY fk_computers_company (company) REFERENCES companies (id);\n"+ - "ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu1 (cpu1) REFERENCES processors (id);\n"+ - "ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu2 (cpu2) REFERENCES processors (id);\n"+ - "ALTER TABLE computers ADD FOREIGN KEY fk_computers_gpu (gpu) REFERENCES gpus (id);\n"+ - "ALTER TABLE computers ADD FOREIGN KEY fk_computers_sound_synth (sound_synth) REFERENCES sound_synths (id);\n"+ - "ALTER TABLE computers ADD FOREIGN KEY fk_computers_music_synth (music_synth) REFERENCES music_synths (id);\n"+ - "ALTER TABLE computers ADD FOREIGN KEY fk_computers_hdd1 (hdd1) REFERENCES disk_formats (id);\n"+ - "ALTER TABLE computers ADD FOREIGN KEY fk_computers_hdd2 (hdd2) REFERENCES disk_formats (id);\n"+ - "ALTER TABLE computers ADD FOREIGN KEY fk_computers_hdd3 (hdd3) REFERENCES disk_formats (id);\n"+ - "ALTER TABLE computers ADD FOREIGN KEY fk_computers_disk1 (disk1) REFERENCES disk_formats (id);\n"+ - "ALTER TABLE computers ADD FOREIGN KEY fk_computers_disk2 (disk2) REFERENCES disk_formats (id);"; - - public static readonly string ConsolesForeignKeys = "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_company (company) REFERENCES companies (id);\n" + - "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu1 (cpu1) REFERENCES processors (id);\n"+ - "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu2 (cpu2) REFERENCES processors (id);\n"+ - "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_gpu (gpu) REFERENCES gpus (id);\n"+ - "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_sound_synth (sound_synth) REFERENCES sound_synths (id);\n"+ - "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_music_synth (music_synth) REFERENCES music_synths (id);\n"+ - "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_format (format) REFERENCES disk_formats (id);"; + public static readonly string ComputersForeignKeys = + "ALTER TABLE computers ADD FOREIGN KEY fk_computers_company (company) REFERENCES companies (id);\n" + + "ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu1 (cpu1) REFERENCES processors (id);\n" + + "ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu2 (cpu2) REFERENCES processors (id);\n" + + "ALTER TABLE computers ADD FOREIGN KEY fk_computers_gpu (gpu) REFERENCES gpus (id);\n" + + "ALTER TABLE computers ADD FOREIGN KEY fk_computers_sound_synth (sound_synth) REFERENCES sound_synths (id);\n" + + "ALTER TABLE computers ADD FOREIGN KEY fk_computers_music_synth (music_synth) REFERENCES music_synths (id);\n" + + "ALTER TABLE computers ADD FOREIGN KEY fk_computers_hdd1 (hdd1) REFERENCES disk_formats (id);\n" + + "ALTER TABLE computers ADD FOREIGN KEY fk_computers_hdd2 (hdd2) REFERENCES disk_formats (id);\n" + + "ALTER TABLE computers ADD FOREIGN KEY fk_computers_hdd3 (hdd3) REFERENCES disk_formats (id);\n" + + "ALTER TABLE computers ADD FOREIGN KEY fk_computers_disk1 (disk1) REFERENCES disk_formats (id);\n" + + "ALTER TABLE computers ADD FOREIGN KEY fk_computers_disk2 (disk2) REFERENCES disk_formats (id);"; + + public static readonly string ConsolesForeignKeys = + "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_company (company) REFERENCES companies (id);\n" + + "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu1 (cpu1) REFERENCES processors (id);\n" + + "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu2 (cpu2) REFERENCES processors (id);\n" + + "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_gpu (gpu) REFERENCES gpus (id);\n" + + "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_sound_synth (sound_synth) REFERENCES sound_synths (id);\n" + + "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_music_synth (music_synth) REFERENCES music_synths (id);\n" + + "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_format (format) REFERENCES disk_formats (id);"; } } \ No newline at end of file diff --git a/Cicm.Database/Schemas/Sql/V8.cs b/Cicm.Database/Schemas/Sql/V8.cs index 31746625..07527847 100644 --- a/Cicm.Database/Schemas/Sql/V8.cs +++ b/Cicm.Database/Schemas/Sql/V8.cs @@ -84,7 +84,7 @@ namespace Cicm.Database.Schemas.Sql public static readonly string CompanyLogos = "CREATE TABLE IF NOT EXISTS `company_logos` (\n" + "`id` INT NOT NULL AUTO_INCREMENT,\n" + "`company_id` INT(11) NOT NULL,\n" + - "`year` INT(4) DEFAULT NULL,\n" + + "`year` INT(4) DEFAULT NULL,\n" + "`logo_guid` CHAR(36) NOT NULL,\n" + "PRIMARY KEY (`id`, `company_id`, `logo_guid`),\n" + "UNIQUE INDEX `idx_id` (`id` ASC),\n" +