X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fcats%2Fcreate_postgresql_database.in;h=50fe6c4bf06509f58f9f35e7d8af706f51ba1d80;hb=fb71554fa28e81b6125c2063e028976df18334f2;hp=8ee437d85f695d74a59819fb44857e30d7fc5b99;hpb=df5a4b58cbe24b47d9da011684f8b01e8b730b60;p=bacula%2Fbacula

diff --git a/bacula/src/cats/create_postgresql_database.in b/bacula/src/cats/create_postgresql_database.in
index 8ee437d85f..50fe6c4bf0 100644
--- a/bacula/src/cats/create_postgresql_database.in
+++ b/bacula/src/cats/create_postgresql_database.in
@@ -3,24 +3,59 @@
 # shell script to create Bacula database(s)
 #
 
-bindir=@SQL_BINDIR@
+PATH="@SQL_BINDIR@:$PATH"
+db_name=${db_name:-@db_name@}
 
+#
 # use SQL_ASCII to be able to put any filename into
 #  the database even those created with unusual character sets
-ENCODING="ENCODING 'SQL_ASCII'"
-# use UTF8 if you are using standard Unix/Linux LANG specifications
-#  that use UTF8 -- this is normally the default and *should* be
-#  your standard.  Bacula consoles work correctly *only* with UTF8.
-#ENCODING="ENCODING 'UTF8'"
-     
 
-if $bindir/psql -f - -d template1 $* <<END-OF-DATA
-CREATE DATABASE bacula $ENCODING;
-ALTER DATABASE bacula SET datestyle TO 'ISO, YMD';
+PSQLVERSION=`psql -d template1 -c 'select version()' | awk '/PostgreSQL/ {print $2}' | cut -d '.' -f 1,2`
+
+#
+# Note, LC_COLLATE and LC_TYPE are needed on 8.4 and beyond, but are
+#   not implemented in 8.3 or below.
+# This must be updated for future versions of PostgreSQL
+#
+case ${PSQLVERSION} in
+   "9.*")
+	ENCODING="ENCODING 'SQL_ASCII' LC_COLLATE 'C' LC_CTYPE 'C'"
+   ;;
+   "8.[456789]")
+	ENCODING="ENCODING 'SQL_ASCII' LC_COLLATE 'C' LC_CTYPE 'C'"
+    ;;
+    *)
+	ENCODING="ENCODING 'SQL_ASCII'"
+    ;;
+esac
+
+
+
+#
+# Please note: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#  We do not recommend that you use ENCODING 'SQL_UTF8'
+#  It can result in creating filenames in the database that
+#  cannot be seen or restored.
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#
+#
+if psql -f - -d template1 $* <<END-OF-DATA
+\set ON_ERROR_STOP on
+CREATE DATABASE ${db_name} $ENCODING TEMPLATE template0;
+ALTER DATABASE ${db_name} SET datestyle TO 'ISO, YMD';
 END-OF-DATA
 then
-   echo "Creation of bacula database succeeded."
+   echo "Creation of ${db_name} database succeeded."
+else
+   echo " "
+   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+   echo "!!!! Creation of ${db_name} database failed. !!!!"
+   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+fi
+if psql -l ${dbname} | grep " ${db_name}.*SQL_ASCII" >/dev/null; then 
+   echo "Database encoding OK"
 else
-   echo "Creation of bacula database failed."
+   echo " "
+   echo "Database encoding bad. Do not use this database"
+   echo " "
 fi
-exit 0