Patch by Havard Tveite <havard.tveite@nlh.no>:

        * doc/postgix.xml (Hard Upgrade): add info about createdb params
        * utils/postgis_restore.pl: fix use of createdb params

git-svn-id: http://svn.osgeo.org/postgis/trunk@2527 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/ChangeLog b/ChangeLog
index 878c70a963852b37e7e073c14c85f7ae7cd4da16..d04d4b02d38c3abad05614aeab8ffa2304d7430e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-10 Havard Tveite <havard.tveite@nlh.no>
+
+       * doc/postgix.xml (Hard Upgrade): add info about createdb params
+       * utils/postgis_restore.pl: fix use of createdb params
+
 2006-11-02 Sandro Santilli <strk@refractions.net>
 
        * doc/postgis.xml: list setSRID bug fix in 'Bug fixes' section.

diff --git a/doc/postgis.xml b/doc/postgis.xml
index cd4986011645cec79f7591f9f83cfc0db7dcb78e..c0f488a627a7275a05274a92fc0a77e09bad4d2e 100644 (file)
--- a/doc/postgis.xml
+++ b/doc/postgis.xml
@@ -454,8 +454,11 @@ as follow:
 
        # Restore the dump contextually upgrading postgis into
        # a new database. The new database doesn't have to exist.
-       # Let's call it "newdb"
-       $ sh utils/postgis_restore.pl lwpostgis.sql newdb olddb.dump > restore.log
+       # postgis_restore accepts createdb parameters after the dump
+       # file name, and that can for instance be used if you are using
+       # a non-default character encoding for your database.
+       # Let's call it "newdb", with UNICODE as the character encoding:
+       $ sh utils/postgis_restore.pl lwpostgis.sql newdb olddb.dump -E=UNICODE > restore.log
 
        # Check that all restored dump objects really had to be restored from dump
        # and do not conflict with the ones defined in lwpostgis.sql

diff --git a/utils/postgis_restore.pl b/utils/postgis_restore.pl
index d974f1225faa4f25f3e8c7503906ea2f777bbadc..23d147edd4f1517a78839082315e58dbf050acac 100644 (file)
--- a/utils/postgis_restore.pl
+++ b/utils/postgis_restore.pl
@@ -677,7 +677,7 @@ close(OUTPUT);
 # Create the new db and install plpgsql language
 #
 print "Creating db ($dbname)\n";
-`createdb $dbname $createdb_opt`;
+`createdb $createdb_opt $dbname`;
 die "Database creation failed\n" if ($?);
 print "Adding plpgsql\n";
 `createlang plpgsql $dbname`;