mazak: small changes to open database kit

SeedTactics · Sep 10, 2024 · 64150d7 · 64150d7
1 parent ad884a5
commit 64150d7
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/server/machines/mazak/db/OpenDatabaseKit.cs b/server/machines/mazak/db/OpenDatabaseKit.cs
@@ -1233,7 +1233,7 @@ private bool CheckPartsExist(IList<string> parts)
       return WithReadDBConnection(conn =>
       {
         using var trans = conn.BeginTransaction();
-        var cmd = conn.CreateCommand();
+        using var cmd = conn.CreateCommand();
         cmd.Transaction = trans;
         cmd.CommandText = "SELECT COUNT(*) FROM Part WHERE PartName = @p";
         var param = cmd.CreateParameter();
@@ -1244,7 +1244,7 @@ private bool CheckPartsExist(IList<string> parts)
         foreach (var p in parts)
         {
           param.Value = p;
-          if ((int)cmd.ExecuteScalar() == 0)
+          if ((long)cmd.ExecuteScalar() == 0)
           {
             return false;
           }
@@ -1262,7 +1262,7 @@ private bool CheckSchedulesExist(IList<int> scheduleIds)
       return WithReadDBConnection(conn =>
       {
         using var trans = conn.BeginTransaction();
-        var cmd = conn.CreateCommand();
+        using var cmd = conn.CreateCommand();
         cmd.Transaction = trans;
 
         cmd.CommandText = "SELECT COUNT(*) FROM Schedule WHERE ScheduleID = @s";
@@ -1274,7 +1274,7 @@ private bool CheckSchedulesExist(IList<int> scheduleIds)
         foreach (var s in scheduleIds)
         {
           param.Value = s;
-          if ((int)cmd.ExecuteScalar() == 0)
+          if ((long)cmd.ExecuteScalar() == 0)
           {
             return false;
           }
@@ -1311,6 +1311,7 @@ public MazakAllDataAndLogs LoadAllDataAndLogs(string maxLogID)
         }
         else
         {
+          trans.Rollback();
           logs = LogCSVParsing.LoadLog(maxLogID, _cfg.LogCSVPath);
         }