B_DB: store the sql queries in std::map

We now have the queries stored in separate files for each query in src/cats/dml. Header files are created from those queries and are compiled in. During runtime, a std::map is created holding the query name and query text. The sql calls use the query_name which is much more readable than the number that we had before.
bareos · Mar 4, 2017 · 4a2bddb · 4a2bddb
1 parent 774384a
commit 4a2bddb
Show file tree

Hide file tree

Showing 162 changed files with 2,448 additions and 889 deletions.
diff --git a/GNUmakefile.in b/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 src/cats/dml @NDMP_DIR@ @DIRD_DIR@ @STORED_DIR@ @SD_BACKENDS_DIR@ @SD_PLUGIN_DIR@ @DIR_PLUGIN_DIR@ src/tools
+subdirs = src/cats @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= )

diff --git a/Makefile.in b/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 src/cats/dml @NDMP_DIR@ @DIRD_DIR@ @STORED_DIR@ @SD_BACKENDS_DIR@ @SD_PLUGIN_DIR@ @DIR_PLUGIN_DIR@ src/tools
+subdirs = src/cats @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= )

diff --git a/autoconf/Make.common.in b/autoconf/Make.common.in
@@ -33,7 +33,6 @@ includedir = @includedir@
 sysconfdir = @sysconfdir@
 confdir = @confdir@
 backenddir = @backenddir@
-backendquerydir = @backendquerydir@
 plugindir = @plugindir@
 scriptdir = @scriptdir@
 archivedir = @archivedir@

