Merged loadable queries

GNUmakefile.in

@@ -22,7 +22,7 @@ fd_subdirs = src scripts src/lib src/findlib @LMDB_DIR@ src/filed \
        @BAT_DIR@ @TRAY_MONITOR_DIR@ src/console @FD_PLUGIN_DIR@
 
 # Non-client-only directores
-subdirs = src/cats @NDMP_DIR@ @DIRD_DIR@ @STORED_DIR@ @SD_BACKENDS_DIR@ @SD_PLUGIN_DIR@ @DIR_PLUGIN_DIR@ src/tools
+subdirs = src/cats src/cats/dml @NDMP_DIR@ @DIRD_DIR@ @STORED_DIR@ @SD_BACKENDS_DIR@ @SD_PLUGIN_DIR@ @DIR_PLUGIN_DIR@ src/tools
 
 unittest_dirs = @UNITTEST_DIRS@
 unittest_base_dirs = $(unittest_dirs:/unittests= )

Makefile.in

@@ -22,7 +22,7 @@ fd_subdirs = src scripts src/lib src/findlib @LMDB_DIR@ src/filed \
        @BAT_DIR@ @TRAY_MONITOR_DIR@ src/console @FD_PLUGIN_DIR@
 
 # Non-client-only directores
-subdirs = src/cats @NDMP_DIR@ @DIRD_DIR@ @STORED_DIR@ @SD_BACKENDS_DIR@ @SD_PLUGIN_DIR@ @DIR_PLUGIN_DIR@ src/tools
+subdirs = src/cats src/cats/dml @NDMP_DIR@ @DIRD_DIR@ @STORED_DIR@ @SD_BACKENDS_DIR@ @SD_PLUGIN_DIR@ @DIR_PLUGIN_DIR@ src/tools
 
 unittest_dirs = @UNITTEST_DIRS@
 unittest_base_dirs = $(unittest_dirs:/unittests= )

autoconf/Make.common.in

@@ -33,6 +33,7 @@ includedir = @includedir@
 sysconfdir = @sysconfdir@
 confdir = @confdir@
 backenddir = @backenddir@
+backendquerydir = @backendquerydir@
 plugindir = @plugindir@
 scriptdir = @scriptdir@
 archivedir = @archivedir@

autoconf/config.h.in

@@ -1209,6 +1209,9 @@
 /* Directory for backend files */
 #undef _PATH_BAREOS_BACKENDDIR
 
+/* Directory for backend query files */
+#undef _PATH_BAREOS_BACKENDQUERYDIR
+
 /* Directory for PID files */
 #undef _PATH_BAREOS_PIDDIR
 

autoconf/configure.in

@@ -1482,6 +1482,21 @@ AC_ARG_WITH(scriptdir,
 
 AC_SUBST(scriptdir)
 
+dnl ------------------------------------------
+dnl Where to place query files
+dnl ------------------------------------------
+backendquerydir=`eval echo ${scriptdir}/dml`
+AC_ARG_WITH(backendquerydir,
+   AC_HELP_STRING([--with-backendquerydir=PATH], [specify path of Bareos backend query directory]),
+   [
+       if test "x$withval" != "xno" ; then
+	  backendquerydir=$withval
+       fi
+   ]
+)
+
+AC_DEFINE_UNQUOTED(_PATH_BAREOS_BACKENDQUERYDIR, "$backendquerydir", [Directory for backend query files])
+AC_SUBST(backendquerydir)
 
 # ------------------------------------------
 # Where to place backenddir (backend library files)
@@ -2145,6 +2160,43 @@ if test x$build_client_only != xyes; then
          done
          ;;
    esac
+
+   dnl -------------------------------------------
+   dnl See what database backends are enabled and
+   dnl built a list of loadable query table files
+   dnl to create
+   dnl -------------------------------------------
+   DBI_BACKENDS="sqlite3 mysql postgresql"
+   BACKEND_QUERY_FILES=""
+   for backend in ${DB_BACKENDS}
+   do
+      case ${backend} in
+         dbi)
+            dnl -------------------------------------------
+            dnl See what DBI backend queryfiles we are missing
+            dnl -------------------------------------------
+            for dbi_backend in ${DBI_BACKENDS}
+             do
+               found=0
+               for defined_queryfile in ${BACKEND_QUERY_FILES}
+               do
+                  if test ${defined_queryfile} = ${dbi_backend}; then
+                     found=1
+                     break
+                  fi
+               done
+               if test ${found} = 0; then
+                  test -z "${BACKEND_QUERY_FILES}" ] && BACKEND_QUERY_FILES="${dbi_backend}" || \
+                                                        BACKEND_QUERY_FILES="${BACKEND_QUERY_FILES} ${dbi_backend}"
+               fi
+             done
+             ;;
+         *)
+            test -z "${BACKEND_QUERY_FILES}" && BACKEND_QUERY_FILES="${backend}" || \
+                                                BACKEND_QUERY_FILES="${BACKEND_QUERY_FILES} ${backend}"
+            ;;
+       esac
+   done
 fi
 
 dnl -------------------------------------------
