From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 11 Jun 2010 20:39:57 +0000 (+0200)
Subject: Add new upgrade script from DB vers 12 to 13
X-Git-Tag: Release-7.0.0~1766
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=419bdd9329bd1e0efa0c896831b012f9f912c61b;p=bacula%2Fbacula

Add new upgrade script from DB vers 12 to 13
---

diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in
index b2f6270e31..22db77c3f4 100644
--- a/bacula/src/cats/update_mysql_tables.in
+++ b/bacula/src/cats/update_mysql_tables.in
@@ -1,10 +1,12 @@
 #!/bin/sh
 #
-# Shell script to update MySQL Community version 3.0.x to 5.0.x
+# Shell script to update MySQL Enterprise version 2.6.x to 4.0.x
+#  or Bacula Community version 5.0.x to 5.2.x
 #
 echo " "
-echo "This script will update a Bacula MySQL database from version 11 to 12"
-echo " which is needed to convert from Bacula Community version 3.0.x to 5.0.x"
+echo "This script will update a Bacula MySQL database from version 12 to 13"
+echo " which is needed to convert from Bacula Enterprise version 2.6.x to 6.0.x"
+echo " or Bacula Community version 5.0.x to 5.2.x"
 echo " "
 bindir=@SQL_BINDIR@
 PATH="$bindir:$PATH"
@@ -12,10 +14,10 @@ db_name=@db_name@
 
 mysql ${db_name} -e "select VersionId from Version\G" >/tmp/$$
 DBVERSION=`sed -n -e 's/^VersionId: \(.*\)$/\1/p' /tmp/$$`
-if [ $DBVERSION != 11 ] ; then
+if [ $DBVERSION != 12 ] ; then
    echo " "
    echo "The existing database is version $DBVERSION !!"
-   echo "This script can only update an existing version 11 database to version 12."
+   echo "This script can only update an existing version 12 database to version 13."
    echo "Error. Cannot upgrade this database."
    echo " "
    exit 1
@@ -24,48 +26,24 @@ fi
 if mysql $* -f <<END-OF-DATA
 USE ${db_name};
 
