#include "bacula.h"
#include "cats.h"
-#if HAVE_MYSQL || HAVE_SQLITE
+#if HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL
/* -----------------------------------------------------------------------
*
return stat;
}
+/*
+ * Given an incoming integer, set the string buffer to either NULL or the value
+ *
+ *
+ */
+void edit_num_or_null(char *s, size_t n, uint32_t id) {
+ bsnprintf(s, n, id ? "%u" : "NULL", id);
+}
/*
int stat;
char ed1[30], ed2[30];
btime_t JobTDate;
+ char PoolId [50];
+ char FileSetId [50];
+ char ClientId [50];
+
+
+ /* some values are set to zero, which translates to NULL in SQL */
+ edit_num_or_null(PoolId, sizeof(PoolId), jr->PoolId);
+ edit_num_or_null(FileSetId, sizeof(FileSetId), jr->FileSetId);
+ edit_num_or_null(ClientId, sizeof(ClientId), jr->ClientId);
ttime = jr->EndTime;
localtime_r(&ttime, &tm);
db_lock(mdb);
Mmsg(&mdb->cmd,
"UPDATE Job SET JobStatus='%c', EndTime='%s', \
-ClientId=%u, JobBytes=%s, JobFiles=%u, JobErrors=%u, VolSessionId=%u, \
-VolSessionTime=%u, PoolId=%u, FileSetId=%u, JobTDate=%s WHERE JobId=%u",
- (char)(jr->JobStatus), dt, jr->ClientId, edit_uint64(jr->JobBytes, ed1),
+ClientId=%s, JobBytes=%s, JobFiles=%u, JobErrors=%u, VolSessionId=%u, \
+VolSessionTime=%u, PoolId=%s, FileSetId=%s, JobTDate=%s WHERE JobId=%u",
+ (char)(jr->JobStatus), dt, ClientId, edit_uint64(jr->JobBytes, ed1),
jr->JobFiles, jr->JobErrors, jr->VolSessionId, jr->VolSessionTime,
- jr->PoolId, jr->FileSetId, edit_uint64(JobTDate, ed2), jr->JobId);
+ PoolId, FileSetId, edit_uint64(JobTDate, ed2), jr->JobId);
stat = UPDATE_DB(jcr, mdb, mdb->cmd);
db_unlock(mdb);
time_t ttime;
struct tm tm;
int stat;
- char ed1[30], ed2[30];
+ char ed1[30], ed2[30], ed3[30], ed4[30];
Dmsg1(100, "update_media: FirstWritten=%d\n", mr->FirstWritten);
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'",
+ "Slot=%d,InChanger=%d,VolReadTime=%s,VolWriteTime=%s "
+ " 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);
+ mr->VolStatus, mr->Slot, mr->InChanger,
+ edit_uint64(mr->VolReadTime, ed3),
+ edit_uint64(mr->VolWriteTime, ed4),
+ mr->VolumeName);
+
Dmsg1(400, "%s\n", mdb->cmd);
}
}
-#endif /* HAVE_MYSQL || HAVE_SQLITE */
+#endif /* HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL*/