From 213d026b8bbad7594e86b4377cdd3db404139c92 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu, 3 Dec 2009 18:38:30 +0100
Subject: [PATCH] Remove SQLite2 scripts

---
 bacula/src/cats/create_bacula_database.in     |   2 +-
 bacula/src/cats/create_sqlite_database.in     |   7 -
 .../src/cats/create_sqlite_database.in.patch  |   4 -
 bacula/src/cats/drop_bacula_database.in       |   4 +-
 bacula/src/cats/drop_bacula_tables.in         |   4 +-
 bacula/src/cats/drop_sqlite_database.in       |  13 -
 bacula/src/cats/drop_sqlite_tables.in         |   9 -
 bacula/src/cats/grant_bacula_privileges.in    |   2 +-
 bacula/src/cats/grant_sqlite_privileges.in    |   7 -
 bacula/src/cats/make_bacula_tables.in         |   2 +-
 bacula/src/cats/make_sqlite_tables.in         | 397 ------------------
 bacula/src/cats/make_sqlite_tables.in.patch   |   4 -
 bacula/src/cats/update_bacula_tables.in       |   2 +-
 bacula/src/cats/update_sqlite_tables.in       | 227 ----------
 bacula/src/cats/update_sqlite_tables.in.patch |  11 -
 15 files changed, 8 insertions(+), 687 deletions(-)
 delete mode 100644 bacula/src/cats/create_sqlite_database.in
 delete mode 100644 bacula/src/cats/create_sqlite_database.in.patch
 delete mode 100644 bacula/src/cats/drop_sqlite_database.in
 delete mode 100644 bacula/src/cats/drop_sqlite_tables.in
 delete mode 100644 bacula/src/cats/grant_sqlite_privileges.in
 delete mode 100644 bacula/src/cats/make_sqlite_tables.in
 delete mode 100644 bacula/src/cats/make_sqlite_tables.in.patch
 delete mode 100644 bacula/src/cats/update_sqlite_tables.in
 delete mode 100644 bacula/src/cats/update_sqlite_tables.in.patch

diff --git a/bacula/src/cats/create_bacula_database.in b/bacula/src/cats/create_bacula_database.in
index 77f9bfc419..4db10bfe7d 100644
--- a/bacula/src/cats/create_bacula_database.in
+++ b/bacula/src/cats/create_bacula_database.in
@@ -3,7 +3,7 @@
 # This routine creates the Bacula database
 #  using PostgreSQL, MySQL, or SQLite.
 #
-if test xsqlite = x@DB_TYPE@ -o xsqlite3 = x@DB_TYPE@ ; then
+if test xsqlite3 = x@DB_TYPE@ ; then
   echo "Creating SQLite database"
   @scriptdir@/create_@DB_TYPE@_database
 else
diff --git a/bacula/src/cats/create_sqlite_database.in b/bacula/src/cats/create_sqlite_database.in
deleted file mode 100644
index e23d06eee2..0000000000
--- a/bacula/src/cats/create_sqlite_database.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# shell script to create Bacula SQLite tables
-db_name=@db_name@
-
-touch @working_dir@/${db_name}.db
-exit 0
diff --git a/bacula/src/cats/create_sqlite_database.in.patch b/bacula/src/cats/create_sqlite_database.in.patch
deleted file mode 100644
index 0469756f8e..0000000000
--- a/bacula/src/cats/create_sqlite_database.in.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-5c5
-< bindir=@SQL_BINDIR@
----
-> bindir=/usr/lib/bacula/sqlite
diff --git a/bacula/src/cats/drop_bacula_database.in b/bacula/src/cats/drop_bacula_database.in
index d927621f2b..bd1dbf158c 100755
--- a/bacula/src/cats/drop_bacula_database.in
+++ b/bacula/src/cats/drop_bacula_database.in
@@ -3,11 +3,11 @@
 #  Drop Bacula database -- works for whatever is configured,
 #    MySQL, SQLite, PostgreSQL
 #
-if test xsqlite = x@DB_TYPE@ -o xsqlite3 = x@DB_TYPE@ ; then
+if test xsqlite3 = x@DB_TYPE@ ; then
   @scriptdir@/drop_@DB_TYPE@_database $*
 else
   if test xmysql = x@DB_TYPE@ ; then 
-    echo "Dropping MySQL database"
+    echo "Making MySQL database"
     @scriptdir@/drop_mysql_database $*
   else
     @scriptdir@/drop_postgresql_database $*
diff --git a/bacula/src/cats/drop_bacula_tables.in b/bacula/src/cats/drop_bacula_tables.in
index 50ee20f9db..97509289ca 100755
--- a/bacula/src/cats/drop_bacula_tables.in
+++ b/bacula/src/cats/drop_bacula_tables.in
@@ -3,12 +3,12 @@
 #  Drop Bacula tables -- works for whatever is configured,
 #    MySQL, SQLite, or PostgreSQL
 #
