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

Update DB to version 22: Machine families, machine model separate from name.

Browse Source
This commit is contained in:
Natalia Portillo
2018-04-29 02:02:33 +01:00
parent 349a941392
commit 736b98b754
21 changed files with 874 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Cicm.Database/Operations/Machine.cs
View File

@@ -206,7 +206,7 @@ namespace Cicm.Database
public bool AddMachine(Machine entry, out long id)
{
#if DEBUG
Console.Write("Adding machine `{0}`...", entry.Model);
Console.Write("Adding machine `{0}`...", entry.Name);
#endif
IDbCommand dbcmd = GetCommandMachine(entry);
@@ -214,7 +214,7 @@ namespace Cicm.Database
dbcmd.Transaction = trans;
const string SQL =
"INSERT INTO machines (company, introduced, model, type) VALUES (@company, @introduced, @model, @type)";
"INSERT INTO machines (company, introduced, name, type, model, family) VALUES (@company, @introduced, @name, @type, @model, @family)";
dbcmd.CommandText = SQL;
@@ -239,7 +239,7 @@ namespace Cicm.Database
public bool UpdateMachine(Machine entry)
{
#if DEBUG
Console.WriteLine("Updating machine `{0}`...", entry.Model);
Console.WriteLine("Updating machine `{0}`...", entry.Name);
#endif
IDbCommand dbcmd = GetCommandMachine(entry);
@@ -247,7 +247,7 @@ namespace Cicm.Database
dbcmd.Transaction = trans;
string sql =
"UPDATE machines SET company = @company, introduced = @introduced, model = @model, type = @type " +
"UPDATE machines SET company = @company, introduced = @introduced, name = @name, type = @type, model = @model, family = @family " +
$"WHERE id = {entry.Id}";
dbcmd.CommandText = sql;
@@ -293,26 +293,36 @@ namespace Cicm.Database
IDbDataParameter param2 = dbcmd.CreateParameter();
IDbDataParameter param3 = dbcmd.CreateParameter();
IDbDataParameter param4 = dbcmd.CreateParameter();
IDbDataParameter param5 = dbcmd.CreateParameter();
IDbDataParameter param6 = dbcmd.CreateParameter();
param1.ParameterName = "@company";
param2.ParameterName = "@introduced";
param3.ParameterName = "@model";
param3.ParameterName = "@name";
param4.ParameterName = "@type";
param5.ParameterName = "@model";
param6.ParameterName = "@family";
param1.DbType = DbType.Int32;
param2.DbType = DbType.DateTime;
param3.DbType = DbType.String;
param4.DbType = DbType.Int32;
param5.DbType = DbType.String;
param6.DbType = DbType.Int32;
param1.Value = entry.Company;
param2.Value = entry.Introduced;
param3.Value = entry.Model;
param3.Value = entry.Name;
param4.Value = entry.Type;
param5.Value = entry.Model;
param6.Value = entry.Family == 0 ? (object)null : entry.Family;
dbcmd.Parameters.Add(param1);
dbcmd.Parameters.Add(param2);
dbcmd.Parameters.Add(param3);
dbcmd.Parameters.Add(param4);
dbcmd.Parameters.Add(param5);
dbcmd.Parameters.Add(param6);
return dbcmd;
}
@@ -329,8 +339,10 @@ namespace Cicm.Database
Company = (int)dataRow["company"],
Introduced =
dataRow["introduced"] == DBNull.Value ? DateTime.MinValue : (DateTime)dataRow["introduced"],
Model = (string)dataRow["model"],
Type = (MachineType)dataRow["type"]
Name = (string)dataRow["name"],
Type = (MachineType)dataRow["type"],
Model = dataRow["model"] == DBNull.Value ? null : (string)dataRow["model"],
Family = dataRow["family"] == DBNull.Value ? 0 : (int)dataRow["family"]
};
entries.Add(entry);