Allowed custom args passing to createdb invocation

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

diff --git a/utils/postgis_restore.pl b/utils/postgis_restore.pl
index 0e034d4165c17eabee6f3d7ef0c31e9aac3ae9fa..c299381f917bb9895c576af7253f9f4708beb98e 100644 (file)
--- a/utils/postgis_restore.pl
+++ b/utils/postgis_restore.pl
@@ -40,7 +40,7 @@
 eval "exec perl -w $0 $@"
        if (0);
 
-(@ARGV == 3) || die "Usage: postgis_restore.pl <postgis.sql> <db> <dump>\nRestore a custom dump (pg_dump -Fc) of a postgis enabled database.\n";
+(@ARGV >= 3) || die "Usage: postgis_restore.pl <postgis.sql> <db> <dump> [<createdb_options>]\nRestore a custom dump (pg_dump -Fc) of a postgis enabled database.\n";
 
 $DEBUG=1;
 
@@ -98,15 +98,19 @@ my %obsoleted_function = (
        'unite_finalfunc', 1
 );
 
-my $postgissql = $ARGV[0];
-my $dbname = $ARGV[1];
-my $dump = $ARGV[2];
+my $postgissql = $ARGV[0]; shift(@ARGV);
+my $dbname = $ARGV[0]; shift(@ARGV);
+my $dump = $ARGV[0]; shift(@ARGV);
+my $createdb_opt = '';
 my $dumplist=$dump.".list";
 my $dumpascii=$dump.".ascii";
 
+$createdb_opt = join(' ', @ARGV) if @ARGV;
+
 print "postgis.sql is $postgissql\n";
 print "dbname is $dbname\n";
 print "dumpfile is $dump\n";
+print "database creation options: $createdb_opt\n" if $createdb_opt;
 
 #
 # Scan postgis.sql
@@ -595,8 +599,8 @@ close(OUTPUT);
 # Create the new db and install plpgsql language
 #
 print "Creating db ($dbname)\n";
-`createdb $dbname`;
-die "Can't restore in an existing database\n" if ($?);
+`createdb $dbname $createdb_opt`;
+die "Database creation failed\n" if ($?);
 print "Adding plpgsql\n";
 `createlang plpgsql $dbname`;