From: Darafei Praliaskouski <me@komzpa.net>
Date: Tue, 13 Nov 2018 07:17:28 +0000 (+0000)
Subject: Upgrade script generator fix
X-Git-Tag: 3.0.0alpha1~290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=820778e3500c77f1b46ffcb7b08d30eb414cde3b;p=postgis

Upgrade script generator fix

References #4230



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

diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 285350c30..07c0d80b0 100644
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -908,11 +908,11 @@ CREATE OPERATOR CLASS gist_geometry_ops_nd
 	FOR TYPE geometry USING GIST AS
 	STORAGE 	gidx,
 	OPERATOR        3        &&&	,
-	-- Availability: 2.5.0
+	-- Availability: 3.0.0
 	OPERATOR        6        ~~=	,
-	-- Availability: 2.5.0
+	-- Availability: 3.0.0
 	OPERATOR        7        ~~	,
-	-- Availability: 2.5.0
+	-- Availability: 3.0.0
 	OPERATOR        8        @@	,
 	-- Availability: 2.2.0
 	OPERATOR        13       <<->> FOR ORDER BY pg_catalog.float_ops,
diff --git a/utils/postgis_proc_upgrade.pl b/utils/postgis_proc_upgrade.pl
index f2bc6500b..8fb397de2 100755
--- a/utils/postgis_proc_upgrade.pl
+++ b/utils/postgis_proc_upgrade.pl
@@ -402,7 +402,7 @@ EOF
 					chop $subdefn;
 					$subdefn =~ s/[,;]$//; # strip ending comma or semicolon
 					# argument types must be specified in ALTER OPERATOR FAMILY
-					if ( $subdefn =~ m/\s+(OPERATOR.*)(FOR.*)/ )
+					if ( $subdefn =~ m/\s+(OPERATOR.*)/ )
 					{
 						$subdefn = $1.'('.$opctype.','.$opctype.') '.$2;
 					}