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 285350c306248836d174f4baa1bc1dcba41b3261..07c0d80b0fe16b6d6704968730a907d812bc7e67 100644 (file)
--- 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 f2bc6500b2f6f8803bc35fada47a1a765cce1d6c..8fb397de285caf8cb26c7cb2a7b37c0484e86a29 100755 (executable)
--- 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;
                                        }