Tweak sql_cmds, remove unreferenced sql and reformat a sql query.

diff --git a/bacula/src/cats/sql_cmds.c b/bacula/src/cats/sql_cmds.c
index b739d6d96691d52c062d8acb1d042aa470fdf70c..0327e4bfd50749f6b90680d9f26d560f443ba5d9 100644 (file)
--- a/bacula/src/cats/sql_cmds.c
+++ b/bacula/src/cats/sql_cmds.c
@@ -217,11 +217,6 @@ const char *uar_sel_filesetid =
          "WHERE Job.ClientId=%s "
         "GROUP BY FileSet";
 
          "WHERE Job.ClientId=%s "
         "GROUP BY FileSet";
 

-/* Find MediaType used by this Job */
-const char *uar_mediatype =
-   "SELECT MediaType FROM JobMedia,Media WHERE JobMedia.JobId=%s "
-   "AND JobMedia.MediaId=Media.MediaId";
-

 /*
  *  Find JobId, FileIndex for a given path/file and date
  *  for use when inserting individual files into the tree.
 /*
  *  Find JobId, FileIndex for a given path/file and date
  *  for use when inserting individual files into the tree.


@@ -254,7 +249,7 @@ const char *uar_jobids_fileindex =
 
 /* Query to get list of files from table -- presuably built by an external program */
 const char *uar_jobid_fileindex_from_table = 
 
 /* Query to get list of files from table -- presuably built by an external program */
 const char *uar_jobid_fileindex_from_table = 

-   "SELECT JobId,FileIndex from %s";
+   "SELECT JobId,FileIndex FROM %s";

 
 /* Get the list of the last recent version per Delta with a given jobid list 
  * This is a tricky part because with SQL the result of 
 
 /* Get the list of the last recent version per Delta with a given jobid list 
  * This is a tricky part because with SQL the result of