@@ -2169,6 +2221,7 @@ fi
 
 AC_SUBST(uncomment_dbi)
 AC_SUBST(DB_BACKENDS)
+AC_SUBST(BACKEND_QUERY_FILES)
 AC_SUBST(DB_LIBS)
 AC_SUBST(DEFAULT_DB_TYPE)
 AC_SUBST(LIBTOOL_INSTALL_DEFAULT_BACKEND_TARGET)
@@ -4663,6 +4716,7 @@ src/cats/drop_bareos_tables \
 src/cats/drop_bareos_database \
 src/cats/install-default-backend \
 src/cats/ddl/versions.map \
+src/cats/dml/Makefile \
 src/findlib/Makefile \
 src/findlib/unittests/Makefile \
 src/lmdb/Makefile \

configure

@@ -693,6 +693,7 @@ SHARED_CATALOG_TARGETS
 LIBTOOL_INSTALL_DEFAULT_BACKEND_TARGET
 DEFAULT_DB_TYPE
 DB_LIBS
+BACKEND_QUERY_FILES
 DB_BACKENDS
 uncomment_dbi
 SQLITE_BINDIR
@@ -743,6 +744,7 @@ plugindir
 logdir
 bsrdir
 backenddir
+backendquerydir
 scriptdir
 hostname
 basename
@@ -1042,6 +1044,7 @@ with_archivedir
 with_basename
 with_hostname
 with_scriptdir
+with_backendquerydir
 with_backenddir
 with_bsrdir
 with_logdir
@@ -1819,6 +1822,8 @@ Optional Packages:
   --with-basename=RESNAME specify base resource name for daemons
   --with-hostname=RESNAME specify host name for daemons
   --with-scriptdir=PATH   specify path of Bareos scripts directory
+  --with-backendquerydir=PATH
+                          specify path of Bareos backend query directory
   --with-backenddir=PATH  specify path of Bareos backends directory
   --with-bsrdir=PATH      specify path of Bareos bsrs directory
   --with-logdir=PATH      specify path of Bareos logs directory
@@ -24802,6 +24807,25 @@ fi
 
 
 
+backendquerydir=`eval echo ${scriptdir}/dml`
+
+# Check whether --with-backendquerydir was given.
+if test "${with_backendquerydir+set}" = set; then :
+  withval=$with_backendquerydir;
+       if test "x$withval" != "xno" ; then
+	  backendquerydir=$withval
+       fi
+
+
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define _PATH_BAREOS_BACKENDQUERYDIR "$backendquerydir"
+_ACEOF
+
+
 
 # ------------------------------------------
 # Where to place backenddir (backend library files)
@@ -26454,6 +26478,35 @@ if test x$build_client_only != xyes; then
          done
          ;;
    esac
+
+                  DBI_BACKENDS="sqlite3 mysql postgresql"
+   BACKEND_QUERY_FILES=""
+   for backend in ${DB_BACKENDS}
+   do
+      case ${backend} in
+         dbi)
+                                                for dbi_backend in ${DBI_BACKENDS}
+             do
+               found=0
+               for defined_queryfile in ${BACKEND_QUERY_FILES}
+               do
+                  if test ${defined_queryfile} = ${dbi_backend}; then
+                     found=1
+                     break
+                  fi
+               done
+               if test ${found} = 0; then
+                  test -z "${BACKEND_QUERY_FILES}" ] && BACKEND_QUERY_FILES="${dbi_backend}" || \
+                                                        BACKEND_QUERY_FILES="${BACKEND_QUERY_FILES} ${dbi_backend}"
+               fi
+             done
+             ;;
+         *)
+            test -z "${BACKEND_QUERY_FILES}" && BACKEND_QUERY_FILES="${backend}" || \
+                                                BACKEND_QUERY_FILES="${BACKEND_QUERY_FILES} ${backend}"
+            ;;
+       esac
+   done
 fi
 
 if test x$use_dynamic_cats_backends = xyes; then
