claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code refactor.

Browse Source
This commit is contained in:
Natalia Portillo
2018-08-05 23:11:33 +01:00
parent 60afd9c46c
commit bf55ec20e8
26 changed files with 48 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cicm.Database/Operations/Admin.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

1
Cicm.Database/Operations/BrowserTest.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

1
Cicm.Database/Operations/Company.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

1
Cicm.Database/Operations/CompanyDescription.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

1
Cicm.Database/Operations/CompanyLogos.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

6
Cicm.Database/Operations/Computer.cs
View File

@@ -86,7 +86,8 @@ namespace Cicm.Database
try 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(); IDbCommand dbCmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter(); IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
@@ -123,7 +124,8 @@ namespace Cicm.Database
try 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(); IDbCommand dbCmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter(); IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();

3
Cicm.Database/Operations/Console.cs
View File

@@ -86,7 +86,8 @@ namespace Cicm.Database
try 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(); IDbCommand dbCmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter(); IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();

1
Cicm.Database/Operations/Forbidden.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

6
Cicm.Database/Operations/GpuByMachine.cs
View File

@@ -134,11 +134,7 @@ namespace Cicm.Database
foreach(DataRow dataRow in dataTable.Rows) foreach(DataRow dataRow in dataTable.Rows)
{ {
GpuByMachine entry = new GpuByMachine GpuByMachine entry = new GpuByMachine {Machine = (int)dataRow["machine"], Gpu = (int)dataRow["gpu"]};
{
Machine = (int)dataRow["machine"],
Gpu = (int)dataRow["gpu"]
};
entries.Add(entry); entries.Add(entry);
} }

1
Cicm.Database/Operations/InstructionSet.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

1
Cicm.Database/Operations/InstructionSetExtension.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

1
Cicm.Database/Operations/Iso3166.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

1
Cicm.Database/Operations/Log.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

2
Cicm.Database/Operations/MemoryByMachine.cs
View File

@@ -156,7 +156,7 @@ namespace Cicm.Database
Type = (MemoryType)dataRow["type"], Type = (MemoryType)dataRow["type"],
Usage = (MemoryUsage)dataRow["usage"], Usage = (MemoryUsage)dataRow["usage"],
Size = dataRow["size"] == DBNull.Value ? 0 : (long)dataRow["size"], 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); entries.Add(entry);

1
Cicm.Database/Operations/MoneyDonation.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

1
Cicm.Database/Operations/News.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

1
Cicm.Database/Operations/OwnedConsole.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

1
Cicm.Database/Operations/Processor.cs
View File

@@ -32,7 +32,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using Cicm.Database.Schemas; using Cicm.Database.Schemas;
using Console = System.Console;
namespace Cicm.Database namespace Cicm.Database
{ {

4
Cicm.Database/Operations/Update.cs
View File

@@ -2584,8 +2584,7 @@ namespace Cicm.Database
dbCmd = dbCon.CreateCommand(); dbCmd = dbCon.CreateCommand();
trans = dbCon.BeginTransaction(); trans = dbCon.BeginTransaction();
dbCmd.Transaction = trans; dbCmd.Transaction = trans;
dbCmd.CommandText = dbCmd.CommandText = "ALTER TABLE companies MODIFY country smallint(3);";
"ALTER TABLE companies MODIFY country smallint(3);";
dbCmd.ExecuteNonQuery(); dbCmd.ExecuteNonQuery();
trans.Commit(); trans.Commit();
dbCmd.Dispose(); dbCmd.Dispose();
@@ -2621,6 +2620,7 @@ namespace Cicm.Database
dbCmd.ExecuteNonQuery(); dbCmd.ExecuteNonQuery();
dbCmd.Dispose(); dbCmd.Dispose();
} }
void OptimizeDatabase() void OptimizeDatabase()
{ {
IDbCommand dbCmd = dbCon.CreateCommand(); IDbCommand dbCmd = dbCon.CreateCommand();

4
Cicm.Database/Schemas/Company.cs
View File

@@ -41,6 +41,8 @@ namespace Cicm.Database.Schemas
public string City; public string City;
/// <summary>Country</summary> /// <summary>Country</summary>
public Iso3166 Country; public Iso3166 Country;
/// <summary>Description</summary>
public string Description;
/// <summary>Facebook account</summary> /// <summary>Facebook account</summary>
public string Facebook; public string Facebook;
/// <summary>Founding date</summary> /// <summary>Founding date</summary>
@@ -67,7 +69,5 @@ namespace Cicm.Database.Schemas
public string Twitter; public string Twitter;
/// <summary>Website</summary> /// <summary>Website</summary>
public string Website; public string Website;
/// <summary>Description</summary>
public string Description;
} }
} }

