From 1892f9de9f9e89cb896ea567cc95736d37f96a48 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 23 Oct 2015 14:00:22 +0200 Subject: [PATCH] Oracle DB 'Update' (when testing a water meter for the 2nd time) works well, version 1.5.134 --- .../BenchControl/DB/SensusOracle/Database.cs | 117 +++++------------- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +- ...enchFramework.Entities.Pressure.datasource | 10 -- 3 files changed, 34 insertions(+), 97 deletions(-) delete mode 100644 TestBenchFramework/Properties/DataSources/TestBenchFramework.Entities.Pressure.datasource diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs index 407cc5172..6245a2651 100644 --- a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs +++ b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs @@ -17,8 +17,9 @@ namespace TBF.BenchControl.DB.SensusOracle private static readonly ILog log = LogManager.GetLogger(typeof(Database)); public override string ToString() { return string.Format("ResultsWriters.Basic({0})", Cfg.ToString(1)); } - readonly DatabaseCfg dbCfg; + const int Anbid_StaraTura = 4; + readonly DatabaseCfg dbCfg; OracleConnection conn; /// Oracle database connection /// @@ -375,100 +376,46 @@ namespace TBF.BenchControl.DB.SensusOracle if (passed) { string pOrder = string.IsNullOrEmpty(unsortedResults[0].PurchaseOrder) ? string.Empty : unsortedResults[0].PurchaseOrder; - OracleParameter parm1 = new OracleParameter(); - parm1.OracleDbType = OracleDbType.Varchar2; - parm1.Value = pOrder; - - OracleParameter parm2 = new OracleParameter(); - parm2.OracleDbType = OracleDbType.Varchar2; - parm2.Value = "IPBATMXX"; - - OracleParameter parm3 = new OracleParameter(); - parm3.OracleDbType = OracleDbType.Varchar2; - parm3.Value = pcbNr; - - OracleParameter parm4 = new OracleParameter(); - parm4.OracleDbType = OracleDbType.Int32; - parm4.Value = MAX_Pruefindex; - - OracleParameter parm5 = new OracleParameter(); - parm5.OracleDbType = OracleDbType.Int32; - parm5.Value = -1; - - OracleParameter parm6 = new OracleParameter(); - parm6.OracleDbType = OracleDbType.Int32; - parm6.Value = Sekundaere_Adr; - - OracleParameter parm7 = new OracleParameter(); - parm7.OracleDbType = OracleDbType.Int32; - parm7.Value = Hydr_Pruefung; - - OracleParameter parm8 = new OracleParameter(); - parm8.OracleDbType = OracleDbType.Int32; - parm8.Value = 6; - - OracleParameter parm9 = new OracleParameter(); - parm9.OracleDbType = OracleDbType.Int32; - parm9.Value = 4; /// = ANBID Stara Tura - - OracleParameter parm10 = new OracleParameter(); - parm10.OracleDbType = OracleDbType.Int32; - parm10.Value = dbCfg.Baujahr; if (MAX_Pruefindex % 100 == 1) { - OracleCommand cmd = new OracleCommand(); - cmd.Connection = conn; - cmd.CommandText = "INSERT INTO VT_ZAEHLER_PD(Auftragsnummer, VT_Identnummer, VT_Fernum, Max_Pruefindex, Zaehlernummer, Sekundaere_Adr, Hydr_Pruefung, ID_Benutzer, ANBID, Baujahr) VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10)"; - cmd.Parameters.Add(parm1); - cmd.Parameters.Add(parm2); - cmd.Parameters.Add(parm3); - cmd.Parameters.Add(parm4); - cmd.Parameters.Add(parm5); - cmd.Parameters.Add(parm6); - cmd.Parameters.Add(parm7); - cmd.Parameters.Add(parm8); - cmd.Parameters.Add(parm9); - cmd.Parameters.Add(parm10); - int rowsUpdated = cmd.ExecuteNonQuery(); - } + OracleCommand cmd = new OracleCommand("INSERT INTO VT_ZAEHLER_PD(Auftragsnummer, VT_Identnummer, VT_Fernum, Max_Pruefindex, Zaehlernummer, Sekundaere_Adr, Hydr_Pruefung, ID_Benutzer, ANBID, Baujahr) VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10)", conn); + + OracleParameter parm; + parm = new OracleParameter("Auftragsnummer", OracleDbType.Varchar2); parm.Value = pOrder; cmd.Parameters.Add(parm); + parm = new OracleParameter("VT_Identnummer", OracleDbType.Varchar2); parm.Value = "IPBATMXX"; cmd.Parameters.Add(parm); + parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = pcbNr; cmd.Parameters.Add(parm); + parm = new OracleParameter("Max_Pruefindex", OracleDbType.Int32); parm.Value = MAX_Pruefindex; cmd.Parameters.Add(parm); + parm = new OracleParameter("Zaehlernummer", OracleDbType.Int32); parm.Value = -1; cmd.Parameters.Add(parm); + parm = new OracleParameter("Sekundaere_Adr", OracleDbType.Int32); parm.Value = Sekundaere_Adr; cmd.Parameters.Add(parm); + parm = new OracleParameter("Hydr_Pruefung", OracleDbType.Int32); parm.Value = Hydr_Pruefung; cmd.Parameters.Add(parm); + parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = 6; cmd.Parameters.Add(parm); + parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); + parm = new OracleParameter("Baujahr", OracleDbType.Int32); parm.Value = dbCfg.Baujahr; cmd.Parameters.Add(parm); + + int rowsUpdated = cmd.ExecuteNonQuery(); + } else { - //OracleCommand cmd = new OracleCommand(); - //cmd.Connection = conn; - //cmd.CommandText = "UPDATE VT_ZAEHLER_PD SET Auftragsnummer = :1, VT_Identnummer = :2, Max_Pruefindex = :4, Zaehlernummer = :5, Sekundaere_Adr= :6, Hydr_Pruefung= :7, ID_Benutzer= :8 WHERE VT_Fernum = :3 and ANBID = :9"; - //cmd.Parameters.Add(parm1); - //cmd.Parameters.Add(parm2); - //cmd.Parameters.Add(parm3); - //cmd.Parameters.Add(parm4); - //cmd.Parameters.Add(parm5); - //cmd.Parameters.Add(parm6); - //cmd.Parameters.Add(parm7); - //cmd.Parameters.Add(parm8); - //cmd.Parameters.Add(parm9); - //int rowsUpdated = cmd.ExecuteNonQuery(); - OracleTransaction transaction = conn.BeginTransaction(); try { - OracleCommand cmd = new OracleCommand(); - cmd.Connection = conn; - cmd.CommandText = "UPDATE VT_ZAEHLER_PD SET Auftragsnummer = :1, VT_Identnummer = :2, Max_Pruefindex = :4, Zaehlernummer = :5, Sekundaere_Adr= :6, Hydr_Pruefung= :7, ID_Benutzer= :8, Baujahr= :10 WHERE VT_Fernum = :3 and ANBID = :9"; - cmd.Parameters.Add(parm1); - cmd.Parameters.Add(parm2); - cmd.Parameters.Add(parm3); - cmd.Parameters.Add(parm4); - cmd.Parameters.Add(parm5); - cmd.Parameters.Add(parm6); - cmd.Parameters.Add(parm7); - cmd.Parameters.Add(parm8); - cmd.Parameters.Add(parm9); - cmd.Parameters.Add(parm10); + OracleCommand cmd = new OracleCommand("UPDATE VT_ZAEHLER_PD SET Auftragsnummer = :1, VT_Identnummer = :2, Max_Pruefindex = :3, Hydr_Pruefung= :4, ID_Benutzer= :5, Baujahr= :6 WHERE VT_Fernum = :7 and ANBID = :8", conn); - int rowsUpdated = cmd.ExecuteNonQuery(); + OracleParameter parm; + parm = new OracleParameter("Auftragsnummer", OracleDbType.Varchar2); parm.Value = pOrder; cmd.Parameters.Add(parm); + parm = new OracleParameter("VT_Identnummer", OracleDbType.Varchar2); parm.Value = "IPBATMXX"; cmd.Parameters.Add(parm); + parm = new OracleParameter("Max_Pruefindex", OracleDbType.Int32); parm.Value = MAX_Pruefindex; cmd.Parameters.Add(parm); + parm = new OracleParameter("Hydr_Pruefung", OracleDbType.Int32); parm.Value = Hydr_Pruefung; cmd.Parameters.Add(parm); + parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = 6; cmd.Parameters.Add(parm); + parm = new OracleParameter("Baujahr", OracleDbType.Int32); parm.Value = dbCfg.Baujahr; cmd.Parameters.Add(parm); + parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = pcbNr; cmd.Parameters.Add(parm); + parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); - transaction.Commit(); - } + int rowsUpdated = cmd.ExecuteNonQuery(); + + transaction.Commit(); + } catch { transaction.Rollback(); diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 2cf43e5d4..dfd24c266 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.5.133.1")] -[assembly: AssemblyFileVersion("1.5.133.1")] +[assembly: AssemblyVersion("1.5.134.1")] +[assembly: AssemblyFileVersion("1.5.134.1")] diff --git a/TestBenchFramework/Properties/DataSources/TestBenchFramework.Entities.Pressure.datasource b/TestBenchFramework/Properties/DataSources/TestBenchFramework.Entities.Pressure.datasource deleted file mode 100644 index f2df087bc..000000000 --- a/TestBenchFramework/Properties/DataSources/TestBenchFramework.Entities.Pressure.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - TBF.Entities.Pressure, TestBenchFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file