created query files

bareos · Apr 13, 2017 · b404ea7 · b404ea7
1 parent 9ecdf2c
commit b404ea7
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 59 deletions.
diff --git a/src/cats/mysql_queries.inc b/src/cats/mysql_queries.inc
@@ -361,7 +361,7 @@ SQL_QUERY(
 SELECT Job.JobId,
        File.FileIndex
 FROM Job,
-     FILE,
+     File,
      Path,
      Client
 WHERE Job.JobId=File.JobId
@@ -383,7 +383,7 @@ SQL_QUERY(
 SELECT Job.JobId,
        File.FileIndex
 FROM Job,
-     FILE,
+     File,
      Path,
      Client
 WHERE Job.JobId IN (%s)
@@ -417,28 +417,28 @@ SELECT FileId,
        DeltaSeq,
        Job.JobTDate AS JobTDate
 FROM Job,
-     FILE,
-  ( SELECT MAX(JobTDate) AS JobTDate,
-           PathId,
-           FileName
+     File,
+  (SELECT MAX(JobTDate) AS JobTDate,
+          PathId,
+          FileName
    FROM
-     ( SELECT JobTDate,
-              PathId,
-              File.Name AS FileName
-      FROM FILE
+     (SELECT JobTDate,
+             PathId,
+             File.Name AS FileName
+      FROM File
       JOIN Job USING (JobId)
       WHERE File.JobId IN (%s)
         UNION ALL
         SELECT JobTDate,
                PathId,
                File.Name AS FileName
         FROM BaseFiles
-        JOIN FILE USING (FileId)
+        JOIN File USING (FileId)
         JOIN Job ON (BaseJobId = Job.JobId) WHERE BaseFiles.JobId IN (%s) ) AS tmp
    GROUP BY PathId,
-            FileName ) AS T1
+            FileName) AS T1
 WHERE (Job.JobId IN
-         ( SELECT DISTINCT BaseJobId
+         (SELECT DISTINCT BaseJobId
           FROM BaseFiles
           WHERE JobId IN (%s))
        OR Job.JobId IN (%s))
@@ -460,7 +460,7 @@ SELECT FileId,
        File.DeltaSeq AS DeltaSeq,
        Job.JobTDate AS JobTDate
 FROM Job,
-     FILE,
+     File,
   ( SELECT MAX(JobTDate) AS JobTDate,
            PathId,
            FileName,
@@ -470,7 +470,7 @@ FROM Job,
               PathId,
               File.Name AS FileName,
               DeltaSeq
-      FROM FILE
+      FROM File
       JOIN Job USING (JobId)
       WHERE File.JobId IN (%s)
         UNION ALL
@@ -479,7 +479,7 @@ FROM Job,
                File.Name AS FileName,
                DeltaSeq
         FROM BaseFiles
-        JOIN FILE USING (FileId)
+        JOIN File USING (FileId)
         JOIN Job ON (BaseJobId = Job.JobId) WHERE BaseFiles.JobId IN (%s) ) AS tmp
    GROUP BY PathId,
             FileName,
@@ -509,13 +509,13 @@ FROM
   (SELECT max(JobTDate) AS JobTDate,
           PathId,
           File.Name
-   FROM FILE
+   FROM File
    JOIN Job USING (JobId)
    WHERE File.JobId IN (%s)
    GROUP BY PathId,
             File.Name) AS t1,
      Job AS j1,
-     FILE AS f1
+     File AS f1
 WHERE t1.JobTDate = j1.JobTDate
   AND j1.JobId IN (%s)
   AND t1.PathId = f1.PathId
@@ -589,7 +589,7 @@ SELECT Job.JobId AS JobId,
                JobBytes
 FROM Client,
      Job,
-     FILE,
+     File,
      Path
 WHERE Client.Name='%s'
   AND Client.ClientId=Job.ClientId
@@ -621,7 +621,7 @@ SQL_QUERY(
 SELECT Job.JobId,
        File.FileIndex
 FROM Job,
-     FILE,
+     File,
      Path,
      Client
 WHERE Job.JobId IN (%s)
@@ -650,7 +650,7 @@ SELECT File.JobId,
        File.FileIndex,
        File.FileId
 FROM Job,
-     FILE,
+     File,
   (SELECT MAX(JobTDate) AS JobTDate,
           PathId,
           Name
@@ -675,15 +675,15 @@ SELECT 'F',
        File.LStat,
        File.FileId
 FROM Job,
-     FILE,
+     File,
   (SELECT MAX(JobTDate) AS JobTDate,
           PathId,
           Name
    FROM
      (SELECT JobTDate,
              PathId,
              Name
-      FROM FILE
+      FROM File
       JOIN Job USING (JobId)
       WHERE File.JobId IN (%s)
         AND PathId = %s
@@ -692,7 +692,7 @@ FROM Job,
                PathId,
                File.Name
         FROM BaseFiles
-        JOIN FILE USING (FileId)
+        JOIN File USING (FileId)
         JOIN Job ON (BaseJobId = Job.JobId) WHERE BaseFiles.JobId IN (%s)
         AND PathId = %s ) AS tmp
    GROUP BY PathId,

diff --git a/src/cats/postgresql_queries.inc b/src/cats/postgresql_queries.inc
@@ -358,7 +358,7 @@ SQL_QUERY(
 SELECT Job.JobId,
        File.FileIndex
 FROM Job,
-     FILE,
+     File,
      Path,
      Client
 WHERE Job.JobId=File.JobId
@@ -380,7 +380,7 @@ SQL_QUERY(
 SELECT Job.JobId,
        File.FileIndex
 FROM Job,
-     FILE,
+     File,
      Path,
      Client
 WHERE Job.JobId IN (%s)
@@ -423,7 +423,7 @@ FROM
           LStat,
           MD5,
           DeltaSeq
-   FROM FILE
+   FROM File
    WHERE JobId IN (%s)
      UNION ALL
      SELECT File.FileId,
@@ -435,7 +435,7 @@ FROM
             MD5,
             DeltaSeq
      FROM BaseFiles
-     JOIN FILE USING (FileId) WHERE BaseFiles.JobId IN (%s) ) AS T
+     JOIN File USING (FileId) WHERE BaseFiles.JobId IN (%s) ) AS T
 JOIN Job USING (JobId)
 ORDER BY Name,
          PathId,
@@ -464,7 +464,7 @@ FROM
           LStat,
           MD5,
           DeltaSeq
-   FROM FILE
+   FROM File
    WHERE JobId IN (%s)
      UNION ALL
      SELECT File.FileId,
@@ -476,7 +476,7 @@ FROM
             MD5,
             DeltaSeq
      FROM BaseFiles
-     JOIN FILE USING (FileId) WHERE BaseFiles.JobId IN (%s) ) AS T
+     JOIN File USING (FileId) WHERE BaseFiles.JobId IN (%s) ) AS T
 JOIN Job USING (JobId)
 ORDER BY Name,
          PathId,
@@ -495,7 +495,7 @@ SELECT DISTINCT ON (File.Name,
                    File.Name,
                    LStat,
                    MD5
-FROM FILE
+FROM File
 JOIN Job USING (JobId)
 WHERE JobId IN (%s) BY File.Name,
                        PathId,
@@ -568,7 +568,7 @@ SELECT Job.JobId AS JobId,
                JobBytes
 FROM Client,
      Job,
-     FILE,
+     File,
      Path
 WHERE Client.Name='%s'
   AND Client.ClientId=Job.ClientId
@@ -599,7 +599,7 @@ SQL_QUERY(
 SELECT Job.JobId,
        File.FileIndex
 FROM Job,
-     FILE,
+     File,
      Path,
      Client
 WHERE Job.JobId IN (%s)
@@ -662,7 +662,7 @@ FROM
              FileIndex,
              LStat,
              MD5
-      FROM FILE
+      FROM File
       WHERE JobId IN (%s)
         AND PathId = %s
         UNION ALL
@@ -674,7 +674,7 @@ FROM
                LStat,
                MD5
         FROM BaseFiles
-        JOIN FILE USING (FileId) WHERE BaseFiles.JobId IN (%s)
+        JOIN File USING (FileId) WHERE BaseFiles.JobId IN (%s)
         AND File.PathId = %s ) AS T
    JOIN Job USING (JobId)
    WHERE FileName != '' %s