Fix newvol.c

[bacula/bacula] / bacula / src / dird / sql_cmds.c

diff --git a/bacula/src/dird/sql_cmds.c b/bacula/src/dird/sql_cmds.c
index 61bf6daa289d6e1f3788fd238cd978b1ce018b45..c8999c36efa0ebda4d676b9e2cb62852db154599 100644 (file)
--- a/bacula/src/dird/sql_cmds.c
+++ b/bacula/src/dird/sql_cmds.c
@@ -45,7 +45,7 @@ char *sel_JobMedia = "SELECT JobId FROM JobMedia WHERE MediaId=%u";
 char *select_job =
    "SELECT JobId from Job "    
    "WHERE JobTDate < %s "
-   "AND ClientId=%d "
+   "AND ClientId=%u "
    "AND PurgedFiles=0";
 
 /* Delete temp tables and indexes  */
@@ -69,8 +69,9 @@ char *create_deltabs[] = {
 char *insert_delcand = 
    "INSERT INTO DelCandidates "
    "SELECT JobId, PurgedFiles, FileSetId FROM Job "
-   "WHERE JobTDate < %s " 
-   "AND ClientId=%d";
+   "WHERE Type='%c' "
+   "AND JobTDate<%s " 
+   "AND ClientId=%u";
 
 /* Select files from the DelCandidates table that have a
  * more recent backup -- i.e. are not the only backup.
@@ -79,9 +80,9 @@ char *insert_delcand =
 char *select_backup_del =
    "SELECT DelCandidates.JobId "
    "FROM Job,DelCandidates "
-   "WHERE Job.JobTDate >= %s "
-   "AND Job.ClientId=%d "
-   "AND Job.JobType='B' "
+   "WHERE Job.JobTDate>%s "
+   "AND Job.ClientId=%u "
+   "AND Job.Type='B' "
    "AND Job.Level='F' "
    "AND Job.JobStatus='T' "
    "AND Job.FileSetId=DelCandidates.FileSetId";
@@ -93,9 +94,9 @@ char *select_backup_del =
 char *select_verify_del =
    "SELECT DelCandidates.JobId "
    "FROM Job,DelCandidates "
-   "WHERE Job.JobTDate >= %s "
-   "AND Job.ClientId=%d "
-   "AND Job.JobType='V' "
+   "WHERE Job.JobTDate>%s "
+   "AND Job.ClientId=%u "
+   "AND Job.Type='V' "
    "AND Job.Level='V' "
    "AND Job.JobStatus='T' "
    "AND Job.FileSetId=DelCandidates.FileSetId";
@@ -107,9 +108,9 @@ char *select_verify_del =
 char *select_restore_del =
    "SELECT DelCandidates.JobId "
    "FROM Job,DelCandidates "
-   "WHERE Job.JobTDate >= %s "
-   "AND Job.ClientId=%d "   
-   "AND Job.JobType='R'";
+   "WHERE Job.JobTDate>%s "
+   "AND Job.ClientId=%u "   
+   "AND Job.Type='R'";
 
 
 
@@ -120,7 +121,7 @@ char *uar_list_jobs =
    "SELECT JobId,Client.Name as Client,StartTime,Type as "
    "JobType,JobFiles,JobBytes "
    "FROM Client,Job WHERE Client.ClientId=Job.ClientId AND JobStatus='T' "
-   "LIMIT 20";
+   "AND Type='B' LIMIT 20";
 
 #ifdef HAVE_MYSQL
 /*  MYSQL IS NOT STANDARD SQL !!!!! */
@@ -169,13 +170,12 @@ char *uar_create_temp =
 
 char *uar_create_temp1 = 
    "CREATE TABLE temp1 (JobId INTEGER UNSIGNED NOT NULL,"
-   "JobTDate BIGINT UNSIGNED,"
-   "ClientId INTEGER UNSIGNED)";
+   "JobTDate BIGINT UNSIGNED)";
 
 char *uar_last_full =
-   "INSERT INTO temp1 SELECT Job.JobId,JobTdate,Job.ClientId "
-   "FROM Client,Job,JobMedia,Media WHERE Client.Name='%s' "
-   "AND Client.ClientId=Job.ClientId "
+   "INSERT INTO temp1 SELECT Job.JobId,JobTdate "
+   "FROM Client,Job,JobMedia,Media WHERE Client.ClientId=%u "
+   "AND Job.ClientId=%u "
    "AND Level='F' AND JobStatus='T' "
    "AND JobMedia.JobId=Job.JobId "
    "AND JobMedia.MediaId=Media.MediaId "
@@ -196,10 +196,10 @@ char *uar_inc =
    "Job.Level,Job.JobFiles,Job.StartTime,Media.VolumeName,JobMedia.StartFile,"
    "Job.VolSessionId,Job.VolSessionTime "
    "FROM Job,JobMedia,Media "
-   "WHERE Job.JobTDate>%d AND Job.ClientId=%u "
+   "WHERE Job.JobTDate>%s AND Job.ClientId=%u "
    "AND JobMedia.JobId=Job.JobId "
    "AND JobMedia.MediaId=Media.MediaId "
-   "AND Job.Level='I' AND JobStatus='T' "
+   "AND Job.Level IN ('I', 'D') AND JobStatus='T' "
    "AND Job.FileSetId=%u "
    "GROUP BY Job.JobId";
 
@@ -213,10 +213,10 @@ char *uar_sel_all_temp1 = "SELECT * FROM temp1";
 
 /* Select filesets for this Client */
 char *uar_sel_fileset = 
-   "SELECT FileSet.FileSetId,FileSet.FileSet FROM Job,"
+   "SELECT FileSet.FileSetId,FileSet.FileSet,FileSet.MD5 FROM Job,"
    "Client,FileSet WHERE Job.FileSetId=FileSet.FileSetId "
-   "AND Job.ClientId=Client.ClientId AND Client.Name='%s' "
-   "GROUP BY FileSetId";
+   "AND Job.ClientId=%u AND Client.ClientId=%u "
+   "GROUP BY FileSet.FileSetId";
 
 /* Find MediaType used by this Job */
 char *uar_mediatype =