[postgis-tickets] r16733 - Strip begin/commit locally, for extension

[Sandro Santilli]

Author: strk
Date: 2018-09-11 02:18:42 -0700 (Tue, 11 Sep 2018)
New Revision: 16733

Modified:
   trunk/postgis/Makefile.in
Log:
Strip begin/commit locally, for extension

Modified: trunk/postgis/Makefile.in
===================================================================
--- trunk/postgis/Makefile.in	2018-09-11 09:18:36 UTC (rev 16732)
+++ trunk/postgis/Makefile.in	2018-09-11 09:18:42 UTC (rev 16733)
@@ -215,7 +215,9 @@
 	$(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/postgis- at POSTGIS_MAJOR_VERSION@. at POSTGIS_MINOR_VERSION@'g;s'@extschema@\.''g" > $@
 
 postgis_upgrade_for_extension.sql: postgis_drop_before.sql postgis_upgrade_for_extension.sql.in postgis_drop_after.sql
-	cat $^ > $@
+	#strip BEGIN/COMMIT since these are not allowed in extensions
+	# WARNING: we should make sure these are not internal to function bodies
+	cat $^ | $(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' > $@
 
 postgis_for_extension.sql: postgis.sql.in
 	$(SQLPP) -I../libpgcommon $< | grep -v '^#' | \