From: Sandro Santilli <strk@keybit.net>
Date: Tue, 4 Jun 2013 14:13:16 +0000 (+0000)
Subject: Let DO commands from SQL drop files end up in final upgrade script
X-Git-Tag: 2.1.0beta3~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98fe7c41d91eaba9da5cb32705f0d3bf213ab134;p=postgis

Let DO commands from SQL drop files end up in final upgrade script

Should fix upgrade path from 2.0 to 2.1 (#2334)

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

diff --git a/utils/postgis_proc_upgrade.pl b/utils/postgis_proc_upgrade.pl
index 946a49b6f..7dcd9e2b2 100755
--- a/utils/postgis_proc_upgrade.pl
+++ b/utils/postgis_proc_upgrade.pl
@@ -195,6 +195,16 @@ while(<INPUT>)
 		}
 	}
 
+	if ( /^do *language .*\$\$/i )
+	{
+		print;
+		while(<INPUT>)
+		{
+			print;
+			last if /\$\$/;
+		}
+	}
+
 	# This code handles casts by dropping and recreating them.
 	if ( /^create cast\s+\(\s*(\w+)\s+as\s+(\w+)\)/i )
 	{