Recompile configure

[bacula/bacula] / bacula / updatedb / update_postgresql_tables_11_to_12.in

diff --git a/bacula/updatedb/update_postgresql_tables_11_to_12.in b/bacula/updatedb/update_postgresql_tables_11_to_12.in
index 51e9f7bcd66abf3dd3ea3e1d8b3b6cb84c820084..e15d8171c7de5bba3100b36be292d1d168581bd6 100644 (file)
--- a/bacula/updatedb/update_postgresql_tables_11_to_12.in
+++ b/bacula/updatedb/update_postgresql_tables_11_to_12.in
@@ -7,11 +7,11 @@ echo "This script will update a Bacula PostgreSQL database from version 11 to 12
 echo " which is needed to convert from Bacula Community version 3.0.x to 5.0.x"
 echo " "
 
-bindir=@SQL_BINDIR@
+bindir=@POSTGRESQL_BINDIR@
 PATH="$bindir:$PATH"
-db_name=@db_name@
+db_name=${db_name:-@db_name@}
 
-DBVERSION=`psql ${db_name} -t --pset format=unaligned -c "select VersionId from Version"`
+DBVERSION=`psql -d ${db_name} -t --pset format=unaligned -c "select VersionId from Version" $*`
 if [ $DBVERSION != 11 ] ; then
    echo " "
    echo "The existing database is version $DBVERSION !!"
@@ -70,6 +70,9 @@ COMMIT;
 
 CREATE INDEX basefiles_jobid_idx ON BaseFiles ( JobId );
 
+-- suppress output for index modification
+SET client_min_messages TO 'fatal';
+
 -- Remove bad PostgreSQL index
 DROP INDEX file_fp_idx;
 
@@ -80,9 +83,10 @@ DROP INDEX file_fp_idx;
 
 CREATE INDEX file_jpfid_idx on File (JobId, PathId, FilenameId);
 
-ANALYSE;
+-- restore output
+SET client_min_messages TO DEFAULT;
 
-UPDATE Version SET VersionId=12;
+ANALYSE;
 
 END-OF-DATA
 then