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 152eab8e416d2ac10cf8d7025f4d14f57542536f..624a8f1aba6c8fa2b44a9082e89add93cc982841 100644 (file)
--- 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 a9643a12a934022e5cc7aca756342cb0cc0ca404..b27ffb77d94fe78baff684b0b24a953295638ad9 100755 (executable)
--- 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 4de853e95d62690a10580afc9bc15e96320a2dbe..abf55e18e3a4f925260ab82c08eb8a0c6f643194 100644 (file)
--- 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:\r
 REM      cd @working_dir_cmd@\r
 REM      dropdb bacula\r
-REM      createdb bacula\r
+REM      createdb -T template0 -E SQL_ASCII  bacula\r
 REM      psql bacula < bacula.sql\r
 REM\r
 EXIT /b 0\r

diff --git a/bacula/src/win32/cats/make_postgresql_catalog_backup.cmd b/bacula/src/win32/cats/make_postgresql_catalog_backup.cmd
index 16456b314c5c25044170d1010a53e7db14fa7e07..759a1011fe6c13e99a9fd279ed322772637c9604 100644 (file)
--- 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:\r
 REM      cd @working_dir_cmd@\r
 REM      dropdb bacula\r
-REM      createdb bacula\r
+REM      createdb -T template0 -E SQL_ASCII bacula\r
 REM      psql bacula < bacula.sql\r
 REM \r
 EXIT /b 0\r

diff --git a/bacula/src/win32/cats/make_sqlite3_catalog_backup.cmd b/bacula/src/win32/cats/make_sqlite3_catalog_backup.cmd
index 7cdd00ba9c94874c8350203279d350c35b4f9772..4c968614ff72bc4a72249e5616a0f209176affa2 100644 (file)
--- 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:\r
 REM      cd @working_dir_cmd@\r
 REM      dropdb bacula\r
-REM      createdb bacula\r
+REM      createdb -T template0 -E SQL_ASCII bacula\r
 REM      psql bacula < bacula.sql\r
 REM \r
 EXIT /b 0\r