-ALTER TABLE JobMedia DROP Stripe ;
-ALTER TABLE JobMedia DROP Copy ;
-ALTER TABLE Job ADD COLUMN HasCache tinyint default 0 after HasBase;
-ALTER TABLE Job ADD COLUMN Reviewed tinyint default 0 after HasCache;
-ALTER TABLE Job ADD COLUMN Comment BLOB AFTER Reviewed;
-ALTER TABLE JobHisto ADD COLUMN HasCache tinyint default 0 after HasBase;
-ALTER TABLE JobHisto ADD COLUMN Reviewed tinyint default 0 after HasCache;
-ALTER TABLE JobHisto ADD COLUMN Comment BLOB AFTER Reviewed;
-
-ALTER TABLE Status ADD COLUMN Severity int;
-UPDATE Status SET Severity = 15;
-UPDATE Status SET Severity = 100 where JobStatus = 'f';
-UPDATE Status SET Severity = 90 where JobStatus = 'A';
-UPDATE Status SET Severity = 10 where JobStatus = 'T';
-UPDATE Status SET Severity = 20 where JobStatus = 'e';
-UPDATE Status SET Severity = 25 where JobStatus = 'E';
-
-CREATE TABLE PathHierarchy
-(
-     PathId integer NOT NULL,
-     PPathId integer NOT NULL,
-     CONSTRAINT pathhierarchy_pkey PRIMARY KEY (PathId)
-);
-
-CREATE INDEX pathhierarchy_ppathid 
-	  ON PathHierarchy (PPathId);
-
-CREATE TABLE PathVisibility
-(
-      PathId integer NOT NULL,
-      JobId integer NOT NULL,
-      Size int8 DEFAULT 0,
-      Files int4 DEFAULT 0,
-      CONSTRAINT pathvisibility_pkey PRIMARY KEY (JobId, PathId)
+CREATE TABLE RestoreObject (
+   RestoreObjectId INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+   ObjectName BLOB NOT NULL,
+   RestoreObject LONGBLOB NOT NULL,
+   PluginName TINYBLOB NOT NULL,
+   ObjectLength INTEGER DEFAULT 0,
+   ObjectFullLength INTEGER DEFAULT 0,
+   ObjectIndex INTEGER DEFAULT 0,
+   ObjectType INTEGER DEFAULT 0,
+   FileIndex INTEGER UNSIGNED DEFAULT 0,
+   JobId INTEGER UNSIGNED NOT NULL REFERENCES Job,
+   ObjectCompression INTEGER DEFAULT 0,
+   PRIMARY KEY(RestoreObjectId),
+   INDEX (JobId)
 );
-CREATE INDEX pathvisibility_jobid
-	     ON PathVisibility (JobId);
-
-CREATE INDEX basefiles_jobid_idx ON BaseFiles ( JobId );
 
 DELETE FROM Version;
-INSERT INTO Version (VersionId) VALUES (12);
+INSERT INTO Version (VersionId) VALUES (13);
 
 END-OF-DATA
 then
diff --git a/bacula/src/cats/update_postgresql_tables.in b/bacula/src/cats/update_postgresql_tables.in
index 51e9f7bcd6..0018d6b863 100644
--- a/bacula/src/cats/update_postgresql_tables.in
+++ b/bacula/src/cats/update_postgresql_tables.in
@@ -1,10 +1,12 @@
 #!/bin/sh
 #
-# Shell script to update PostgreSQL tables from Bacula Community version 3.0.x to 5.0.0
+# Shell script to update PostgreSQL tables from version 12 to 13
+#  or Bacula Community version 5.0.x to 5.2.x
 #
 echo " "
-echo "This script will update a Bacula PostgreSQL database from version 11 to 12"
-echo "	which is needed to convert from Bacula Community version 3.0.x to 5.0.x"
+echo "This script will update a Bacula PostgreSQL database from version 12 to 13"
+echo "	which is needed to convert from Bacula Enterprise version 2.6.x to 4.0.x"
+echo "	or Bacula Community version 5.0.x to 5.2.x"
 echo " "
 
 bindir=@SQL_BINDIR@
@@ -12,10 +14,10 @@ PATH="$bindir:$PATH"
 db_name=@db_name@
 
 DBVERSION=`psql ${db_name} -t --pset format=unaligned -c "select VersionId from Version"`
-if [ $DBVERSION != 11 ] ; then
+if [ $DBVERSION != 12 ] ; then
    echo " "
    echo "The existing database is version $DBVERSION !!"
-   echo "This script can only update an existing version 11 database to version 12."
+   echo "This script can only update an existing version 12 database to version 13."
    echo "Error. Cannot upgrade this database."
    echo " "
    exit 1
@@ -23,67 +25,27 @@ fi
 
 if psql -f - -d ${db_name} $* <<END-OF-DATA
 BEGIN; -- Necessary for Bacula core
-ALTER TABLE JobMedia DROP Copy ;
-ALTER TABLE Job ADD COLUMN HasCache smallint default 0;
-ALTER TABLE Job ADD COLUMN Reviewed smallint default 0;
-ALTER TABLE Job ADD COLUMN Comment text;
-ALTER TABLE JobHisto ADD COLUMN HasCache smallint default 0;
-ALTER TABLE JobHisto ADD COLUMN Reviewed smallint default 0;
-ALTER TABLE JobHisto ADD COLUMN Comment text;
-UPDATE Version SET VersionId=12;
+CREATE TABLE RestoreObject (
+   RestoreObjectId SERIAL NOT NULL,
+   ObjectName TEXT NOT NULL,
+   RestoreObject BYTEA NOT NULL,
+   PluginName TEXT NOT NULL,
+   ObjectLength INTEGER DEFAULT 0,
+   ObjectFullLength INTEGER DEFAULT 0,
+   ObjectIndex INTEGER DEFAULT 0,
+   ObjectType INTEGER DEFAULT 0,
+   FileIndex INTEGER DEFAULT 0,
+   JobId INTEGER,
+   ObjectCompression INTEGER DEFAULT 0,
+   PRIMARY KEY(RestoreObjectId)
+   );
+CREATE INDEX restore_jobid_idx on RestoreObject(JobId);
+
+UPDATE Version SET VersionId=13;
 COMMIT;
 
-BEGIN; -- Can conflict with previous Bweb installation
-ALTER TABLE Status ADD COLUMN Severity int;
-UPDATE Status SET Severity = 15;
-UPDATE Status SET Severity = 100 where JobStatus = 'f';
-UPDATE Status SET Severity = 90 where JobStatus = 'A';
-UPDATE Status SET Severity = 10 where JobStatus = 'T';
-UPDATE Status SET Severity = 20 where JobStatus = 'e';
-UPDATE Status SET Severity = 25 where JobStatus = 'E';
-COMMIT;
-
-BEGIN; -- Can already exists if using 3.1.x release
-CREATE TABLE PathHierarchy
-(
-     PathId integer NOT NULL,
-     PPathId integer NOT NULL,
-     CONSTRAINT pathhierarchy_pkey PRIMARY KEY (PathId)
-);
-
-CREATE INDEX pathhierarchy_ppathid 
-	  ON PathHierarchy (PPathId);
-
-CREATE TABLE PathVisibility
-(
-      PathId integer NOT NULL,
-      JobId integer NOT NULL,
-      Size int8 DEFAULT 0,
-      Files int4 DEFAULT 0,
-      CONSTRAINT pathvisibility_pkey PRIMARY KEY (JobId, PathId)
-);
-
-CREATE INDEX pathvisibility_jobid
-	  ON PathVisibility (JobId);
-
-COMMIT;
-
-CREATE INDEX basefiles_jobid_idx ON BaseFiles ( JobId );
-
--- Remove bad PostgreSQL index
-DROP INDEX file_fp_idx;
-
--- Create the good one
--- If you want to create this index during production, you can use 
--- CREATE INDEX CONCURRENTLY file_jpf_idx ON File (JobId, PathId, FilenameId)
--- to make it without locks (require PostgreSQL 8.2 version)
-
-CREATE INDEX file_jpfid_idx on File (JobId, PathId, FilenameId);
-
 ANALYSE;
 
-UPDATE Version SET VersionId=12;
-
 END-OF-DATA
 then
    echo "Update of Bacula PostgreSQL tables succeeded."
diff --git a/bacula/src/cats/update_sqlite3_tables.in b/bacula/src/cats/update_sqlite3_tables.in
index 64919cb6f7..07d807c3df 100644
--- a/bacula/src/cats/update_sqlite3_tables.in
+++ b/bacula/src/cats/update_sqlite3_tables.in
@@ -1,10 +1,12 @@
 #!/bin/sh
 #
-# Shell script to update SQLite3 tables from Bacula Community version 3.0.x to 5.0.0
+# Shell script to update MySQL tables from Bacula Enterprise version 2.6.x to 4.0.x
+#  or Bacula Community version 5.0.x to 5.2.x
 #
 echo " "
-echo "This script will update a Bacula SQLite3 database from version 11 to 12"
-echo "	which is needed to convert from Bacula Community version 3.0.x to 5.0.x"
+echo "This script will update a Bacula MySQL database from version 12 to 13"
+echo "	which is needed to convert from Bacula Enterprise version 2.6.x to 4.0.x"
+echo "	or Bacula Community version 5.0.x to 5.2.x"
 echo " "
 
 bindir=@SQL_BINDIR@
@@ -16,62 +18,35 @@ db_name=@db_name@
 DBV=`${sqlite} ${db_name} $sbin/regress.db <<END
 select VersionId from Version;
 END`
-if [ $DBVERSION != 11 ] ; then
+if [ $DBVERSION != 12 ] ; then
    echo " "
    echo "The existing database is version $DBVERSION !!"
-   echo "This script can only update an existing version 11 database to version 12."
+   echo "This script can only update an existing version 12 database to version 13."
    echo "Error. Cannot upgrade this database."
    echo " "
    exit 1
 fi
 
-
 ${sqlite} $* ${db_name}.db <<END-OF-DATA
 BEGIN;
-ALTER TABLE Job ADD COLUMN HasCache TINYINT DEFAULT 0;
-ALTER TABLE Job ADD COLUMN Reviewed TINYINT DEFAULT 0;
-ALTER TABLE Job ADD COLUMN Comment TEXT;
-ALTER TABLE JobHisto ADD COLUMN HasCache TINYINT DEFAULT 0;
-ALTER TABLE JobHisto ADD COLUMN Reviewed TINYINT DEFAULT 0;
-ALTER TABLE JobHisto ADD COLUMN Comment TEXT;
-
-ALTER TABLE Status ADD COLUMN Severity int;
-UPDATE Status SET Severity = 15;
-UPDATE Status SET Severity = 100 where JobStatus = 'f';
-UPDATE Status SET Severity = 90 where JobStatus = 'A';
-UPDATE Status SET Severity = 10 where JobStatus = 'T';
-UPDATE Status SET Severity = 20 where JobStatus = 'e';
-UPDATE Status SET Severity = 25 where JobStatus = 'E';
-
-CREATE TABLE PathHierarchy
-(
-     PathId integer NOT NULL,
-     PPathId integer NOT NULL,
-     CONSTRAINT pathhierarchy_pkey PRIMARY KEY (PathId)
-);
-
-CREATE INDEX pathhierarchy_ppathid 
-	  ON PathHierarchy (PPathId);
 
-CREATE TABLE PathVisibility
-(
-      PathId integer NOT NULL,
-      JobId integer NOT NULL,
-      Size int8 DEFAULT 0,
-      Files int4 DEFAULT 0,
-      CONSTRAINT pathvisibility_pkey PRIMARY KEY (JobId, PathId)
-);
-
-CREATE INDEX pathvisibility_jobid
-	  ON PathVisibility (JobId);
-
-CREATE INDEX basefiles_jobid_idx ON BaseFiles ( JobId );
-
-UPDATE Version SET VersionId=12;
+CREATE TABLE RestoreObject (
+   RestoreObjectId INTEGER,
+   ObjectName TEXT DEFAULT '',
+   RestoreObject TEXT DEFAULT '',
+   PluginName TEXT DEFAULT '',
+   ObjectLength INTEGER DEFAULT 0,
+   ObjectFullLength INTEGER DEFAULT 0,
+   ObjectIndex INTEGER DEFAULT 0,
+   ObjectType INTEGER DEFAULT 0,
+   FileIndex INTEGER UNSIGNED DEFAULT 0,
+   ObejctCompression INTEGER DEFAULT 0,
+   JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
+   PRIMARY KEY(RestoreObjectId)
+   );
+CREATE INDEX restore_jobid_idx ON RestoreObject (JobId);
+
+UPDATE Version SET VersionId=13;
 COMMIT;
 
-DROP INDEX inx4;
-DROP INDEX IF EXISTS inx9;  
-CREATE INDEX file_jpf_idx ON File (JobId, PathId, FilenameId);
-
 END-OF-DATA