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-5.0.0~217
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=47ff48488e73559efe8de0e7ef7fdaa25fd87ddc;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
 #
diff --git a/bacula/src/win32/cats/make_mysql_catalog_backup.cmd b/bacula/src/win32/cats/make_mysql_catalog_backup.cmd
index 4de853e95d..abf55e18e3 100644
--- a/bacula/src/win32/cats/make_mysql_catalog_backup.cmd
+++ b/bacula/src/win32/cats/make_mysql_catalog_backup.cmd
@@ -35,7 +35,7 @@ REM
 REM   To read back a PostgreSQL database use:
 REM      cd @working_dir_cmd@
 REM      dropdb bacula
-REM      createdb bacula
+REM      createdb -T template0 -E SQL_ASCII  bacula
 REM      psql bacula < bacula.sql
 REM
 EXIT /b 0
diff --git a/bacula/src/win32/cats/make_postgresql_catalog_backup.cmd b/bacula/src/win32/cats/make_postgresql_catalog_backup.cmd
index 16456b314c..759a1011fe 100644
--- a/bacula/src/win32/cats/make_postgresql_catalog_backup.cmd
+++ b/bacula/src/win32/cats/make_postgresql_catalog_backup.cmd
@@ -35,7 +35,7 @@ REM
 REM   To read back a PostgreSQL database use:
 REM      cd @working_dir_cmd@
 REM      dropdb bacula
-REM      createdb bacula
+REM      createdb -T template0 -E SQL_ASCII bacula
 REM      psql bacula < bacula.sql
 REM 
 EXIT /b 0
diff --git a/bacula/src/win32/cats/make_sqlite3_catalog_backup.cmd b/bacula/src/win32/cats/make_sqlite3_catalog_backup.cmd
index 7cdd00ba9c..4c968614ff 100644
--- a/bacula/src/win32/cats/make_sqlite3_catalog_backup.cmd
+++ b/bacula/src/win32/cats/make_sqlite3_catalog_backup.cmd
@@ -32,7 +32,7 @@ REM
 REM   To read back a PostgreSQL database use:
 REM      cd @working_dir_cmd@
 REM      dropdb bacula
-REM      createdb bacula
+REM      createdb -T template0 -E SQL_ASCII bacula
 REM      psql bacula < bacula.sql
 REM 
 EXIT /b 0