Update /contrib for "autocommit TO 'on'".

Create objects in public schema.

Make spacing/capitalization consistent.

Remove transaction block use for object creation.

Remove unneeded function GRANTs.

2 files changed, 22 insertions, 8 deletions

diff --git a/contrib/rtree_gist/bench/bench.pl b/contrib/rtree_gist/bench/bench.pl
index e6bc1332cf6..e42ec9c63a3 100755
--- a/contrib/rtree_gist/bench/bench.pl
+++ b/contrib/rtree_gist/bench/bench.pl
@@ -25,6 +25,20 @@ EOT
 $opt{d} ||= 'TEST';
 my $dbi=DBI->connect('DBI:Pg:dbname='.$opt{d}) || die "Couldn't connect DB: $opt{d} !\n";
 
+my $setsql = qq{
+    SET search_path = public;
+};
+
+my $sth = $dbi->prepare($setsql);
+$sth->execute();
+
+my $setsql2 = qq{
+    SET autocommit TO 'on';
+};
+
+my $sth2 = $dbi->prepare($setsql2);
+$sth2->execute();
+
 my $sql;
 my $notice;
 my $sss = '(3000,3000,2990,2990)';
diff --git a/contrib/rtree_gist/bench/create_test.pl b/contrib/rtree_gist/bench/create_test.pl
index 1c06b6863d3..cde92da6cd4 100755
--- a/contrib/rtree_gist/bench/create_test.pl
+++ b/contrib/rtree_gist/bench/create_test.pl
@@ -2,11 +2,11 @@
 use strict;
 
 my $NUM = 20000;
-print "drop table boxtmp;\n"; 
-print "drop table boxtmp2;\n"; 
+print "DROP TABLE boxtmp;\n"; 
+print "DROP TABLE boxtmp2;\n"; 
 
-print "create table boxtmp (b box);\n";
-print "create table boxtmp2 (b box);\n";
+print "CREATE TABLE boxtmp (b box);\n";
+print "CREATE TABLE boxtmp2 (b box);\n";
 
 srand(1);
 open(DAT,">bbb.dat") || die;
@@ -26,20 +26,20 @@ foreach ( 1..$NUM ) {
 }
 close DAT;
 
-print "copy boxtmp from stdin;\n";
+print "COPY boxtmp FROM stdin;\n";
 open(DAT,"bbb.dat") || die;
 while(<DAT>) { print; }
 close DAT;
 print "\\.\n";
 
-print "copy boxtmp2 from stdin;\n";
+print "COPY boxtmp2 FROM stdin;\n";
 open(DAT,"bbb.dat") || die;
 while(<DAT>) { print; }
 close DAT;
 print "\\.\n";
 
-print "create index bix on boxtmp using gist (b gist_box_ops);\n";
-print "create index bix2 on boxtmp2 using rtree (b box_ops);\n";
+print "CREATE INDEX bix ON boxtmp USING gist (b gist_box_ops);\n";
+print "CREATE INDEX bix2 ON boxtmp2 USING rtree (b box_ops);\n";
 
 
 sub min {