Menu
▾
▴
[Bacula-commits] bacula/src/cats make_mysql_tables.in,1.44,1.45 make_postgresql_tables.in,1.34,1.35 make_sqlite3_tables.in,1.9,1.10 make_sqlite_tables.in,1.37,1.38 update_mysql_tables.in,1.22,1.23 update_postgresql_tables.in,1.21,1.22 update_sqlite3_tables.in,1.9,1.10 update_sqlite_tables.in,1.23,1.24
|
From: Kern S. <ke...@us...> - 2006-02-26 13:01:33
|
Update of /cvsroot/bacula/bacula/src/cats In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15383/src/cats Modified Files: make_mysql_tables.in make_postgresql_tables.in make_sqlite3_tables.in make_sqlite_tables.in update_mysql_tables.in update_postgresql_tables.in update_sqlite3_tables.in update_sqlite_tables.in Log Message: - Fix the block listing bug pointed out by Arno. - Update the po files at Eric's request. Index: update_sqlite3_tables.in =================================================================== RCS file: /cvsroot/bacula/bacula/src/cats/update_sqlite3_tables.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- update_sqlite3_tables.in 20 Feb 2006 20:04:02 -0000 1.9 +++ update_sqlite3_tables.in 26 Feb 2006 13:01:21 -0000 1.10 @@ -21,7 +21,7 @@ Slot INTEGER DEFAULT 0, PoolId INTEGER UNSIGNED REFERENCES Pool NOT NULL, MediaType VARCHAR(128) NOT NULL, - MediaTypeId INTEGER UNSIGNED REFERENCES MediaType NOT NULL, + MediaTypeId INTEGER UNSIGNED REFERENCES MediaType DEFAULT 0, LabelType TINYINT DEFAULT 0, FirstWritten DATETIME DEFAULT 0, LastWritten DATETIME DEFAULT 0, @@ -51,6 +51,10 @@ EndFile INTEGER UNSIGNED DEFAULT 0, EndBlock INTEGER UNSIGNED DEFAULT 0, LocationId INTEGER UNSIGNED REFERENCES Location, + RecycleCount INTEGER UNSIGNED DEFAULT 0, + InitialWrite DATETIME DEFAULT 0, + ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0, + RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0, PRIMARY KEY(MediaId) ); @@ -63,7 +67,7 @@ VolRetention, VolUseDuration, MaxVolJobs, MaxVolFiles, MaxVolBytes, InChanger, StorageId, 0, MediaAddressing, - VolReadTime, VolWriteTime, EndFile, EndBlock, 0 + VolReadTime, VolWriteTime, EndFile, EndBlock, 0, 0, 0, 0, 0 FROM Media; @@ -105,6 +109,10 @@ EndFile INTEGER UNSIGNED DEFAULT 0, EndBlock INTEGER UNSIGNED DEFAULT 0, LocationId INTEGER UNSIGNED REFERENCES Location, + RecycleCount INTEGER UNSIGNED DEFAULT 0, + InitialWrite DATETIME DEFAULT 0, + ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0, + RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0, PRIMARY KEY(MediaId) ); @@ -118,9 +126,11 @@ MaxVolFiles, MaxVolBytes, InChanger, StorageId, DeviceId, MediaAddressing, VolReadTime, VolWriteTime, - EndFile, EndBlock, LocationId) + EndFile, EndBlock, LocationId, RecycleCount, InitialWrite, + ScratchPoolId, RecyclePoolId) SELECT * FROM Media_backup; + DROP TABLE Media_backup; CREATE INDEX inx8 ON Media (PoolId); Index: update_postgresql_tables.in =================================================================== RCS file: /cvsroot/bacula/bacula/src/cats/update_postgresql_tables.in,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- update_postgresql_tables.in 20 Feb 2006 20:04:02 -0000 1.21 +++ update_postgresql_tables.in 26 Feb 2006 13:01:21 -0000 1.22 @@ -17,6 +17,14 @@ UPDATE media SET MediaTypeId=0; ALTER TABLE media ADD COLUMN LocationId integer; UPDATE media SET LocationId=0; +ALTER TABLE media ADD COLUMN RecycleCount integer; +UPDATE media SET RecycleCount=0; +ALTER TABLE media ADD COLUMN InitialWrite timestamp without time zone; +UPDATE media SET InitialWrite=0; +ALTER TABLE media ADD COLUMN scratchpoolid integer; +UPDATE media SET scratchpoolid=0; +ALTER TABLE media ADD COLUMN recyclepoolid integer; +UPDATE media SET recyclepoolid=0; CREATE TABLE MAC ( Index: make_sqlite3_tables.in =================================================================== RCS file: /cvsroot/bacula/bacula/src/cats/make_sqlite3_tables.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- make_sqlite3_tables.in 20 Feb 2006 20:04:02 -0000 1.9 +++ make_sqlite3_tables.in 26 Feb 2006 13:01:21 -0000 1.10 @@ -119,7 +119,7 @@ Slot INTEGER DEFAULT 0, PoolId INTEGER UNSIGNED REFERENCES Pool NOT NULL, MediaType VARCHAR(128) NOT NULL, - MediaTypeId INTEGER UNSIGNED REFERENCES MediaType NOT NULL, + MediaTypeId INTEGER UNSIGNED REFERENCES MediaType DEFAULT 0, LabelType TINYINT DEFAULT 0, FirstWritten DATETIME DEFAULT 0, LastWritten DATETIME DEFAULT 0, @@ -149,6 +149,10 @@ EndFile INTEGER UNSIGNED DEFAULT 0, EndBlock INTEGER UNSIGNED DEFAULT 0, LocationId INTEGER UNSIGNED REFERENCES Location, + RecycleCount INTEGER UNSIGNED DEFAULT 0, + InitialWrite DATETIME DEFAULT 0, + ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0, + RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0, PRIMARY KEY(MediaId) ); Index: make_sqlite_tables.in =================================================================== RCS file: /cvsroot/bacula/bacula/src/cats/make_sqlite_tables.in,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- make_sqlite_tables.in 20 Feb 2006 20:04:02 -0000 1.37 +++ make_sqlite_tables.in 26 Feb 2006 13:01:21 -0000 1.38 @@ -119,7 +119,7 @@ Slot INTEGER DEFAULT 0, PoolId INTEGER UNSIGNED REFERENCES Pool NOT NULL, MediaType VARCHAR(128) NOT NULL, - MediaTypeId INTEGER UNSIGNED REFERENCES MediaType NOT NULL, + MediaTypeId INTEGER UNSIGNED REFERENCES MediaType DEFAULT 0, LabelType TINYINT DEFAULT 0, FirstWritten DATETIME DEFAULT 0, LastWritten DATETIME DEFAULT 0, @@ -149,6 +149,10 @@ EndFile INTEGER UNSIGNED DEFAULT 0, EndBlock INTEGER UNSIGNED DEFAULT 0, LocationId INTEGER UNSIGNED REFERENCES Location, + RecycleCount INTEGER UNSIGNED DEFAULT 0, + InitialWrite DATETIME DEFAULT 0, + ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0, + RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0, PRIMARY KEY(MediaId) ); Index: update_mysql_tables.in =================================================================== RCS file: /cvsroot/bacula/bacula/src/cats/update_mysql_tables.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- update_mysql_tables.in 20 Feb 2006 20:04:02 -0000 1.22 +++ update_mysql_tables.in 26 Feb 2006 13:01:21 -0000 1.23 @@ -15,6 +15,10 @@ ALTER TABLE Media ADD COLUMN MediaTypeId INTEGER UNSIGNED DEFAULT 0 REFERENCES MediaType; ALTER TABLE Media ADD COLUMN DeviceId INTEGER UNSIGNED DEFAULT 0 REFERENCES Device; ALTER TABLE Media ADD COLUMN LocationId INTEGER UNSIGNED DEFAULT 0 REFERENCES Location; +ALTER TABLE Media ADD COLUMN RecycleCount INTEGER UNSIGNED DEFAULT 0; +ALTER TABLE Media ADD COLUMN InitialWrite DATETIME DEFAULT 0; +ALTER TABLE Media ADD COLUMN ScratchPoolId INTEGER UNSIGNED DEFAULT 0 REFERENCES Pool; +ALTER TABLE Media ADD COLUMN RecyclePoolId INTEGER UNSIGNED DEFAULT 0 REFERENCES Pool; CREATE TABLE MAC ( Index: make_postgresql_tables.in =================================================================== RCS file: /cvsroot/bacula/bacula/src/cats/make_postgresql_tables.in,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- make_postgresql_tables.in 20 Feb 2006 20:04:02 -0000 1.34 +++ make_postgresql_tables.in 26 Feb 2006 13:01:21 -0000 1.35 @@ -159,6 +159,10 @@ endfile integer not null default 0, endblock bigint not null default 0, LocationId integer default 0, + recyclcount integer not null default 0, + initialwrite timestamp without time zone, + scratchpoolid integer default 0, + recyclepoolid integer default 0, primary key (mediaid) ); Index: update_sqlite_tables.in =================================================================== RCS file: /cvsroot/bacula/bacula/src/cats/update_sqlite_tables.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- update_sqlite_tables.in 20 Feb 2006 20:04:02 -0000 1.23 +++ update_sqlite_tables.in 26 Feb 2006 13:01:21 -0000 1.24 @@ -21,7 +21,7 @@ Slot INTEGER DEFAULT 0, PoolId INTEGER UNSIGNED REFERENCES Pool NOT NULL, MediaType VARCHAR(128) NOT NULL, - MediaTypeId INTEGER UNSIGNED REFERENCES MediaType NOT NULL, + MediaTypeId INTEGER UNSIGNED REFERENCES MediaType DEFAULT 0, LabelType TINYINT DEFAULT 0, FirstWritten DATETIME DEFAULT 0, LastWritten DATETIME DEFAULT 0, @@ -51,6 +51,10 @@ EndFile INTEGER UNSIGNED DEFAULT 0, EndBlock INTEGER UNSIGNED DEFAULT 0, LocationId INTEGER UNSIGNED REFERENCES Location, + RecycleCount INTEGER UNSIGNED DEFAULT 0, + InitialWrite DATETIME DEFAULT 0, + ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0, + RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0, PRIMARY KEY(MediaId) ); @@ -63,7 +67,7 @@ VolRetention, VolUseDuration, MaxVolJobs, MaxVolFiles, MaxVolBytes, InChanger, StorageId, 0, MediaAddressing, - VolReadTime, VolWriteTime, EndFile, EndBlock, 0 + VolReadTime, VolWriteTime, EndFile, EndBlock, 0, 0, 0, 0, 0 FROM Media; @@ -105,6 +109,10 @@ EndFile INTEGER UNSIGNED DEFAULT 0, EndBlock INTEGER UNSIGNED DEFAULT 0, LocationId INTEGER UNSIGNED REFERENCES Location, + RecycleCount INTEGER UNSIGNED DEFAULT 0, + InitialWrite DATETIME DEFAULT 0, + ScratchPoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0, + RecyclePoolId INTEGER UNSIGNED REFERENCES Pool DEFAULT 0, PRIMARY KEY(MediaId) ); @@ -118,9 +126,11 @@ MaxVolFiles, MaxVolBytes, InChanger, StorageId, DeviceId, MediaAddressing, VolReadTime, VolWriteTime, - EndFile, EndBlock, LocationId) + EndFile, EndBlock, LocationId, RecycleCount, InitialWrite, + ScratchPoolId, RecyclePoolId) SELECT * FROM Media_backup; + DROP TABLE Media_backup; CREATE INDEX inx8 ON Media (PoolId); Index: make_mysql_tables.in =================================================================== RCS file: /cvsroot/bacula/bacula/src/cats/make_mysql_tables.in,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- make_mysql_tables.in 20 Feb 2006 20:04:02 -0000 1.44 +++ make_mysql_tables.in 26 Feb 2006 13:01:21 -0000 1.45 @@ -189,6 +189,10 @@ EndFile INTEGER UNSIGNED NOT NULL DEFAULT 0, EndBlock INTEGER UNSIGNED NOT NULL DEFAULT 0, LocationId INTEGER UNSIGNED NOT NULL REFERENCES Location, + RecycleCount INTEGER UNSIGNED DEFAULT 0, + InitialWrite DATETIME NOT NULL, + ScratchPoolId INTEGER UNSIGNED DEFAULT 0 REFERENCES Pool, + RecyclePoolId INTEGER UNSIGNED DEFAULT 0 REFERENCES Pool, PRIMARY KEY(MediaId), INDEX (PoolId) ); |