Lets not use the mdb->transaction bool but create a private one named mdb->explicit_c...

[bacula/bacula] / bacula / src / cats / cats.h

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index 1dc05e8d98e46b65b33a7ea552653a43882cce3c..a340b79400ddf5c9380b929514f2c452b6d6ca39 100644 (file)
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -535,12 +535,11 @@ extern const char* my_pg_batch_fill_path_query;
 #ifdef HAVE_INGRES
 
 #include "myingres.h"
-#include "lib/breg.h"
 
 #define BDB_VERSION 12
 
-/* TEMP: the following is taken from select OID, typname from pg_type; */ /*SRE: huh? */
-#define IS_NUM(x)        ((x) == 20 || (x) == 21 || (x) == 23 || (x) == 700 || (x) == 701)
+/* TEMP: the following is taken from $(II_SYSTEM)/ingres/files/eqsqlda.h IISQ_ types */
+#define IS_NUM(x)        ((x) == 10 || (x) == 30 || (x) == 31)
 #define IS_NOT_NULL(x)   ((x) == 1)
 
 typedef char **INGRES_ROW;
@@ -582,12 +581,13 @@ struct B_DB {
    uint32_t cached_path_id;
    bool allow_transactions;       /* transactions allowed */
    bool transaction;              /* transaction started */
+   bool explicit_commit;          /* do an explicit commit after each query */
    int changes;                   /* changes made to db */
    POOLMEM *fname;                /* Filename only */
    POOLMEM *path;                 /* Path only */
    POOLMEM *esc_name;             /* Escaped file name */
    POOLMEM *esc_path;             /* Escaped path name */
-   BREGEXP *limit_filter;         /* Filter LIMIT function in queries into supported SQL */
+   alist *query_filters;          /* Filters to convert sql queries into supported Ingres SQL */
    int fnl;                       /* file name length */
    int pnl;                       /* path name length */
 };
@@ -942,8 +942,10 @@ struct ATTR_DBR {
 struct ROBJECT_DBR {
    char *object_name;
    char *object;
+   char *plugin_name;
    uint32_t object_len;
-   uint32_t ObjectIndex;
+   uint32_t object_index;
+   int32_t  object_compression;
    uint32_t FileIndex;
    uint32_t Stream;
    uint32_t FileType;