Fix distclean to wipe CVS

[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 c1bf44d086f7b157074742d76ad8f2d97f00a4a4..c8999c36efa0ebda4d676b9e2cb62852db154599 100644 (file)
--- a/bacula/src/dird/sql_cmds.c
+++ b/bacula/src/dird/sql_cmds.c
@@ -69,7 +69,8 @@ char *create_deltabs[] = {
 char *insert_delcand = 
    "INSERT INTO DelCandidates "
    "SELECT JobId, PurgedFiles, FileSetId FROM Job "
-   "WHERE JobTDate < %s " 
+   "WHERE Type='%c' "
+   "AND JobTDate<%s " 
    "AND ClientId=%u";
 
 /* Select files from the DelCandidates table that have a
@@ -79,9 +80,9 @@ char *insert_delcand =
 char *select_backup_del =
    "SELECT DelCandidates.JobId "
    "FROM Job,DelCandidates "
-   "WHERE Job.JobTDate >= %s "
+   "WHERE Job.JobTDate>%s "
    "AND Job.ClientId=%u "
-   "AND Job.JobType='B' "
+   "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 "
+   "WHERE Job.JobTDate>%s "
    "AND Job.ClientId=%u "
-   "AND Job.JobType='V' "
+   "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 "
+   "WHERE Job.JobTDate>%s "
    "AND Job.ClientId=%u "   
-   "AND Job.JobType='R'";
+   "AND Job.Type='R'";
 
 
 
@@ -198,7 +199,7 @@ char *uar_inc =
    "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";