]> granicus.if.org Git - postgis/commitdiff
Wrap <-> distance ordering into a PgSQL 9.1+ block.
authorPaul Ramsey <pramsey@cleverelephant.ca>
Mon, 26 Sep 2011 21:05:08 +0000 (21:05 +0000)
committerPaul Ramsey <pramsey@cleverelephant.ca>
Mon, 26 Sep 2011 21:05:08 +0000 (21:05 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@7895 b70326c6-7e19-0410-871a-916f4a2858ee

postgis/postgis.sql.in.c

index 72c19a449e061edfed4ebc57d1e50ff63d34c622..da257897f201df7a3185035415616e4c2d2837d4 100644 (file)
@@ -613,10 +613,12 @@ CREATE OR REPLACE FUNCTION geometry_boxdistance(geometry, geometry)
        AS 'MODULE_PATHNAME' ,'gserialized_boxdistance_2d'\r
        LANGUAGE 'C' IMMUTABLE STRICT;\r
 \r
+#if POSTGIS_PGSQL_VERSION >= 91\r
 CREATE OPERATOR <-> (\r
     LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_boxdistance,\r
     COMMUTATOR = '<->'\r
 );\r
+#endif\r
 \r
 -- Availability: 2.0.0\r
 CREATE OR REPLACE FUNCTION geometry_contains(geometry, geometry)\r
@@ -754,16 +756,17 @@ CREATE OPERATOR CLASS gist_geometry_ops_2d
        OPERATOR        10       <<| ,\r
        OPERATOR        11       |>> ,\r
        OPERATOR        12       |&> ,\r
+#if POSTGIS_PGSQL_VERSION >= 91\r
        OPERATOR        13       <-> FOR ORDER BY pg_catalog.float_ops,\r
+       FUNCTION        8        geometry_gist_boxdistance_2d (internal, geometry, int4),\r
+#endif\r
        FUNCTION        1        geometry_gist_consistent_2d (internal, geometry, int4),\r
        FUNCTION        2        geometry_gist_union_2d (bytea, internal),\r
        FUNCTION        3        geometry_gist_compress_2d (internal),\r
        FUNCTION        4        geometry_gist_decompress_2d (internal),\r
        FUNCTION        5        geometry_gist_penalty_2d (internal, internal, internal),\r
        FUNCTION        6        geometry_gist_picksplit_2d (internal, internal),\r
-       FUNCTION        7        geometry_gist_same_2d (geometry, geometry, internal),\r
-    FUNCTION        8        geometry_gist_boxdistance_2d (internal, geometry, int4);\r
-\r
+       FUNCTION        7        geometry_gist_same_2d (geometry, geometry, internal);\r
 #else\r
 \r
 -------------------------------------------------------------------\r