#3235, ensure all commands in upgrade are within transaction

git-svn-id: http://svn.osgeo.org/postgis/trunk@13905 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
Paul Ramsey 2015-08-12 17:38:49 +00:00
parent e62894376a
commit 3bc606010b
2 changed files with 5 additions and 3 deletions

View file

@ -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 > $@

View file

@ -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;