Use the command line utility dropdb instead of the psql command

[bacula/bacula] / bacula / src / cats / update_mysql_tables.in

diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in
index 84bc5688609bdb622457f283881ffb1f9d2acf4e..c87955612abc36f463f0396c69c32105e7e8f281 100755 (executable)
--- a/bacula/src/cats/update_mysql_tables.in
+++ b/bacula/src/cats/update_mysql_tables.in
@@ -11,9 +11,14 @@ bindir=@SQL_BINDIR@
 if $bindir/mysql $* -f <<END-OF-DATA
 USE bacula;
 
-ALTER TABLE Media ADD COLUMN Drive INTEGER NOT NULL DEFAULT 0;
 ALTER TABLE Media ADD COLUMN InChanger TINYINT NOT NULL DEFAULT 0;
+ALTER TABLE Media ADD COLUMN MediaAddressing TINYINT NOT NULL DEFAULT 0;
+ALTER TABLE Media ADD COLUMN VolReadTime BIGINT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE Media ADD COLUMN VolWriteTime BIGINT UNSIGNED NOT NULL DEFAULT 0;
 
+ALTER TABLE Pool ADD COLUMN Enabled TINYINT DEFAULT 1;
+ALTER TABLE Pool ADD COLUMN ScratchPoolId INTEGER UNSIGNED DEFAULT 0 REFERENCES Pool;
+ALTER TABLE Pool ADD COLUMN RecyclePoolId INTEGER UNSIGNED DEFAULT 0 REFERENCES Pool;
 
 DROP TABLE BaseFiles;
 
@@ -47,7 +52,8 @@ CREATE TABLE BaseFiles (
    PRIMARY KEY(BaseId)
    );
 
-UPDATE Version SET VersionId=7;
+DELETE FROM Version;
+INSERT INTO Version (VersionId) VALUES (7);
 
 END-OF-DATA
 then