#3235, ensure all commands in upgrade are within transaction

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

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index 3ee00ad4b7926082f980f962e4ef7d1d445df610..ab903c6e3c9023933bfda1a8e3c663c83545c7a8 100644 (file)
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -161,7 +161,9 @@ postgis_upgrade.sql.in: postgis.sql ../utils/postgis_proc_upgrade.pl
        $(PERL) ../utils/postgis_proc_upgrade.pl $< UNUSED > $@
 
 postgis_upgrade.sql: postgis_drop_before.sql postgis_upgrade.sql.in postgis_drop_after.sql
-       cat $^ > $@
+       echo "BEGIN;" > $@
+       cat $^ >> $@
+       echo "COMMIT;" >> $@
 
 sfcgal_upgrade.sql.in: sfcgal.sql ../utils/postgis_proc_upgrade.pl 
        $(PERL) ../utils/postgis_proc_upgrade.pl $< UNUSED > $@

diff --git a/utils/postgis_proc_upgrade.pl b/utils/postgis_proc_upgrade.pl
index d3568c71375cdb715880052d5a182cc85fa86466..1dd309724b08b4c032646ff0548367520d1e5930 100755 (executable)
--- a/utils/postgis_proc_upgrade.pl
+++ b/utils/postgis_proc_upgrade.pl
@@ -186,7 +186,7 @@ print qq{
 
 print "LOAD $soname;\n" if ($soname);
 
-print "BEGIN;\n";
+#print "BEGIN;\n";
 print "SET search_path TO $schema;\n" if $schema;
 
 #
@@ -483,7 +483,7 @@ close( INPUT );
 
 print "DROP TABLE _postgis_upgrade_info;\n";
 
-print "COMMIT;\n";
+#print "COMMIT;\n";
 
 1;