From: Dan Langille <dan@langille.org>
Date: Wed, 2 Dec 2009 10:30:12 +0000 (+0100)
Subject: Apply Postgres 8.4 SQL_ASCII fix
X-Git-Tag: Release-7.0.0~2534
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1797682f476e3866488aa0b19898695b084a94df;p=bacula%2Fbacula

Apply Postgres 8.4 SQL_ASCII fix
---

diff --git a/bacula/src/cats/create_postgresql_database.in b/bacula/src/cats/create_postgresql_database.in
index 152eab8e41..624a8f1aba 100644
--- a/bacula/src/cats/create_postgresql_database.in
+++ b/bacula/src/cats/create_postgresql_database.in
@@ -25,7 +25,7 @@ ENCODING="ENCODING 'SQL_ASCII'"
 #   CREATE DATABASE ${db_name} $ENCODING TEMPLATE template0
 #
 if $bindir/psql -f - -d template1 $* <<END-OF-DATA
-CREATE DATABASE ${db_name} $ENCODING;
+CREATE DATABASE ${db_name} $ENCODING TEMPLATE template0;
 ALTER DATABASE ${db_name} SET datestyle TO 'ISO, YMD';
 END-OF-DATA
 then
diff --git a/bacula/src/cats/make_catalog_backup.in b/bacula/src/cats/make_catalog_backup.in
index a9643a12a9..b27ffb77d9 100755
--- a/bacula/src/cats/make_catalog_backup.in
+++ b/bacula/src/cats/make_catalog_backup.in
@@ -68,6 +68,6 @@ fi
 #  To read back a PostgreSQL database use:
 #     cd @working_dir@
 #     dropdb bacula
-#     createdb bacula -E SQL_ASCII
+#     createdb bacula -T template0 -E SQL_ASCII
 #     psql bacula <bacula.sql
 #