6
Cicm.Database/Schemas/CompanyDescription.cs
View File

@@ -28,17 +28,15 @@
// Copyright © 2003-2018 Natalia Portillo // Copyright © 2003-2018 Natalia Portillo
*******************************************************************************/ *******************************************************************************/
using System;
namespace Cicm.Database.Schemas namespace Cicm.Database.Schemas
{ {
/// <summary>Company description</summary> /// <summary>Company description</summary>
public class CompanyDescription public class CompanyDescription
{ {
/// <summary>ID</summary>
public int Id;
/// <summary>Company ID</summary> /// <summary>Company ID</summary>
public int CompanyId; public int CompanyId;
/// <summary>ID</summary>
public int Id;
/// <summary>Description</summary> /// <summary>Description</summary>
public string Text; public string Text;
} }

4
Cicm.Database/Schemas/GpuByMachine.cs
View File

@@ -33,9 +33,9 @@ namespace Cicm.Database.Schemas
/// <summary>Computer</summary> /// <summary>Computer</summary>
public class GpuByMachine public class GpuByMachine
{ {
/// <summary>Machine ID</summary>
public int Machine;
/// <summary>GPU ID</summary> /// <summary>GPU ID</summary>
public int Gpu; public int Gpu;
/// <summary>Machine ID</summary>
public int Machine;
} }
} }

8
Cicm.Database/Schemas/MemoryByMachine.cs
View File

@@ -35,13 +35,13 @@ namespace Cicm.Database.Schemas
{ {
/// <summary>Machine ID</summary> /// <summary>Machine ID</summary>
public int Machine; public int Machine;
/// <summary>Memory type</summary>
public MemoryType Type;
/// <summary>Memory usage</summary>
public MemoryUsage Usage;
/// <summary>Memory size in bytes</summary> /// <summary>Memory size in bytes</summary>
public long Size; public long Size;
/// <summary>Memory speed in Hz</summary> /// <summary>Memory speed in Hz</summary>
public double Speed; public double Speed;
/// <summary>Memory type</summary>
public MemoryType Type;
/// <summary>Memory usage</summary>
public MemoryUsage Usage;
} }
} }

34
Cicm.Database/Schemas/Sql/V5.cs
View File

@@ -72,24 +72,26 @@ namespace Cicm.Database.Schemas.Sql
public static readonly string SoundSynths = V4.SoundSynths; 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"+ public static readonly string ComputersForeignKeys =
"ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu1 (cpu1) REFERENCES processors (id);\n"+ "ALTER TABLE computers ADD FOREIGN KEY fk_computers_company (company) REFERENCES companies (id);\n" +
"ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu2 (cpu2) REFERENCES processors (id);\n"+ "ALTER TABLE computers ADD FOREIGN KEY fk_computers_cpu1 (cpu1) 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_cpu2 (cpu2) REFERENCES processors (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_gpu (gpu) REFERENCES gpus (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_sound_synth (sound_synth) REFERENCES sound_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_music_synth (music_synth) REFERENCES music_synths (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_hdd1 (hdd1) 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_hdd2 (hdd2) 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_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);"; "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" + public static readonly string ConsolesForeignKeys =
"ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu1 (cpu1) REFERENCES processors (id);\n"+ "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_company (company) REFERENCES companies (id);\n" +
"ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu2 (cpu2) REFERENCES processors (id);\n"+ "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_cpu1 (cpu1) 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_cpu2 (cpu2) REFERENCES processors (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_gpu (gpu) REFERENCES gpus (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_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);"; "ALTER TABLE consoles ADD FOREIGN KEY fk_consoles_format (format) REFERENCES disk_formats (id);";
} }
} }