remove GROUP BY on db_get_job_volume_names. REVIEW.

[bacula/bacula] / bacula / src / cats / sql_update.c

diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index 510c21bab2f1959ab6378c15f8767c410fe45aa9..1030bcb49f34429e15dac79c2db5e87bfec2a18a 100644 (file)
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -34,7 +34,7 @@
 #include "bacula.h"
 #include "cats.h"
 
-#if    HAVE_MYSQL || HAVE_SQLITE
+#if    HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL
 
 /* -----------------------------------------------------------------------
  *
@@ -103,9 +103,10 @@ db_update_job_start_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
    JobTDate = (btime_t)stime;
 
    db_lock(mdb);
-   Mmsg(&mdb->cmd, "UPDATE Job SET Level='%c', StartTime='%s', \
-ClientId=%u, JobTDate=%s WHERE JobId=%u",
+   Mmsg(&mdb->cmd, "UPDATE Job SET Level='%c', StartTime='%s',"
+"ClientId=%u, JobTDate=%s WHERE JobId=%u",
       (char)(jr->Level), dt, jr->ClientId, edit_uint64(JobTDate, ed1), jr->JobId);
+
    stat = UPDATE_DB(jcr, mdb, mdb->cmd);
    db_unlock(mdb);
    mdb->changes = 0;
@@ -266,23 +267,26 @@ db_update_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
       }
       localtime_r(&ttime, &tm);
       strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
-      Mmsg(&mdb->cmd, "UPDATE Media SET LabelDate='%s'\
- WHERE VolumeName='%s'", dt, mr->VolumeName);
+      Mmsg(&mdb->cmd, "UPDATE Media SET LabelDate='%s' "
+           "WHERE VolumeName='%s'", dt, mr->VolumeName);
       stat = UPDATE_DB(jcr, mdb, mdb->cmd);
    }
+   
+   /* Make sure InChanger is 0 for any record having the same Slot */
+   db_make_inchanger_unique(jcr, mdb, mr);
 
    ttime = mr->LastWritten;
    localtime_r(&ttime, &tm);
    strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
 
-   Mmsg(&mdb->cmd, "UPDATE Media SET VolJobs=%u,\
- VolFiles=%u,VolBlocks=%u,VolBytes=%s,VolMounts=%u,VolErrors=%u,\
- VolWrites=%u,MaxVolBytes=%s,LastWritten='%s',VolStatus='%s',\
- Slot=%d WHERE VolumeName='%s'",
-   mr->VolJobs, mr->VolFiles, mr->VolBlocks, edit_uint64(mr->VolBytes, ed1),
-   mr->VolMounts, mr->VolErrors, mr->VolWrites, 
-   edit_uint64(mr->MaxVolBytes, ed2), dt, 
-   mr->VolStatus, mr->Slot, mr->VolumeName);
+   Mmsg(&mdb->cmd, "UPDATE Media SET VolJobs=%u,"
+        "VolFiles=%u,VolBlocks=%u,VolBytes=%s,VolMounts=%u,VolErrors=%u,"
+        "VolWrites=%u,MaxVolBytes=%s,LastWritten='%s',VolStatus='%s',"
+        "Slot=%d,Drive=%d,InChanger=%d WHERE VolumeName='%s'",
+        mr->VolJobs, mr->VolFiles, mr->VolBlocks, edit_uint64(mr->VolBytes, ed1),
+        mr->VolMounts, mr->VolErrors, mr->VolWrites, 
+        edit_uint64(mr->MaxVolBytes, ed2), dt, 
+        mr->VolStatus, mr->Slot, mr->Drive, mr->InChanger, mr->VolumeName);
 
    Dmsg1(400, "%s\n", mdb->cmd);
 
@@ -291,4 +295,21 @@ db_update_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
    return stat;
 }
 
-#endif /* HAVE_MYSQL || HAVE_SQLITE */
+/* 
+ * If we have a non-zero InChanger, ensure that no other Media
+ *  record in this Pool has InChanger set on the same Slot.
+ *
+ * This routine assumes the database is already locked.
+ */
+void
+db_make_inchanger_unique(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) 
+{
+   if (mr->InChanger != 0 && mr->Slot != 0) {
+      Mmsg(&mdb->cmd, "UPDATE Media SET InChanger=0 WHERE PoolId=%u "
+           "AND Slot=%d\n", mr->PoolId, mr->Slot);
+      Dmsg1(400, "%s\n", mdb->cmd);
+      UPDATE_DB(jcr, mdb, mdb->cmd);
+   }
+}
+
+#endif /* HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL*/