-if test xsqlite = x@DB_TYPE@ -o xsqlite3 = x@DB_TYPE@ ; then
+if test xsqlite3 = x@DB_TYPE@ ; then
   @scriptdir@/drop_@DB_TYPE@_tables $*
   echo "Dropped SQLite tables"
 else
   if test xmysql = x@DB_TYPE@ ; then 
-    echo "Dropping MySQL tables"
+    echo "Making MySQL tables"
     @scriptdir@/drop_mysql_tables $*
     echo "Dropped MySQL tables"
   else
diff --git a/bacula/src/cats/drop_sqlite_database.in b/bacula/src/cats/drop_sqlite_database.in
deleted file mode 100644
index b405a7b46a..0000000000
--- a/bacula/src/cats/drop_sqlite_database.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# shell script to drop Bacula SQLite tables
-db_name=@db_name@
-
-
-if test xsqlite = x@DB_TYPE@ -o xsqlite3 = x@DB_TYPE@ ; then 
-  cd @working_dir@
-  rm -rf ${db_name}.db
-  echo "SQLite database dropped."
-else
-  echo "Bacula is not configured for an SQLite database."
-fi
diff --git a/bacula/src/cats/drop_sqlite_tables.in b/bacula/src/cats/drop_sqlite_tables.in
deleted file mode 100644
index f966f875de..0000000000
--- a/bacula/src/cats/drop_sqlite_tables.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# shell script to Delete the SQLite tables, we simply delete and recreate
-#  the database.
-#
-db_name=@db_name@
-
-rm -f @working_dir@/${db_name}.db
-touch @working_dir@/${db_name}.db
diff --git a/bacula/src/cats/grant_bacula_privileges.in b/bacula/src/cats/grant_bacula_privileges.in
index 5e9f4e735f..eb290b7eb1 100755
--- a/bacula/src/cats/grant_bacula_privileges.in
+++ b/bacula/src/cats/grant_bacula_privileges.in
@@ -12,7 +12,7 @@ else
     echo "Granting PostgreSQL privileges"
     @scriptdir@/grant_postgresql_privileges $*
   else
-    if test xsqlite = x@DB_TYPE@ -o xsqlite3 = x@DB_TYPE@ ; then 
+    if test xsqlite3 = x@DB_TYPE@ ; then 
       echo "Granting SQLite privileges"
       @scriptdir@/grant_@DB_TYPE@_privileges $*
     fi
diff --git a/bacula/src/cats/grant_sqlite_privileges.in b/bacula/src/cats/grant_sqlite_privileges.in
deleted file mode 100644
index 452975ee58..0000000000
--- a/bacula/src/cats/grant_sqlite_privileges.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# shell script to grant privileges to the bacula database
-#
-bindir=@SQL_BINDIR@
-
-# nothing to do here
diff --git a/bacula/src/cats/make_bacula_tables.in b/bacula/src/cats/make_bacula_tables.in
index 0c6dd12eb6..c8469f12bf 100755
--- a/bacula/src/cats/make_bacula_tables.in
+++ b/bacula/src/cats/make_bacula_tables.in
@@ -3,7 +3,7 @@
 # This routine makes the appropriately configured
 #  Bacula tables for PostgreSQL, MySQL, or SQLite.
 #
-if test xsqlite = x@DB_TYPE@ -o xsqlite3 = x@DB_TYPE@ ; then
+if test xsqlite3 = x@DB_TYPE@ ; then
   echo "Making SQLite tables"
   @scriptdir@/make_@DB_TYPE@_tables $*
 else
