Correct compile error

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

diff --git a/bacula/src/cats/update_postgresql_tables.in b/bacula/src/cats/update_postgresql_tables.in
index afb05793e61a04218281efe733e268b5f709c604..97ecee2650bce3c55cffc0729fd966a21441b8a1 100755 (executable)
--- a/bacula/src/cats/update_postgresql_tables.in
+++ b/bacula/src/cats/update_postgresql_tables.in
@@ -1,15 +1,17 @@
 #!/bin/sh
 #
-# Shell script to update PostgreSQL tables from version 1.38 to 1.39
+# Shell script to update PostgreSQL tables from version 1.38 to 2.0.0 or higher
 #
 echo " "
-echo "This script will update a Bacula PostgreSQL database from version 9 to 9"
+echo "This script will update a Bacula PostgreSQL database from version 9 to 10"
+echo " which is needed to convert from Bacula version 1.38.x to 2.0.0 or higher"
 echo "Depending on the size of your database,"
 echo "this script may take several minutes to run."
 echo " "
 bindir=@SQL_BINDIR@
+db_name=@db_name@
 
-if $bindir/psql -f - -d bacula $* <<END-OF-DATA
+if $bindir/psql -f - -d ${db_name} $* <<END-OF-DATA
 
 ALTER TABLE media ADD COLUMN DeviceId integer;
 UPDATE media SET DeviceId=0;
@@ -20,16 +22,15 @@ 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;
 ALTER TABLE media ADD COLUMN enabled integer;
 UPDATE media SET enabled=1;
+ALTER TABLE media ADD COLUMN Comment TEXT;
 
 ALTER TABLE job ADD COLUMN RealEndTime timestamp without time zone;
-UPDATE job SET RealEndTime=0;
 ALTER TABLE job ADD COLUMN PriorJobId integer;
 UPDATE job SET PriorJobId=0;
 
@@ -43,12 +44,29 @@ CREATE TABLE Location (
    PRIMARY KEY (LocationId)
 );
 
+CREATE TABLE LocationLog (
+   LocLogId SERIAL NOT NULL,
+   Date timestamp   without time zone,
+   Comment TEXT NOT NULL,
+   MediaId INTEGER DEFAULT 0,
+   LocationId INTEGER DEFAULT 0,
+   newvolstatus text not null
+       check (newvolstatus in ('Full','Archive','Append',
+             'Recycle','Purged','Read-Only','Disabled',
+             'Error','Busy','Used','Cleaning','Scratch')),
+   newenabled smallint,
+   PRIMARY KEY(LocLogId)
+);
+
+
 CREATE TABLE Log
 (
-    JobId            serial      not null,
+    LogId            serial      not null,
+    JobId            integer     not null,
+    Time             timestamp   without time zone,
     LogText          text        not null,
+    primary key (LogId)
 );
-
 create index log_name_idx on Log (JobId);