Drop Ingres specific versions of queries with #ifdefs

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

diff --git a/bacula/src/cats/sql_cmds.c b/bacula/src/cats/sql_cmds.c
index e3b4802bced7046b60be14e31db605e3b0efe444..8679dd0e16699a9ceba37445e4f0f2c0bfcc13af 100644 (file)
--- a/bacula/src/cats/sql_cmds.c
+++ b/bacula/src/cats/sql_cmds.c
@@ -671,6 +671,7 @@ const char *create_deltabs[5] = {
    "FileSetId INTEGER, "
    "JobFiles INTEGER, "
    "JobStatus char(1))"
+   "ON COMMIT PERSERVE ROWS WITH NORECOVERY"
 };
 
 /* ======= ua_restore.c */
@@ -721,7 +722,7 @@ const char *uar_file[5] = {
    "AND Client.ClientId=Job.ClientId "
    "AND Job.JobId=File.JobId AND File.FileIndex > 0 "
    "AND Path.PathId=File.PathId AND Filename.FilenameId=File.FilenameId "
-   "AND Filename.Name='%s' ORDER BY StartTime DESC LIMIT 20"
+   "AND Filename.Name='%s' ORDER BY StartTime DESC FETCH FIRST 20 ROWS ONLY"
    };
 
 const char *uar_create_temp[5] = {
@@ -785,11 +786,12 @@ const char *uar_create_temp[5] = {
    "Level CHAR,"
    "JobFiles INTEGER,"
    "JobBytes BIGINT,"
-   "StartTime TEXT,"
-   "VolumeName TEXT,"
+   "StartTime VARCHAR(256),"
+   "VolumeName VARCHAR(256),"
    "StartFile INTEGER,"
    "VolSessionId INTEGER,"
    "VolSessionTime INTEGER)"
+   "ON COMMIT PRESERVE ROWS WITH NORECOVERY"
    };
 
 const char *uar_create_temp1[5] = {
@@ -813,6 +815,7 @@ const char *uar_create_temp1[5] = {
    "DECLARE GLOBAL TEMPORARY TABLE temp1 ("
    "JobId INTEGER NOT NULL,"
    "JobTDate BIGINT)"
+   "ON COMMIT PRESERVE ROWS WITH NORECOVERY"
    };
 
 /* Query to get all files in a directory -- no recursing