diff --git a/bacula/src/cats/make_sqlite_tables.in b/bacula/src/cats/make_sqlite_tables.in
deleted file mode 100644
index e8693f0715..0000000000
--- a/bacula/src/cats/make_sqlite_tables.in
+++ /dev/null
@@ -1,397 +0,0 @@
-#!/bin/sh
-#
-# shell script to create Bacula SQLite tables
-
-bindir=@SQL_BINDIR@
-cd @working_dir@
-sqlite=@DB_TYPE@
-db_name=@db_name@
-
-${bindir}/${sqlite} $* ${db_name}.db <<END-OF-DATA
-CREATE TABLE Filename (
-  FilenameId INTEGER,
-  Name TEXT DEFAULT '',
-  PRIMARY KEY(FilenameId) 
-  );
-
-CREATE INDEX inx1 ON Filename (Name);
-
-CREATE TABLE Path (
-   PathId INTEGER,
-   Path TEXT DEFAULT '',
-   PRIMARY KEY(PathId) 
-   );
-
-CREATE INDEX inx2 ON Path (Path);
-
-
-CREATE TABLE File (
-   FileId INTEGER,
-   FileIndex INTEGER UNSIGNED NOT NULL,
-   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-   PathId INTEGER UNSIGNED REFERENCES Path NOT NULL,
-   FilenameId INTEGER UNSIGNED REFERENCES Filename NOT NULL,
-   MarkId INTEGER UNSIGNED DEFAULT 0,
-   LStat VARCHAR(255) NOT NULL,
-   MD5 VARCHAR(255) NOT NULL,
-   PRIMARY KEY(FileId) 
-   );
-
-CREATE INDEX inx3 ON File (JobId);
-CREATE INDEX file_jpf_idx ON File (JobId, PathId, FilenameId);
---
--- Possibly add one or more of the following indexes
---  if your Verifies are too slow.
---
--- CREATE INDEX inx4 ON File (PathId);
--- CREATE INDEX inx5 ON File (FileNameId);
-
-CREATE TABLE Job (
-   JobId INTEGER,
-   Job VARCHAR(128) NOT NULL,
-   Name VARCHAR(128) NOT NULL,
-   Type CHAR(1) NOT NULL,
-   Level CHAR(1) NOT NULL,
-   ClientId INTEGER REFERENCES Client DEFAULT 0,
-   JobStatus CHAR(1) NOT NULL,
-   SchedTime DATETIME NOT NULL,
-   StartTime DATETIME DEFAULT 0,
-   EndTime DATETIME DEFAULT 0,
-   RealEndTime DATETIME DEFAULT 0,
-   JobTDate BIGINT UNSIGNED DEFAULT 0,
-   VolSessionId INTEGER UNSIGNED DEFAULT 0,
-   VolSessionTime INTEGER UNSIGNED DEFAULT 0,
-   JobFiles INTEGER UNSIGNED DEFAULT 0,
-   JobBytes BIGINT UNSIGNED DEFAULT 0,
-   ReadBytes BIGINT UNSIGNED DEFAULT 0,
-   JobErrors INTEGER UNSIGNED DEFAULT 0,
-   JobMissingFiles INTEGER UNSIGNED DEFAULT 0,
-   PoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   FileSetId INTEGER UNSIGNED REFERENCES FileSet DEFAULT 0,
-   PriorJobId INTEGER UNSIGNED REFERENCES Job DEFAULT 0,
-   PurgedFiles TINYINT DEFAULT 0,
-   HasBase TINYINT DEFAULT 0,
-   PRIMARY KEY(JobId) 
-   );
-CREATE INDEX inx6 ON Job (Name);
-
--- Create a table like Job for long term statistics 
-CREATE TABLE JobHisto (
-   JobId INTEGER,
-   Job VARCHAR(128) NOT NULL,
-   Name VARCHAR(128) NOT NULL,
-   Type CHAR(1) NOT NULL,
-   Level CHAR(1) NOT NULL,
-   ClientId INTEGER DEFAULT 0,
-   JobStatus CHAR(1) NOT NULL,
-   SchedTime DATETIME NOT NULL,
-   StartTime DATETIME DEFAULT 0,
-   EndTime DATETIME DEFAULT 0,
-   RealEndTime DATETIME DEFAULT 0,
-   JobTDate BIGINT UNSIGNED DEFAULT 0,
-   VolSessionId INTEGER UNSIGNED DEFAULT 0,
-   VolSessionTime INTEGER UNSIGNED DEFAULT 0,
-   JobFiles INTEGER UNSIGNED DEFAULT 0,
-   JobBytes BIGINT UNSIGNED DEFAULT 0,
-   ReadBytes BIGINT UNSIGNED DEFAULT 0,
-   JobErrors INTEGER UNSIGNED DEFAULT 0,
-   JobMissingFiles INTEGER UNSIGNED DEFAULT 0,
-   PoolId INTEGER UNSIGNED DEFAULT 0,
-   FileSetId INTEGER UNSIGNED DEFAULT 0,
-   PriorJobId INTEGER UNSIGNED DEFAULT 0,
-   PurgedFiles TINYINT DEFAULT 0,
-   HasBase TINYINT DEFAULT 0
-   );
-CREATE INDEX inx61 ON JobHisto (StartTime);
-
-CREATE TABLE Location (
-   LocationId INTEGER,
-   Location TEXT NOT NULL,
-   Cost INTEGER DEFAULT 0,
-   Enabled TINYINT,
-   PRIMARY KEY(LocationId)
-   );
-
-CREATE TABLE LocationLog (
-   LocLogId INTEGER,
-   Date DATETIME NOT NULL,
-   Comment TEXT NOT NULL,
-   MediaId INTEGER UNSIGNED REFERENCES Media DEFAULT 0,
-   LocationId INTEGER UNSIGNED REFERENCES LocationId DEFAULT 0,
-   NewVolStatus VARCHAR(20) NOT NULL,
-   NewEnabled TINYINT NOT NULL,
-   PRIMARY KEY(LocLogId)
-);
-
-
-CREATE TABLE Log (
-   LogId INTEGER,
-   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-   Time DATETIME NOT NULL,
-   LogText TEXT NOT NULL,
-   PRIMARY KEY(LogId) 
-   );
-CREATE INDEX LogInx1 ON Log (JobId);
-
-
-CREATE TABLE FileSet (
-   FileSetId INTEGER,
-   FileSet VARCHAR(128) NOT NULL,
-   MD5 VARCHAR(25) NOT NULL,
-   CreateTime DATETIME DEFAULT 0,
-   PRIMARY KEY(FileSetId)
-   );
-
-CREATE TABLE JobMedia (
-   JobMediaId INTEGER,
-   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-   MediaId INTEGER UNSIGNED REFERENCES Media NOT NULL,
-   FirstIndex INTEGER UNSIGNED NOT NULL,
-   LastIndex INTEGER UNSIGNED NOT NULL,
-   StartFile INTEGER UNSIGNED DEFAULT 0,
-   EndFile INTEGER UNSIGNED DEFAULT 0,
-   StartBlock INTEGER UNSIGNED DEFAULT 0,
-   EndBlock INTEGER UNSIGNED DEFAULT 0,
-   VolIndex INTEGER UNSIGNED DEFAULT 0,
-   Copy     INTEGER UNSIGNED DEFAULT 0,
-   PRIMARY KEY(JobMediaId) 
-   );
-
-CREATE INDEX inx7 ON JobMedia (JobId, MediaId);
-
-
-CREATE TABLE Media (
-   MediaId INTEGER,
-   VolumeName VARCHAR(128) NOT NULL,
-   Slot INTEGER DEFAULT 0,
-   PoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   MediaType VARCHAR(128) NOT NULL,
-   MediaTypeId INTEGER UNSIGNED REFERENCES MediaType DEFAULT 0,
-   LabelType TINYINT DEFAULT 0,
-   FirstWritten DATETIME DEFAULT 0,
-   LastWritten DATETIME DEFAULT 0,
-   LabelDate DATETIME DEFAULT 0,
-   VolJobs INTEGER UNSIGNED DEFAULT 0,
-   VolFiles INTEGER UNSIGNED DEFAULT 0,
-   VolBlocks INTEGER UNSIGNED DEFAULT 0,
-   VolMounts INTEGER UNSIGNED DEFAULT 0,
-   VolBytes BIGINT UNSIGNED DEFAULT 0,
-   VolParts INTEGER UNSIGNED DEFAULT 0,
-   VolErrors INTEGER UNSIGNED DEFAULT 0,
-   VolWrites INTEGER UNSIGNED DEFAULT 0,
-   VolCapacityBytes BIGINT UNSIGNED DEFAULT 0,
-   VolStatus VARCHAR(20) NOT NULL,
-   Enabled TINYINT DEFAULT 1,
-   Recycle TINYINT DEFAULT 0,
-   ActionOnPurge     TINYINT    DEFAULT 0,
-   VolRetention BIGINT UNSIGNED DEFAULT 0,
-   VolUseDuration BIGINT UNSIGNED DEFAULT 0,
-   MaxVolJobs INTEGER UNSIGNED DEFAULT 0,
-   MaxVolFiles INTEGER UNSIGNED DEFAULT 0,
-   MaxVolBytes BIGINT UNSIGNED DEFAULT 0,
-   InChanger TINYINT DEFAULT 0,
-   StorageId INTEGER UNSIGNED REFERENCES Storage DEFAULT 0,
-   DeviceId INTEGER UNSIGNED REFERENCES Device DEFAULT 0,
-   MediaAddressing TINYINT DEFAULT 0,
-   VolReadTime BIGINT UNSIGNED DEFAULT 0,
-   VolWriteTime BIGINT UNSIGNED DEFAULT 0,
-   EndFile INTEGER UNSIGNED DEFAULT 0,
-   EndBlock INTEGER UNSIGNED DEFAULT 0,
-   LocationId INTEGER UNSIGNED REFERENCES Location DEFAULT 0,
-   RecycleCount INTEGER UNSIGNED DEFAULT 0,
-   InitialWrite DATETIME DEFAULT 0,
-   ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   Comment TEXT,
-   PRIMARY KEY(MediaId)
-   );
-
-CREATE INDEX inx8 ON Media (PoolId);
-
-CREATE TABLE MediaType (
-   MediaTypeId INTEGER,
-   MediaType VARCHAR(128) NOT NULL,
-   ReadOnly TINYINT DEFAULT 0,
-   PRIMARY KEY(MediaTypeId)
-   );
-
-CREATE TABLE Storage (
-   StorageId INTEGER,
-   Name VARCHAR(128) NOT NULL,
-   AutoChanger TINYINT DEFAULT 0,
-   PRIMARY KEY(StorageId)
-   );
-
-CREATE TABLE Device (
-   DeviceId INTEGER,
-   Name VARCHAR(128) NOT NULL,
-   MediaTypeId INTEGER UNSIGNED REFERENCES MediaType NOT NULL,
-   StorageId INTEGER UNSIGNED REFERENCES Storage,
-   DevMounts INTEGER UNSIGNED DEFAULT 0,
-   DevReadBytes BIGINT UNSIGNED DEFAULT 0,
-   DevWriteBytes BIGINT UNSIGNED DEFAULT 0,
-   DevReadBytesSinceCleaning BIGINT UNSIGNED DEFAULT 0,
-   DevWriteBytesSinceCleaning BIGINT UNSIGNED DEFAULT 0,
-   DevReadTime BIGINT UNSIGNED DEFAULT 0,
-   DevWriteTime BIGINT UNSIGNED DEFAULT 0,
-   DevReadTimeSinceCleaning BIGINT UNSIGNED DEFAULT 0,
-   DevWriteTimeSinceCleaning BIGINT UNSIGNED DEFAULT 0,
-   CleaningDate DATETIME DEFAULT 0,
-   CleaningPeriod BIGINT UNSIGNED DEFAULT 0,
-   PRIMARY KEY(DeviceId)
-   );
-
-
-CREATE TABLE Pool (
-   PoolId INTEGER,
-   Name VARCHAR(128) NOT NULL,
-   NumVols INTEGER UNSIGNED DEFAULT 0,
-   MaxVols INTEGER UNSIGNED DEFAULT 0,
-   UseOnce TINYINT DEFAULT 0,
-   UseCatalog TINYINT DEFAULT 1,
-   AcceptAnyVolume TINYINT DEFAULT 0,
-   VolRetention BIGINT UNSIGNED DEFAULT 0,
-   VolUseDuration BIGINT UNSIGNED DEFAULT 0,
-   MaxVolJobs INTEGER UNSIGNED DEFAULT 0,
-   MaxVolFiles INTEGER UNSIGNED DEFAULT 0,
-   MaxVolBytes BIGINT UNSIGNED DEFAULT 0,
-   AutoPrune TINYINT DEFAULT 0,
-   Recycle TINYINT DEFAULT 0,
-   ActionOnPurge     TINYINT    DEFAULT 0,
-   PoolType VARCHAR(20) NOT NULL,
-   LabelType TINYINT DEFAULT 0,
-   LabelFormat VARCHAR(128) NOT NULL,
-   Enabled TINYINT DEFAULT 1,
-   ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   NextPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   MigrationHighBytes BIGINT UNSIGNED DEFAULT 0,
-   MigrationLowBytes BIGINT UNSIGNED DEFAULT 0,
-   MigrationTime BIGINT UNSIGNED DEFAULT 0,
-   UNIQUE (Name),
-   PRIMARY KEY (PoolId)
-   );
-
-
-CREATE TABLE Client (
-   ClientId INTEGER,
-   Name VARCHAR(128) NOT NULL,
-   Uname VARCHAR(255) NOT NULL,   -- uname -a field
-   AutoPrune TINYINT DEFAULT 0,
-   FileRetention BIGINT UNSIGNED DEFAULT 0,
-   JobRetention  BIGINT UNSIGNED DEFAULT 0,
-   UNIQUE (Name),
-   PRIMARY KEY(ClientId)
-   );
-
-CREATE TABLE BaseFiles (
-   BaseId INTEGER,
-   BaseJobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-   FileId INTEGER UNSIGNED REFERENCES File NOT NULL,
-   FileIndex INTEGER UNSIGNED,
-   PRIMARY KEY(BaseId)
-   );
-
-CREATE TABLE UnsavedFiles (
-   UnsavedId INTEGER,
-   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
-   PathId INTEGER UNSIGNED REFERENCES Path NOT NULL,
-   FilenameId INTEGER UNSIGNED REFERENCES Filename NOT NULL,
-   PRIMARY KEY (UnsavedId)
-   );
-
-
-CREATE TABLE NextId (
-   id INTEGER UNSIGNED DEFAULT 0,
-   TableName TEXT NOT NULL,
-   PRIMARY KEY (TableName)
-   );
-
-
-
--- Initialize JobId to start at 1
-INSERT INTO NextId (id, TableName) VALUES (1, 'Job');
-
-CREATE TABLE Version (
-   VersionId INTEGER UNSIGNED NOT NULL 
-   );
-
-
-CREATE TABLE Counters (
-   Counter TEXT NOT NULL,     
-   MinValue INTEGER DEFAULT 0, 
-   MaxValue INTEGER DEFAULT 0,
-   CurrentValue INTEGER DEFAULT 0,
-   WrapCounter TEXT NOT NULL,
-   PRIMARY KEY (Counter)
-   );
-
-CREATE TABLE CDImages (
-   MediaId INTEGER UNSIGNED NOT NULL,
-   LastBurn DATETIME NOT NULL,
-   PRIMARY KEY (MediaId)
-   );
-
-
-CREATE TABLE Status (
-   JobStatus CHAR(1) NOT NULL,
-   JobStatusLong BLOB, 
-   PRIMARY KEY (JobStatus)
-   );
-
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('C', 'Created, not yet running');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('R', 'Running');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('B', 'Blocked');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('T', 'Completed successfully');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('E', 'Terminated with errors');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('e', 'Non-fatal error');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('f', 'Fatal error');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('D', 'Verify found differences');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('A', 'Canceled by user');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('F', 'Waiting for Client');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('S', 'Waiting for Storage daemon');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('m', 'Waiting for new media');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('M', 'Waiting for media mount');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('s', 'Waiting for storage resource');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('j', 'Waiting for job resource');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('c', 'Waiting for client resource');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('d', 'Waiting on maximum jobs');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('t', 'Waiting on start time');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('p', 'Waiting on higher priority jobs');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('a', 'SD despooling attributes');
-INSERT INTO Status (JobStatus,JobStatusLong) VALUES
-   ('i', 'Doing batch insert file records');
-
-
--- Initialize Version		 
-INSERT INTO Version (VersionId) VALUES (11);
-
-
-PRAGMA default_synchronous = OFF;
-PRAGMA default_cache_size = 10000;
-
-END-OF-DATA
-
-chmod 640 ${db_name}.db
-exit 0
diff --git a/bacula/src/cats/make_sqlite_tables.in.patch b/bacula/src/cats/make_sqlite_tables.in.patch
deleted file mode 100644
index 0469756f8e..0000000000
--- a/bacula/src/cats/make_sqlite_tables.in.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-5c5
-< bindir=@SQL_BINDIR@
----
-> bindir=/usr/lib/bacula/sqlite
diff --git a/bacula/src/cats/update_bacula_tables.in b/bacula/src/cats/update_bacula_tables.in
index 1e7edbadd3..8ce59a573b 100755
--- a/bacula/src/cats/update_bacula_tables.in
+++ b/bacula/src/cats/update_bacula_tables.in
@@ -3,7 +3,7 @@
 # This routine alters the appropriately configured
 #  Bacula tables for PostgreSQL, MySQL, or SQLite.
 #