diff --git a/autoconf/config.h.in b/autoconf/config.h.in
@@ -1209,9 +1209,6 @@
 /* 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
 

diff --git a/autoconf/configure.in b/autoconf/configure.in
@@ -1482,21 +1482,6 @@ 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)
@@ -4171,9 +4156,9 @@ AC_SUBST(CAP_LIBS)
 CFLAGS=${CFLAGS--O}
 
 if test x$have_gcc = xyes ; then
-   CPPFLAGS="$CPPFLAGS -fno-strict-aliasing -fno-exceptions"
-   CFLAGS="$CFLAGS -fno-strict-aliasing -fno-exceptions"
-   CXXFLAGS="$CFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti"
+   CPPFLAGS="$CPPFLAGS -fno-strict-aliasing"
+   CFLAGS="$CFLAGS -fno-strict-aliasing"
+   CXXFLAGS="$CFLAGS -fno-strict-aliasing"
 fi
 LDFLAGS=${LDFLAGS--O}
 CPPFLAGS="$CPPFLAGS"
@@ -4716,7 +4701,6 @@ 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 \

diff --git a/configure b/configure
@@ -744,7 +744,6 @@ plugindir
 logdir
 bsrdir
 backenddir
-backendquerydir
 scriptdir
 hostname
 basename
@@ -1043,7 +1042,6 @@ with_archivedir
 with_basename
 with_hostname
 with_scriptdir
-with_backendquerydir
 with_backenddir
 with_bsrdir
 with_logdir
@@ -1810,8 +1808,6 @@ 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
@@ -24795,25 +24791,6 @@ 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)
@@ -33371,9 +33348,9 @@ fi
 CFLAGS=${CFLAGS--O}
 
 if test x$have_gcc = xyes ; then
-   CPPFLAGS="$CPPFLAGS -fno-strict-aliasing -fno-exceptions"
-   CFLAGS="$CFLAGS -fno-strict-aliasing -fno-exceptions"
-   CXXFLAGS="$CFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti"
+   CPPFLAGS="$CPPFLAGS -fno-strict-aliasing"
+   CFLAGS="$CFLAGS -fno-strict-aliasing"
+   CXXFLAGS="$CFLAGS -fno-strict-aliasing"
 fi
 LDFLAGS=${LDFLAGS--O}
 CPPFLAGS="$CPPFLAGS"
@@ -33892,7 +33869,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/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"
+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"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -35062,7 +35039,6 @@ 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" ;;

diff --git a/debian/bareos-database-mysql.install.in b/debian/bareos-database-mysql.install.in
@@ -1,5 +1,4 @@
 @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/*
diff --git a/debian/bareos-database-postgresql.install.in b/debian/bareos-database-postgresql.install.in
@@ -1,6 +1,5 @@
 @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/*
diff --git a/debian/bareos-database-sqlite3.install.in b/debian/bareos-database-sqlite3.install.in
@@ -1,5 +1,4 @@
 @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/*
diff --git a/doxygen/bareos.doxy b/doxygen/bareos.doxy
@@ -2027,7 +2027,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = ENABLE_NLS FSTYPE_MNTENT HAVE_ACL HAVE_ALLOCA HAVE_ALLOCA_H HAVE_ARPA_NAMESER_H HAVE_ASSERT_H HAVE_BACKTRACE HAVE_BACKTRACE_SYMBOLS HAVE_BCOPY HAVE_CMOCKA HAVE_CMOCKA_H HAVE_COMPRESS_BOUND HAVE_CRYPTO HAVE_CXXABI_H HAVE_DCGETTEXT HAVE_DIRENT_H HAVE_DLERROR HAVE_DLFCN_H HAVE_DYNAMIC_CATS_BACKENDS HAVE_EXECINFO_H HAVE_FASTLZ HAVE_FASTLZLIB_H HAVE_FCHDIR HAVE_FCHMOD HAVE_FCHOWN HAVE_FCNTL_H HAVE_FDATASYNC HAVE_FORK HAVE_FSEEKO HAVE_FUTIMENS HAVE_FUTIMES HAVE_GAI_STRERROR HAVE_GCC HAVE_GETADDRINFO HAVE_GETCWD HAVE_GETHOSTBYNAME2 HAVE_GETHOSTBYNAME_R HAVE_GETHOSTID HAVE_GETHOSTNAME HAVE_GETMNTENT HAVE_GETPAGESIZE HAVE_GETPID HAVE_GETTEXT HAVE_GETTIMEOFDAY HAVE_GLOB HAVE_GLOB_H HAVE_GRP_H HAVE_INET_NTOP HAVE_INET_PTON HAVE_INT64_T HAVE_INTMAX_T HAVE_INTPTR_T HAVE_INTTYPES_H HAVE_INTXX_T HAVE_IOCTL_ULINT_REQUEST HAVE_IPV6 HAVE_JANSSON HAVE_LCHOWN HAVE_LGETXATTR HAVE_LIBCAP HAVE_LIBDL HAVE_LIBDLLOADER HAVE_LIBUTIL HAVE_LIBZ HAVE_LIMITS_H HAVE_LINUX_OS HAVE_LITTLE_ENDIAN HAVE_LLISTXATTR HAVE_LMDB HAVE_LOCALTIME_R HAVE_LOWLEVEL_SCSI_INTERFACE HAVE_LSETXATTR HAVE_LSTAT HAVE_LUTIMES HAVE_LZO HAVE_LZO_LZO1X_H HAVE_LZO_LZOCONF_H HAVE_MALLOC_TRIM HAVE_MEMORY_H HAVE_NANOSLEEP HAVE_NDMP HAVE_NL_LANGINFO HAVE_OPENSSL HAVE_POLL HAVE_POLL_H HAVE_POSIX_FADVISE HAVE_POSIX_SIGNALS HAVE_PRCTL HAVE_PUTENV HAVE_PWD_H HAVE_PYTHON HAVE_READDIR_R HAVE_READLINE HAVE_REGEX_H HAVE_SCSI_SCSI_H HAVE_SCSI_SG_H HAVE_SELECT HAVE_SETENV HAVE_SETJMP_H HAVE_SETPGID HAVE_SETPGRP HAVE_SETREUID HAVE_SETSID HAVE_SHA2 HAVE_SIGNAL HAVE_SNPRINTF HAVE_SOCKLEN_T HAVE_SQLITE3 HAVE_SQLITE3_THREADSAFE HAVE_STDARG_H HAVE_STDINT_H HAVE_STDLIB_H HAVE_STRCASECMP HAVE_STRERROR HAVE_STRERROR_R HAVE_STRFTIME HAVE_STRINGS_H HAVE_STRING_H HAVE_STRNCMP HAVE_STRNCPY HAVE_STRTOLL HAVE_STRUCT_STAT_ST_BLKSIZE HAVE_STRUCT_STAT_ST_BLOCKS HAVE_STRUCT_STAT_ST_RDEV HAVE_STRUCT_TM_TM_ZONE HAVE_ST_BLKSIZE HAVE_ST_BLOCKS HAVE_ST_RDEV HAVE_SYSTEMD HAVE_SYS_ACL_H HAVE_SYS_BITYPES_H HAVE_SYS_CAPABILITY_H HAVE_SYS_IOCTL_H HAVE_SYS_MTIO_H HAVE_SYS_POLL_H HAVE_SYS_PRCTL_H HAVE_SYS_SELECT_H HAVE_SYS_SOCKET_H HAVE_SYS_STATVFS_H HAVE_SYS_STAT_H HAVE_SYS_TIME_H HAVE_SYS_TYPES_H HAVE_SYS_WAIT_H HAVE_SYS_XATTR_H HAVE_TCGETATTR HAVE_TERMCAP_H HAVE_TERMIOS_H HAVE_TERM_H HAVE_TLS HAVE_TM_ZONE HAVE_TYPEOF HAVE_UINTPTR_T HAVE_UNISTD_H HAVE_UTIMES HAVE_UTIME_H HAVE_U_INT HAVE_U_INT64_T HAVE_U_INTXX_T HAVE_VA_COPY HAVE_VFPRINTF HAVE_VPRINTF HAVE_VSNPRINTF HAVE_XATTR HAVE_ZLIB_H IS_BUILD_ON_OBS LIBDIR LOCALEDIR LT_OBJDIR PACKAGE_BUGREPORT PACKAGE_NAME PACKAGE_STRING PACKAGE_TARNAME PACKAGE_URL PACKAGE_VERSION PROTOTYPES RETSIGTYPE SETPGRP_VOID SIZEOF_CHAR SIZEOF_INT SIZEOF_INT_P SIZEOF_LONG_INT SIZEOF_LONG_LONG_INT SIZEOF_SHORT_INT SMARTALLOC STDC_HEADERS SYSCONFDIR TIME_WITH_SYS_TIME USE_BATCH_FILE_INSERT _FILE_OFFSET_BITS _LARGEFILE_SOURCE _LARGE_FILES _PATH_BAREOS_BACKENDDIR _PATH_BAREOS_BACKENDQUERYDIR _PATH_BAREOS_PIDDIR _PATH_BAREOS_WORKINGDIR lld llu major_t minor_t
+PREDEFINED             = ENABLE_NLS FSTYPE_MNTENT HAVE_ACL HAVE_ALLOCA HAVE_ALLOCA_H HAVE_ARPA_NAMESER_H HAVE_ASSERT_H HAVE_BACKTRACE HAVE_BACKTRACE_SYMBOLS HAVE_BCOPY HAVE_CMOCKA HAVE_CMOCKA_H HAVE_COMPRESS_BOUND HAVE_CRYPTO HAVE_CXXABI_H HAVE_DCGETTEXT HAVE_DIRENT_H HAVE_DLERROR HAVE_DLFCN_H HAVE_DYNAMIC_CATS_BACKENDS HAVE_EXECINFO_H HAVE_FASTLZ HAVE_FASTLZLIB_H HAVE_FCHDIR HAVE_FCHMOD HAVE_FCHOWN HAVE_FCNTL_H HAVE_FDATASYNC HAVE_FORK HAVE_FSEEKO HAVE_FUTIMENS HAVE_FUTIMES HAVE_GAI_STRERROR HAVE_GCC HAVE_GETADDRINFO HAVE_GETCWD HAVE_GETHOSTBYNAME2 HAVE_GETHOSTBYNAME_R HAVE_GETHOSTID HAVE_GETHOSTNAME HAVE_GETMNTENT HAVE_GETPAGESIZE HAVE_GETPID HAVE_GETTEXT HAVE_GETTIMEOFDAY HAVE_GLOB HAVE_GLOB_H HAVE_GRP_H HAVE_INET_NTOP HAVE_INET_PTON HAVE_INT64_T HAVE_INTMAX_T HAVE_INTPTR_T HAVE_INTTYPES_H HAVE_INTXX_T HAVE_IOCTL_ULINT_REQUEST HAVE_IPV6 HAVE_JANSSON HAVE_LCHOWN HAVE_LGETXATTR HAVE_LIBCAP HAVE_LIBDL HAVE_LIBDLLOADER HAVE_LIBUTIL HAVE_LIBZ HAVE_LIMITS_H HAVE_LINUX_OS HAVE_LITTLE_ENDIAN HAVE_LLISTXATTR HAVE_LMDB HAVE_LOCALTIME_R HAVE_LOWLEVEL_SCSI_INTERFACE HAVE_LSETXATTR HAVE_LSTAT HAVE_LUTIMES HAVE_LZO HAVE_LZO_LZO1X_H HAVE_LZO_LZOCONF_H HAVE_MALLOC_TRIM HAVE_MEMORY_H HAVE_NANOSLEEP HAVE_NDMP HAVE_NL_LANGINFO HAVE_OPENSSL HAVE_POLL HAVE_POLL_H HAVE_POSIX_FADVISE HAVE_POSIX_SIGNALS HAVE_PRCTL HAVE_PUTENV HAVE_PWD_H HAVE_PYTHON HAVE_READDIR_R HAVE_READLINE HAVE_REGEX_H HAVE_SCSI_SCSI_H HAVE_SCSI_SG_H HAVE_SELECT HAVE_SETENV HAVE_SETJMP_H HAVE_SETPGID HAVE_SETPGRP HAVE_SETREUID HAVE_SETSID HAVE_SHA2 HAVE_SIGNAL HAVE_SNPRINTF HAVE_SOCKLEN_T HAVE_SQLITE3 HAVE_SQLITE3_THREADSAFE HAVE_STDARG_H HAVE_STDINT_H HAVE_STDLIB_H HAVE_STRCASECMP HAVE_STRERROR HAVE_STRERROR_R HAVE_STRFTIME HAVE_STRINGS_H HAVE_STRING_H HAVE_STRNCMP HAVE_STRNCPY HAVE_STRTOLL HAVE_STRUCT_STAT_ST_BLKSIZE HAVE_STRUCT_STAT_ST_BLOCKS HAVE_STRUCT_STAT_ST_RDEV HAVE_STRUCT_TM_TM_ZONE HAVE_ST_BLKSIZE HAVE_ST_BLOCKS HAVE_ST_RDEV HAVE_SYSTEMD HAVE_SYS_ACL_H HAVE_SYS_BITYPES_H HAVE_SYS_CAPABILITY_H HAVE_SYS_IOCTL_H HAVE_SYS_MTIO_H HAVE_SYS_POLL_H HAVE_SYS_PRCTL_H HAVE_SYS_SELECT_H HAVE_SYS_SOCKET_H HAVE_SYS_STATVFS_H HAVE_SYS_STAT_H HAVE_SYS_TIME_H HAVE_SYS_TYPES_H HAVE_SYS_WAIT_H HAVE_SYS_XATTR_H HAVE_TCGETATTR HAVE_TERMCAP_H HAVE_TERMIOS_H HAVE_TERM_H HAVE_TLS HAVE_TM_ZONE HAVE_TYPEOF HAVE_UINTPTR_T HAVE_UNISTD_H HAVE_UTIMES HAVE_UTIME_H HAVE_U_INT HAVE_U_INT64_T HAVE_U_INTXX_T HAVE_VA_COPY HAVE_VFPRINTF HAVE_VPRINTF HAVE_VSNPRINTF HAVE_XATTR HAVE_ZLIB_H IS_BUILD_ON_OBS LIBDIR LOCALEDIR LT_OBJDIR PACKAGE_BUGREPORT PACKAGE_NAME PACKAGE_STRING PACKAGE_TARNAME PACKAGE_URL PACKAGE_VERSION PROTOTYPES RETSIGTYPE SETPGRP_VOID SIZEOF_CHAR SIZEOF_INT SIZEOF_INT_P SIZEOF_LONG_INT SIZEOF_LONG_LONG_INT SIZEOF_SHORT_INT SMARTALLOC STDC_HEADERS SYSCONFDIR TIME_WITH_SYS_TIME USE_BATCH_FILE_INSERT _FILE_OFFSET_BITS _LARGEFILE_SOURCE _LARGE_FILES _PATH_BAREOS_BACKENDDIR _PATH_BAREOS_PIDDIR _PATH_BAREOS_WORKINGDIR lld llu major_t minor_t
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

diff --git a/platforms/packaging/bareos.spec b/platforms/packaging/bareos.spec
@@ -1141,7 +1141,6 @@ 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
@@ -1154,15 +1153,13 @@ 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
 
@@ -1171,7 +1168,6 @@ 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