@@ -26474,6 +26527,7 @@ fi
 
 
 
+
 $as_echo "#define PROTOTYPES 1" >>confdefs.h
 
 
@@ -33850,7 +33904,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then
    exit 1
 fi
 
-ac_config_files="$ac_config_files autoconf/Make.common Makefile GNUmakefile manpages/Makefile scripts/bareos-config scripts/bareos-config-lib.sh scripts/bareos-explorer scripts/bareos-glusterfind-wrapper scripts/btraceback scripts/bconsole scripts/bareos scripts/bareos-ctl-dir scripts/bareos-ctl-fd scripts/bareos-ctl-sd scripts/devel_bareos scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/logwatch/Makefile scripts/logwatch/logfile.bareos.conf scripts/bat.console_apps src/Makefile src/include/host.h src/console/Makefile src/console/bconsole.conf src/qt-tray-monitor/bareos-tray-monitor.desktop src/qt-tray-monitor/tray-monitor.conf src/qt-tray-monitor/tray-monitor.pro src/qt-console/bat.conf src/qt-console/bat.desktop src/qt-console/bat.pro src/qt-console/install_conf_file src/defaultconfigs/bareos-dir.d/catalog/MyCatalog.conf src/defaultconfigs/bareos-dir.d/client/bareos-fd.conf src/defaultconfigs/bareos-dir.d/console/bareos-mon.conf src/defaultconfigs/bareos-dir.d/director/bareos-dir.conf src/defaultconfigs/bareos-dir.d/fileset/Catalog.conf src/defaultconfigs/bareos-dir.d/fileset/LinuxAll.conf src/defaultconfigs/bareos-dir.d/fileset/SelfTest.conf src/defaultconfigs/bareos-dir.d/job/BackupCatalog.conf src/defaultconfigs/bareos-dir.d/jobdefs/DefaultJob.conf src/defaultconfigs/bareos-dir.d/messages/Daemon.conf src/defaultconfigs/bareos-dir.d/messages/Standard.conf src/defaultconfigs/bareos-dir.d/storage/File.conf src/defaultconfigs/bareos-sd.d/device/FileStorage.conf src/defaultconfigs/bareos-sd.d/director/bareos-dir.conf src/defaultconfigs/bareos-sd.d/director/bareos-mon.conf src/defaultconfigs/bareos-sd.d/storage/bareos-sd.conf src/defaultconfigs/bareos-fd.d/client/myself.conf src/defaultconfigs/bareos-fd.d/director/bareos-dir.conf src/defaultconfigs/bareos-fd.d/director/bareos-mon.conf src/defaultconfigs/tray-monitor.d/client/FileDaemon-local.conf src/defaultconfigs/tray-monitor.d/director/Director-local.conf src/defaultconfigs/tray-monitor.d/monitor/bareos-mon.conf src/defaultconfigs/tray-monitor.d/storage/StorageDaemon-local.conf src/dird/Makefile src/dird/bareos-dir.conf src/lib/Makefile src/lib/unittests/Makefile src/stored/Makefile src/stored/bareos-sd.conf src/stored/backends/Makefile src/filed/Makefile src/filed/bareos-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_bareos_database src/cats/update_bareos_tables src/cats/grant_bareos_privileges src/cats/make_bareos_tables src/cats/drop_bareos_tables src/cats/drop_bareos_database src/cats/install-default-backend src/cats/ddl/versions.map src/findlib/Makefile src/findlib/unittests/Makefile src/lmdb/Makefile src/ndmp/Makefile src/tests/Makefile src/tools/Makefile src/plugins/filed/Makefile src/plugins/filed/python-ldap-conf.d/bareos-dir.d/fileset/plugin-ldap.conf.example src/plugins/stored/Makefile src/plugins/dird/Makefile po/Makefile.in src/defaultconfigs/diskonly/bareos-sd.conf src/defaultconfigs/diskonly/bareos-dir.conf $PFILES"
+ac_config_files="$ac_config_files autoconf/Make.common Makefile GNUmakefile manpages/Makefile scripts/bareos-config scripts/bareos-config-lib.sh scripts/bareos-explorer scripts/bareos-glusterfind-wrapper scripts/btraceback scripts/bconsole scripts/bareos scripts/bareos-ctl-dir scripts/bareos-ctl-fd scripts/bareos-ctl-sd scripts/devel_bareos scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/logwatch/Makefile scripts/logwatch/logfile.bareos.conf scripts/bat.console_apps src/Makefile src/include/host.h src/console/Makefile src/console/bconsole.conf src/qt-tray-monitor/bareos-tray-monitor.desktop src/qt-tray-monitor/tray-monitor.conf src/qt-tray-monitor/tray-monitor.pro src/qt-console/bat.conf src/qt-console/bat.desktop src/qt-console/bat.pro src/qt-console/install_conf_file src/defaultconfigs/bareos-dir.d/catalog/MyCatalog.conf src/defaultconfigs/bareos-dir.d/client/bareos-fd.conf src/defaultconfigs/bareos-dir.d/console/bareos-mon.conf src/defaultconfigs/bareos-dir.d/director/bareos-dir.conf src/defaultconfigs/bareos-dir.d/fileset/Catalog.conf src/defaultconfigs/bareos-dir.d/fileset/LinuxAll.conf src/defaultconfigs/bareos-dir.d/fileset/SelfTest.conf src/defaultconfigs/bareos-dir.d/job/BackupCatalog.conf src/defaultconfigs/bareos-dir.d/jobdefs/DefaultJob.conf src/defaultconfigs/bareos-dir.d/messages/Daemon.conf src/defaultconfigs/bareos-dir.d/messages/Standard.conf src/defaultconfigs/bareos-dir.d/storage/File.conf src/defaultconfigs/bareos-sd.d/device/FileStorage.conf src/defaultconfigs/bareos-sd.d/director/bareos-dir.conf src/defaultconfigs/bareos-sd.d/director/bareos-mon.conf src/defaultconfigs/bareos-sd.d/storage/bareos-sd.conf src/defaultconfigs/bareos-fd.d/client/myself.conf src/defaultconfigs/bareos-fd.d/director/bareos-dir.conf src/defaultconfigs/bareos-fd.d/director/bareos-mon.conf src/defaultconfigs/tray-monitor.d/client/FileDaemon-local.conf src/defaultconfigs/tray-monitor.d/director/Director-local.conf src/defaultconfigs/tray-monitor.d/monitor/bareos-mon.conf src/defaultconfigs/tray-monitor.d/storage/StorageDaemon-local.conf src/dird/Makefile src/dird/bareos-dir.conf src/lib/Makefile src/lib/unittests/Makefile src/stored/Makefile src/stored/bareos-sd.conf src/stored/backends/Makefile src/filed/Makefile src/filed/bareos-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_bareos_database src/cats/update_bareos_tables src/cats/grant_bareos_privileges src/cats/make_bareos_tables src/cats/drop_bareos_tables src/cats/drop_bareos_database src/cats/install-default-backend src/cats/ddl/versions.map src/cats/dml/Makefile src/findlib/Makefile src/findlib/unittests/Makefile src/lmdb/Makefile src/ndmp/Makefile src/tests/Makefile src/tools/Makefile src/plugins/filed/Makefile src/plugins/filed/python-ldap-conf.d/bareos-dir.d/fileset/plugin-ldap.conf.example src/plugins/stored/Makefile src/plugins/dird/Makefile po/Makefile.in src/defaultconfigs/diskonly/bareos-sd.conf src/defaultconfigs/diskonly/bareos-dir.conf $PFILES"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -35020,6 +35074,7 @@ do
     "src/cats/drop_bareos_database") CONFIG_FILES="$CONFIG_FILES src/cats/drop_bareos_database" ;;
     "src/cats/install-default-backend") CONFIG_FILES="$CONFIG_FILES src/cats/install-default-backend" ;;
     "src/cats/ddl/versions.map") CONFIG_FILES="$CONFIG_FILES src/cats/ddl/versions.map" ;;
