Skip to content

Commit

Permalink
Change the order of output for list jobs
Browse files Browse the repository at this point in the history
We now ORDER BY JobId instead of
       ORDER BY StartTime,JobId

This prevents showing jobs without starttime timestamp
always as last output.

Fixes #403: "list jobs" command output is not always sorted
  • Loading branch information
pstorz authored and Marco van Wieringen committed May 9, 2015
1 parent 0cd4fe0 commit 6ba049f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/cats/sql_list.c
Expand Up @@ -367,20 +367,20 @@ void db_list_job_records(JCR *jcr, B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *send
mdb->db_escape_string(jcr, esc, jr->Name, strlen(jr->Name));
Mmsg(mdb->cmd,
"SELECT JobId,Name,StartTime,Type,Level,JobFiles,JobBytes,JobStatus "
"FROM Job WHERE Name='%s' ORDER BY StartTime,JobId ASC", esc);
"FROM Job WHERE Name='%s' ORDER BY JobId ASC", esc);
} else if (jr->Job[0] != 0) {
mdb->db_escape_string(jcr, esc, jr->Job, strlen(jr->Job));
Mmsg(mdb->cmd,
"SELECT JobId,Name,StartTime,Type,Level,JobFiles,JobBytes,JobStatus "
"FROM Job WHERE Job='%s' ORDER BY StartTime,JobId ASC", esc);
"FROM Job WHERE Job='%s' ORDER BY JobId ASC", esc);
} else if (jr->JobId != 0) {
Mmsg(mdb->cmd,
"SELECT JobId,Name,StartTime,Type,Level,JobFiles,JobBytes,JobStatus "
"FROM Job WHERE JobId=%s", edit_int64(jr->JobId, ed1));
} else { /* all records */
Mmsg(mdb->cmd,
"SELECT JobId,Name,StartTime,Type,Level,JobFiles,JobBytes,JobStatus "
"FROM Job ORDER BY StartTime,JobId ASC%s", limit);
"FROM Job ORDER BY JobId ASC%s", limit);
}
}
if (!QUERY_DB(jcr, mdb, mdb->cmd)) {
Expand Down

0 comments on commit 6ba049f

Please sign in to comment.