[pkg-bacula-commits] [bacula] 02/03: fixed sqlite3 update and creation patches after light testing

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to branch master
in repository bacula.

commit 0eef685b805da3fbc939c35a55a45308a6e210ec
Author: Carsten Leonhardt <leo at debian.org>
Date:   Tue Aug 29 01:48:12 2017 +0200

    fixed sqlite3 update and creation patches after light testing
---
 .../patches/upstream-fix-sqlite-db-creation.patch  | 11 ++++
 debian/patches/upstream-fix-sqlite-update.patch    | 74 ++++++++++++++++++++--
 2 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/debian/patches/upstream-fix-sqlite-db-creation.patch b/debian/patches/upstream-fix-sqlite-db-creation.patch
index 7b78d2c..6750c06 100644
--- a/debian/patches/upstream-fix-sqlite-db-creation.patch
+++ b/debian/patches/upstream-fix-sqlite-db-creation.patch
@@ -13,6 +13,17 @@ Last-Update: 2017-08-29
  CREATE TABLE JobMedia (
     JobMediaId INTEGER,
     JobId INTEGER UNSIGNED REFERENCES Job NOT NULL,
+@@ -214,8 +216,8 @@
+    VolHoleBytes BIGINT UNSIGNED DEFAULT 0,
+    VolHoles INTEGER UNSIGNED DEFAULT 0,
+    VolType INTEGER UNSIGNED DEFAULT 0,
+-   VolParts INTERGER UNSIGNED DEFAULT 0,
+-   VolCloudParts INTERGER UNSIGNED DEFAULT 0,
++   VolParts INTEGER UNSIGNED DEFAULT 0,
++   VolCloudParts INTEGER UNSIGNED DEFAULT 0,
+    VolErrors INTEGER UNSIGNED DEFAULT 0,
+    VolWrites BIGINT UNSIGNED DEFAULT 0,
+    VolCapacityBytes BIGINT UNSIGNED DEFAULT 0,
 @@ -246,6 +248,7 @@
     PRIMARY KEY(MediaId)
     );
diff --git a/debian/patches/upstream-fix-sqlite-update.patch b/debian/patches/upstream-fix-sqlite-update.patch
index d829c5f..ee24047 100644
--- a/debian/patches/upstream-fix-sqlite-update.patch
+++ b/debian/patches/upstream-fix-sqlite-update.patch
@@ -17,11 +17,73 @@ Last-Update: 2017-08-25
  
  if [ "$DBVERSION" -eq 15 ] ; then
      if psql -f - -d ${db_name} $* <<END-OF-DATA
-@@ -180,6 +185,7 @@
+@@ -178,10 +183,65 @@
+ DROP TABLE BaseFiles;
+ ALTER TABLE basefiles_temp RENAME TO BaseFiles;
  
- ALTER TABLE Media RENAME COLUMN VolParts TO VolType;
- ALTER TABLE Media ADD COLUMN VolParts INTEGER DEFAULT 0;
-+ALTER TABLE media ADD COLUMN VolCloudParts INTEGER DEFAULT 0;
- ALTER TABLE Media ADD COLUMN LastPartBytes BIGINT DEFAULT 0;
- ALTER TABLE Media ADD COLUMN CacheRetention BIGINT DEFAULT 0;
+-ALTER TABLE Media RENAME COLUMN VolParts TO VolType;
+-ALTER TABLE Media ADD COLUMN VolParts INTEGER DEFAULT 0;
+-ALTER TABLE Media ADD COLUMN LastPartBytes BIGINT DEFAULT 0;
+-ALTER TABLE Media ADD COLUMN CacheRetention BIGINT DEFAULT 0;
++CREATE TABLE Media_tmp (
++   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,
++   LastPartBytes BIGINT UNSIGNED DEFAULT 0,
++   VolMounts INTEGER UNSIGNED DEFAULT 0,
++   VolBytes BIGINT UNSIGNED DEFAULT 0,
++   VolABytes BIGINT UNSIGNED DEFAULT 0,
++   VolAPadding BIGINT UNSIGNED DEFAULT 0,
++   VolHoleBytes BIGINT UNSIGNED DEFAULT 0,
++   VolHoles INTEGER UNSIGNED DEFAULT 0,
++   VolType INTEGER UNSIGNED DEFAULT 0,
++   VolParts INTERGER UNSIGNED DEFAULT 0,
++   VolCloudParts INTERGER UNSIGNED DEFAULT 0,
++   VolErrors INTEGER UNSIGNED DEFAULT 0,
++   VolWrites BIGINT 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,
++   CacheRetention BIGINT UNSIGNED 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)
++   );
++INSERT INTO Media_tmp (MediaId, VolumeName, Slot, PoolId, MediaType, MediaTypeId, LabelType, FirstWritten, LastWritten, LabelDate, VolJobs, VolFiles, VolBlocks, VolMounts, VolBytes, VolType, VolErrors, VolWrites, VolCapacityBytes, VolStatus, Enabled, Recycle, ActionOnPurge, VolRetention, VolUseDuration, MaxVolJobs, MaxVolFiles, MaxVolBytes, InChanger, StorageId, DeviceId, MediaAddressing, VolReadTime, VolWriteTime, EndFile, EndBlock, LocationId, RecycleCount, InitialWrite, ScratchPoolId [...]
++DROP TABLE Media;
++ALTER TABLE Media_tmp RENAME TO Media;
++CREATE INDEX inx8 ON Media (PoolId);
++CREATE INDEX inx9 ON Media (StorageId);
++
  ALTER TABLE Pool ADD COLUMN CacheRetention BIGINT DEFAULT 0;
+ CREATE INDEX job_jobtdate_inx ON job (JobTDate);
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git