+    "src/cats/dml/Makefile") CONFIG_FILES="$CONFIG_FILES src/cats/dml/Makefile" ;;
     "src/findlib/Makefile") CONFIG_FILES="$CONFIG_FILES src/findlib/Makefile" ;;
     "src/findlib/unittests/Makefile") CONFIG_FILES="$CONFIG_FILES src/findlib/unittests/Makefile" ;;
     "src/lmdb/Makefile") CONFIG_FILES="$CONFIG_FILES src/lmdb/Makefile" ;;

debian/bareos-database-mysql.install.in

@@ -1,4 +1,5 @@
 @backenddir@/libbareoscats-mysql*.so
 @scriptdir@/ddl/*/mysql*.sql
+@scriptdir@/dml/mysql.bdbqf
 /usr/share/dbconfig-common/data/bareos-database-common/install/mysql
 /usr/share/dbconfig-common/data/bareos-database-common/upgrade/mysql/*

debian/bareos-database-postgresql.install.in

@@ -1,5 +1,6 @@
 @backenddir@/libbareoscats-postgresql*.so
 @scriptdir@/ddl/*/postgresql*.sql
+@scriptdir@/dml/postgresql.bdbqf
 /usr/share/dbconfig-common/data/bareos-database-common/install/pgsql
 /usr/share/dbconfig-common/data/bareos-database-common/upgrade-dbadmin/pgsql/*
 /usr/share/dbconfig-common/data/bareos-database-common/upgrade/pgsql/*

debian/bareos-database-sqlite3.install.in

@@ -1,4 +1,5 @@
 @backenddir@/libbareoscats-sqlite3*.so
 @scriptdir@/ddl/*/sqlite3*.sql
