Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Switch query to use LEFT JOIN to see JobStatus 'C'
  • Loading branch information
pstorz authored and Marco van Wieringen committed Sep 4, 2015
1 parent 098de97 commit ea6dc9b
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions src/cats/sql_list.c
Expand Up @@ -372,12 +372,11 @@ void db_list_job_records(JCR *jcr, B_DB *mdb, JOB_DBR *jr, const char *range,
if (type == VERT_LIST) {

if (jobstatus > 0) {
jobstatusfilter.bsprintf(" JobStatus = '%c' AND ", jobstatus);
}

if (since_time) {
bstrutime(dt, sizeof(dt), since_time);
schedtimefilter.bsprintf(" SchedTime > '%s' AND ", dt);
jobstatusfilter.bsprintf(" WHERE JobStatus = '%c'", jobstatus);
} else if (jobstatus && since_time) {
schedtimefilter.bsprintf(" AND SchedTime > '%s' ", dt);
} else if (since_time) {
schedtimefilter.bsprintf(" WHERE SchedTime > '%s' ", dt);
}

if (jr->JobId == 0 && jr->Job[0] == 0) {
Expand All @@ -388,11 +387,13 @@ void db_list_job_records(JCR *jcr, B_DB *mdb, JOB_DBR *jr, const char *range,
"VolSessionId,VolSessionTime,JobFiles,JobBytes,JobErrors,"
"JobMissingFiles,Job.PoolId,Pool.Name as PoolName,PriorJobId,"
"Job.FileSetId,FileSet.FileSet "
"FROM Job,Client,Pool,FileSet WHERE "
"FROM Job "
"LEFT JOIN Client ON Client.ClientId=Job.ClientId "
"LEFT JOIN Pool ON Pool.PoolId=Job.PoolId "
"LEFT JOIN FileSet ON FileSet.FileSetId=Job.FileSetId "
" %s "
" %s "
"Client.ClientId=Job.ClientId AND Pool.PoolId=Job.PoolId "
"AND FileSet.FileSetId=Job.FileSetId ORDER BY StartTime%s",
"ORDER BY StartTime%s",
jobstatusfilter.c_str(),
schedtimefilter.c_str(),
range);
Expand Down

0 comments on commit ea6dc9b

Please sign in to comment.