From: Marco van Wieringen <mvw@planets.elm.net>
Date: Mon, 19 Apr 2010 19:03:55 +0000 (+0200)
Subject: Fix Ingres problems with queries with have both an LIMIT and OFFSET clause as we... 
X-Git-Tag: Release-5.2.1~1443
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=606464f7ef6b68bab38787c71c4c52309c8dbcf3;p=bacula%2Fbacula

Fix Ingres problems with queries with have both an LIMIT and OFFSET clause as we need to reorder this query for Ingres to be understandable we need some more regexp magic for now. Lets make things exentsible and allow for multiple regexps all being fired on a query transforming it into the query to execute. Dropped the encoding check which is for postgresql but not interesting for Ingres now we use VARBYTE and not VARCHAR.
---

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index e7f82e55e5..9e0e5060c3 100644
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -535,7 +535,6 @@ extern const char* my_pg_batch_fill_path_query;
 #ifdef HAVE_INGRES
 
 #include "myingres.h"
-#include "lib/breg.h"
 
 #define BDB_VERSION 12
 
@@ -587,7 +586,7 @@ struct B_DB {
    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 */
 };