+@scriptdir@/dml/sqlite3.bdbqf
 /usr/share/dbconfig-common/data/bareos-database-common/install/sqlite3
 /usr/share/dbconfig-common/data/bareos-database-common/upgrade/sqlite3/*

platforms/packaging/bareos.spec

@@ -1141,6 +1141,7 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %dir %{script_dir}/ddl/drops
 %dir %{script_dir}/ddl/grants
 %dir %{script_dir}/ddl/updates
+%dir %{script_dir}/dml
 %{script_dir}/create_bareos_database
 %{script_dir}/drop_bareos_database
 %{script_dir}/drop_bareos_tables
@@ -1153,13 +1154,15 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 # postgresql catalog files
 %defattr(-, root, root)
 %{script_dir}/ddl/*/postgresql*.sql
+%{script_dir}/dml/postgresql.bdbqf
 %{backend_dir}/libbareoscats-postgresql.so
 %{backend_dir}/libbareoscats-postgresql-*.so
 
 %files database-mysql
 # mysql catalog files
 %defattr(-, root, root)
 %{script_dir}/ddl/*/mysql*.sql
+%{script_dir}/dml/mysql.bdbqf
 %{backend_dir}/libbareoscats-mysql.so
 %{backend_dir}/libbareoscats-mysql-*.so
 
@@ -1168,6 +1171,7 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 # sqlite3 catalog files
 %defattr(-, root, root)
 %{script_dir}/ddl/*/sqlite3*.sql
+%{script_dir}/dml/sqlite3.bdbqf
 %{backend_dir}/libbareoscats-sqlite3.so
 %{backend_dir}/libbareoscats-sqlite3-*.so
 %endif

src/cats/Makefile.in

@@ -23,7 +23,7 @@ dummy:
 #
 # include files installed when using libtool
 #
-INCLUDE_FILES = cats.h protos.h sql_cmds.h
+INCLUDE_FILES = cats.h protos.h
 
 MYSQL_INCLUDE = @MYSQL_INCLUDE@
 MYSQL_LIBS = @MYSQL_LIBS@
@@ -57,9 +57,8 @@ SQLITE_LOBJS = $(SQLITE_SRCS:.c=.lo)
 
 DB_LIBS=@DB_LIBS@
 
-LIBBAREOSSQL_SRCS = bvfs.c cats.c sql.c sql_cmds.c sql_create.c sql_delete.c \
-		    sql_find.c sql_get.c sql_glue.c sql_list.c sql_pooling.c \
-		    sql_update.c
+LIBBAREOSSQL_SRCS = bvfs.c cats.c sql.c sql_create.c sql_delete.c sql_find.c \
+		    sql_get.c sql_list.c sql_pooling.c sql_query.c sql_update.c
 LIBBAREOSSQL_OBJS = $(LIBBAREOSSQL_SRCS:.c=.o)
 LIBBAREOSSQL_LOBJS = $(LIBBAREOSSQL_SRCS:.c=.lo)
 LIBBAREOSSQL_LT_RELEASE = @LIBBAREOSSQL_LT_RELEASE@