-if test xsqlite = x@DB_TYPE@ -o xsqlite3 = x@DB_TYPE@ ; then
+if test xsqlite3 = x@DB_TYPE@ ; then
   echo "Altering SQLite tables"
   @scriptdir@/update_@DB_TYPE@_tables $*
 fi
diff --git a/bacula/src/cats/update_sqlite_tables.in b/bacula/src/cats/update_sqlite_tables.in
deleted file mode 100644
index 10a88753a4..0000000000
--- a/bacula/src/cats/update_sqlite_tables.in
+++ /dev/null
@@ -1,227 +0,0 @@
-#!/bin/sh
-#
-# shell script to update SQLite from version 2.0 to 3.0
-#
-echo " "
-echo "This script will update a Bacula SQLite database from version 10 to 11"
-echo " which is needed to convert from Bacula version 2.0.x to 3.0.x or higher"
-echo "Depending on the size of your database,"
-echo "this script may take several minutes to run."
-echo " "
-
-bindir=@SQL_BINDIR@
-cd @working_dir@
-sqlite=@DB_TYPE@
-db_name=@db_name@
-
-${bindir}/${sqlite} $* ${db_name}.db <<END-OF-DATA
-BEGIN TRANSACTION;
-
-CREATE TEMPORARY TABLE job_backup AS SELECT * FROM Job;
-DROP TABLE Job;
-
-CREATE TABLE Job
-(
-   JobId INTEGER,
-   Job VARCHAR(128) NOT NULL,
-   Name VARCHAR(128) NOT NULL,
-   Type CHAR NOT NULL,
-   Level CHAR NOT NULL,
-   ClientId INTEGER REFERENCES Client DEFAULT 0,
-   JobStatus CHAR NOT NULL,
-   SchedTime DATETIME NOT NULL,
-   StartTime DATETIME DEFAULT 0,
-   EndTime DATETIME DEFAULT 0,
-   RealEndTime DATETIME DEFAULT 0,
-   JobTDate BIGINT UNSIGNED DEFAULT 0,
-   VolSessionId INTEGER UNSIGNED DEFAULT 0,
-   VolSessionTime INTEGER UNSIGNED DEFAULT 0,
-   JobFiles INTEGER UNSIGNED DEFAULT 0,
-   JobBytes BIGINT UNSIGNED DEFAULT 0,
-   ReadBytes BIGINT UNSIGNED DEFAULT 0,
-   JobErrors INTEGER UNSIGNED DEFAULT 0,
-   JobMissingFiles INTEGER UNSIGNED DEFAULT 0,
-   PoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   FileSetId INTEGER UNSIGNED REFERENCES FileSet DEFAULT 0,
-   PriorJobId INTEGER UNSIGNED REFERENCES Job DEFAULT 0,
-   PurgedFiles TINYINT DEFAULT 0,
-   HasBase TINYINT DEFAULT 0,
-   PRIMARY KEY(JobId)
-   );
-CREATE INDEX inx6 ON Job (Name);
-
-INSERT INTO Job (JobId, Job, Name, Type, Level, ClientId, JobStatus,
-SchedTime, StartTime, EndTime, RealEndTime, JobTDate, VolSessionId,
-VolSessionTime, JobFiles, JobBytes, JobErrors, JobMissingFiles,
-PoolId, FileSetId, PriorJobId, PurgedFiles, HasBase) SELECT
-JobId, Job, Name, Type, Level, ClientId, JobStatus, SchedTime, StartTime,
-EndTime, RealEndTime, JobTDate, VolSessionId, VolSessionTime, JobFiles,
-JobBytes, JobErrors, JobMissingFiles, PoolId, FileSetId, PriorJobId,
-PurgedFiles, HasBase FROM Job_backup;
-
-DROP TABLE Job_backup;
-
--- ----------------------------------------------------------------
--- New ActionOnPurge field
-
-CREATE TEMPORARY TABLE pool_backup AS SELECT * FROM Pool;
-DROP TABLE Pool;
-
-CREATE TABLE Pool (
-   PoolId INTEGER,
-   Name VARCHAR(128) NOT NULL,
-   NumVols INTEGER UNSIGNED DEFAULT 0,
-   MaxVols INTEGER UNSIGNED DEFAULT 0,
-   UseOnce TINYINT DEFAULT 0,
-   UseCatalog TINYINT DEFAULT 1,
-   AcceptAnyVolume TINYINT DEFAULT 0,
-   VolRetention BIGINT UNSIGNED DEFAULT 0,
-   VolUseDuration BIGINT UNSIGNED DEFAULT 0,
-   MaxVolJobs INTEGER UNSIGNED DEFAULT 0,
-   MaxVolFiles INTEGER UNSIGNED DEFAULT 0,
-   MaxVolBytes BIGINT UNSIGNED DEFAULT 0,
-   AutoPrune TINYINT DEFAULT 0,
-   Recycle TINYINT DEFAULT 0,
-   ActionOnPurge     TINYINT    DEFAULT 0,
-   PoolType VARCHAR(20) NOT NULL,
-   LabelType TINYINT DEFAULT 0,
-   LabelFormat VARCHAR(128) NOT NULL,
-   Enabled TINYINT DEFAULT 1,
-   ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   NextPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   MigrationHighBytes BIGINT UNSIGNED DEFAULT 0,
-   MigrationLowBytes BIGINT UNSIGNED DEFAULT 0,
-   MigrationTime BIGINT UNSIGNED DEFAULT 0,
-   UNIQUE (Name),
-   PRIMARY KEY (PoolId)
-   );
-
-INSERT INTO Pool (PoolId, Name, NumVols, MaxVols, UseOnce, UseCatalog,
-AcceptAnyVolume, VolRetention, VolUseDuration, MaxVolJobs, MaxVolFiles,
-MaxVolBytes, AutoPrune, Recycle, PoolType, LabelType,
-LabelFormat, Enabled, ScratchPoolId, RecyclePoolId, NextPoolId,
-MigrationHighBytes, MigrationLowBytes, MigrationTime) 
-SELECT PoolId, Name, NumVols, MaxVols, UseOnce, UseCatalog, AcceptAnyVolume,
-VolRetention, VolUseDuration, MaxVolJobs, MaxVolFiles, MaxVolBytes, AutoPrune,
-Recycle, PoolType, LabelType, LabelFormat, Enabled,
-ScratchPoolId, RecyclePoolId, NextPoolId, MigrationHighBytes,
-MigrationLowBytes, MigrationTime FROM pool_backup;
-
-DROP TABLE pool_backup;
-
--- ----------------------------------------------------------------
--- New ActionOnPurge field
-
-CREATE TEMPORARY TABLE media_backup AS SELECT * FROM Media;
-DROP TABLE Media;
-
-CREATE TABLE Media (
-   MediaId INTEGER,
-   VolumeName VARCHAR(128) NOT NULL,
-   Slot INTEGER DEFAULT 0,
-   PoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   MediaType VARCHAR(128) NOT NULL,
-   MediaTypeId INTEGER UNSIGNED REFERENCES MediaType DEFAULT 0,
-   LabelType TINYINT DEFAULT 0,
-   FirstWritten DATETIME DEFAULT 0,
-   LastWritten DATETIME DEFAULT 0,
-   LabelDate DATETIME DEFAULT 0,
-   VolJobs INTEGER UNSIGNED DEFAULT 0,
-   VolFiles INTEGER UNSIGNED DEFAULT 0,
-   VolBlocks INTEGER UNSIGNED DEFAULT 0,
-   VolMounts INTEGER UNSIGNED DEFAULT 0,
-   VolBytes BIGINT UNSIGNED DEFAULT 0,
-   VolParts INTEGER UNSIGNED DEFAULT 0,
-   VolErrors INTEGER UNSIGNED DEFAULT 0,
-   VolWrites INTEGER UNSIGNED DEFAULT 0,
-   VolCapacityBytes BIGINT UNSIGNED DEFAULT 0,
-   VolStatus VARCHAR(20) NOT NULL,
-   Enabled TINYINT DEFAULT 1,
-   Recycle TINYINT DEFAULT 0,
-   ActionOnPurge     TINYINT    DEFAULT 0,
-   VolRetention BIGINT UNSIGNED DEFAULT 0,
-   VolUseDuration BIGINT UNSIGNED DEFAULT 0,
-   MaxVolJobs INTEGER UNSIGNED DEFAULT 0,
-   MaxVolFiles INTEGER UNSIGNED DEFAULT 0,
-   MaxVolBytes BIGINT UNSIGNED DEFAULT 0,
-   InChanger TINYINT DEFAULT 0,
-   StorageId INTEGER UNSIGNED REFERENCES Storage DEFAULT 0,
-   DeviceId INTEGER UNSIGNED REFERENCES Device DEFAULT 0,
-   MediaAddressing TINYINT DEFAULT 0,
-   VolReadTime BIGINT UNSIGNED DEFAULT 0,
-   VolWriteTime BIGINT UNSIGNED DEFAULT 0,
-   EndFile INTEGER UNSIGNED DEFAULT 0,
-   EndBlock INTEGER UNSIGNED DEFAULT 0,
-   LocationId INTEGER UNSIGNED REFERENCES Location DEFAULT 0,
-   RecycleCount INTEGER UNSIGNED DEFAULT 0,
-   InitialWrite DATETIME DEFAULT 0,
-   ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   Comment TEXT,
-   PRIMARY KEY(MediaId)
-   );
-
-CREATE INDEX inx8 ON Media (PoolId);
-
-INSERT INTO Media (
-   MediaId, VolumeName, Slot, PoolId, MediaType, MediaTypeId,
-   LabelType, FirstWritten, LastWritten, LabelDate, VolJobs,
-   VolFiles, VolBlocks, VolMounts, VolBytes, VolParts, VolErrors,
-   VolWrites, VolCapacityBytes, VolStatus, Enabled, Recycle,
-   VolRetention, VolUseDuration, MaxVolJobs,
-   MaxVolFiles, MaxVolBytes, InChanger, StorageId, DeviceId,
-   MediaAddressing, VolReadTime, VolWriteTime, EndFile, EndBlock,
-   LocationId, RecycleCount, InitialWrite, ScratchPoolId,
-   RecyclePoolId, Comment)
-SELECT MediaId, VolumeName, Slot, PoolId, MediaType, MediaTypeId,
-   LabelType, FirstWritten, LastWritten, LabelDate, VolJobs,
-   VolFiles, VolBlocks, VolMounts, VolBytes, VolParts, VolErrors,
-   VolWrites, VolCapacityBytes, VolStatus, Enabled, Recycle,
-   VolRetention, VolUseDuration, MaxVolJobs,
-   MaxVolFiles, MaxVolBytes, InChanger, StorageId, DeviceId,
-   MediaAddressing, VolReadTime, VolWriteTime, EndFile, EndBlock,
-   LocationId, RecycleCount, InitialWrite, ScratchPoolId,
-   RecyclePoolId, Comment FROM media_backup;
-
-DROP TABLE media_backup;
-
--- ----------------------------------------------------------------
-
-UPDATE Version SET VersionId=11;
-
-COMMIT;
-
--- If you have already this table, you can remove it with:
--- DROP TABLE JobHistory;
-
--- Create a table like Job for long term statistics
-CREATE TABLE JobHisto (
-   JobId INTEGER,
-   Job VARCHAR(128) NOT NULL,
-   Name VARCHAR(128) NOT NULL,
-   Type CHAR NOT NULL,
-   Level CHAR NOT NULL,
-   ClientId INTEGER REFERENCES Client DEFAULT 0,
-   JobStatus CHAR NOT NULL,
-   SchedTime DATETIME NOT NULL,
-   StartTime DATETIME DEFAULT 0,
-   EndTime DATETIME DEFAULT 0,
-   RealEndTime DATETIME DEFAULT 0,
-   JobTDate BIGINT UNSIGNED DEFAULT 0,
-   VolSessionId INTEGER UNSIGNED DEFAULT 0,
-   VolSessionTime INTEGER UNSIGNED DEFAULT 0,
-   JobFiles INTEGER UNSIGNED DEFAULT 0,
-   JobBytes BIGINT UNSIGNED DEFAULT 0,
-   ReadBytes BIGINT UNSIGNED DEFAULT 0,
-   JobErrors INTEGER UNSIGNED DEFAULT 0,
-   JobMissingFiles INTEGER UNSIGNED DEFAULT 0,
-   PoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0,
-   FileSetId INTEGER UNSIGNED REFERENCES FileSet DEFAULT 0,
-   PriorJobId INTEGER UNSIGNED REFERENCES Job DEFAULT 0,
-   PurgedFiles TINYINT DEFAULT 0,
-   HasBase TINYINT DEFAULT 0
-   );
-CREATE INDEX inx61 ON JobHisto (StartTime);
-
-END-OF-DATA
diff --git a/bacula/src/cats/update_sqlite_tables.in.patch b/bacula/src/cats/update_sqlite_tables.in.patch
deleted file mode 100644
index 2c6cc1ebbf..0000000000
--- a/bacula/src/cats/update_sqlite_tables.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- update_sqlite_tables.in     2006-08-05 10:20:06.000000000 -0400
-+++ update_sqlite_tables.in.fixed       2006-08-05 10:18:23.000000000 -0400
-@@ -9,7 +9,7 @@
- echo "this script may take several minutes to run."
- echo " "
- 
--bindir=@SQL_BINDIR@
-+bindir=/usr/lib/bacula/sqlite
- cd @working_dir@
- sqlite=@DB_TYPE@
- 
-- 
2.39.5