Fix catalog's update procedure for JobHisto

diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in
index 9ebef5ef2e4a7c8fc36fa95aba13eb4fe5d88df5..0cdf33e4194eaa00ae86acf8d5a8ce701f650a2f 100644 (file)
--- a/bacula/src/cats/update_mysql_tables.in
+++ b/bacula/src/cats/update_mysql_tables.in
@@ -732,6 +732,17 @@ ALTER TABLE Job
     ADD COLUMN WriteDevice       blob,
     ADD COLUMN Encrypted         int        default 0;
 
+ALTER TABLE JobHisto
+    ADD COLUMN RealStartTime DATETIME,
+    ADD COLUMN isVirtualFull     TINYINT    default 0,
+    ADD COLUMN CompressRatio     float      default 0,
+    ADD COLUMN Rate              float      default 0,
+    ADD COLUMN LastReadStorageId Integer    default 0,
+    ADD COLUMN LastReadDevice    blob,
+    ADD COLUMN WriteStorageId    integer    default 0,
+    ADD COLUMN WriteDevice       blob,
+    ADD COLUMN Encrypted         int        default 0;
+
 INSERT INTO Events (EventsCode, EventsType, EventsTime, EventsDaemon, EventsSource, EventsRef, EventsText) VALUES
   ('DU0001', 'catalog_update', NOW(), '*SHELL*', 'update_bacula_tables', 'pid$$', 'Catalog schema was updated to 1026');
 UPDATE Version SET VersionId=1026;

diff --git a/bacula/src/cats/update_postgresql_tables.in b/bacula/src/cats/update_postgresql_tables.in
index 10b880a7ac188d9ecf71590c1da2de7dda46e4d8..e226ccf68f16b2bba88c9526dad2855f081fb965 100644 (file)
--- a/bacula/src/cats/update_postgresql_tables.in
+++ b/bacula/src/cats/update_postgresql_tables.in
@@ -747,6 +747,7 @@ CREATE INDEX FileEvents_sourcejobid_idx ON FileEvents (SourceJobId);
 CREATE INDEX meta_emailid on MetaEmail (EmailId);
 
 ALTER TABLE Object ADD COLUMN FileIndex    integer  not null default 0;
+
 ALTER TABLE Job ADD COLUMN RealStartTime     timestamp   without time zone;
 ALTER TABLE Job ADD COLUMN isVirtualFull     smallint    default 0;
 ALTER TABLE Job ADD COLUMN CompressRatio     float       default 0;
@@ -758,6 +759,17 @@ ALTER TABLE Job ADD COLUMN WriteDevice       text        default ''
 ALTER TABLE Job ADD COLUMN StatusInfo        text        default '';
 ATLER TABLE Job ADD COLUMN Encrypted         int         default 0;
 
+ALTER TABLE JobHisto ADD COLUMN RealStartTime     timestamp   without time zone;
+ALTER TABLE JobHisto ADD COLUMN isVirtualFull     smallint    default 0;
+ALTER TABLE JobHisto ADD COLUMN CompressRatio     float       default 0;
+ALTER TABLE JobHisto ADD COLUMN Rate              float       default 0;
+ALTER TABLE JobHisto ADD COLUMN LastReadStorageId integer     default 0;
+ALTER TABLE JobHisto ADD COLUMN LastReadDevice    text        default '';
+ALTER TABLE JobHisto ADD COLUMN WriteStorageId    integer     default 0;
+ALTER TABLE JobHisto ADD COLUMN WriteDevice       text        default '';
+ALTER TABLE JobHisto ADD COLUMN StatusInfo        text        default '';
+ALTER TABLE JobHisto ADD COLUMN Encrypted         int         default 0;
+
 ALTER TABLE Media ADD COLUMN Protected       smallint    default 0;
 ALTER TABLE Media ADD COLUMN UseProtect      smallint    default 0;
 ALTER TABLE Media ADD COLUMN VolEncrypted    smallint    default 0;

diff --git a/bacula/updatedb/update_mysql_tables_1025_to_1026.in b/bacula/updatedb/update_mysql_tables_1025_to_1026.in
index c0c339dbe9b099f5a49c34dc11238e4ebe6d95e5..0d66c8933f2c0b3790b5d8c2238f31f121f70829 100644 (file)
--- a/bacula/updatedb/update_mysql_tables_1025_to_1026.in
+++ b/bacula/updatedb/update_mysql_tables_1025_to_1026.in
@@ -104,6 +104,17 @@ ALTER TABLE Job
     ADD COLUMN WriteDevice       blob,
     ADD COLUMN Encrypted         int        default 0;
 
+ALTER TABLE JobHisto
+    ADD COLUMN RealStartTime DATETIME,
+    ADD COLUMN isVirtualFull     TINYINT    default 0,
+    ADD COLUMN CompressRatio     float      default 0,
+    ADD COLUMN Rate              float      default 0,
+    ADD COLUMN LastReadStorageId Integer    default 0,
+    ADD COLUMN LastReadDevice    blob,
+    ADD COLUMN WriteStorageId    integer    default 0,
+    ADD COLUMN WriteDevice       blob,
+    ADD COLUMN Encrypted         int        default 0;
+
 INSERT INTO Events (EventsCode, EventsType, EventsTime, EventsDaemon, EventsSource, EventsRef, EventsText) VALUES
   ('DU0001', 'catalog_update', NOW(), '*SHELL*', 'update_bacula_tables', 'pid$$', 'Catalog schema was updated to 1026');
 UPDATE Version SET VersionId=1026;

diff --git a/bacula/updatedb/update_postgresql_tables_1025_to_1026.in b/bacula/updatedb/update_postgresql_tables_1025_to_1026.in
index 5f9e27cb97bd6875d9d86af4d8b71c777613af7e..ab4ba2e45e5cc13474bebc7e428b86428cacc302 100644 (file)
--- a/bacula/updatedb/update_postgresql_tables_1025_to_1026.in
+++ b/bacula/updatedb/update_postgresql_tables_1025_to_1026.in
@@ -65,6 +65,17 @@ ALTER TABLE Job ADD COLUMN WriteDevice       text        default '';
 ALTER TABLE Job ADD COLUMN StatusInfo        text        default '';
 ALTER TABLE Job ADD COLUMN Encrypted         int         default 0;
 
+ALTER TABLE JobHisto ADD COLUMN RealStartTime     timestamp   without time zone;
+ALTER TABLE JobHisto ADD COLUMN isVirtualFull     smallint    default 0;
+ALTER TABLE JobHisto ADD COLUMN CompressRatio     float       default 0;
+ALTER TABLE JobHisto ADD COLUMN Rate              float       default 0;
+ALTER TABLE JobHisto ADD COLUMN LastReadStorageId integer     default 0;
+ALTER TABLE JobHisto ADD COLUMN LastReadDevice    text        default '';
+ALTER TABLE JobHisto ADD COLUMN WriteStorageId    integer     default 0;
+ALTER TABLE JobHisto ADD COLUMN WriteDevice       text        default '';
+ALTER TABLE JobHisto ADD COLUMN StatusInfo        text        default '';
+ALTER TABLE JobHisto ADD COLUMN Encrypted         int         default 0;
+
 ALTER TABLE Media ADD COLUMN Protected            smallint    default 0;
 ALTER TABLE Media ADD COLUMN UseProtect           smallint    default 0;
 ALTER TABLE Media ADD COLUMN VolEncrypted         smallint    default 0;