From f2b7e323af814185dd6df7f0cf7525a89995ea98 Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Mon, 29 Sep 2014 16:32:37 +0000 Subject: [PATCH] #2943, replace && with ~ and @ in places it makes sense for wrapper functions git-svn-id: http://svn.osgeo.org/postgis/trunk@13007 b70326c6-7e19-0410-871a-916f4a2858ee --- postgis/postgis.sql.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in index c882dd7f0..1a31b7493 100644 --- a/postgis/postgis.sql.in +++ b/postgis/postgis.sql.in @@ -3575,7 +3575,7 @@ CREATE OR REPLACE FUNCTION _ST_Contains(geom1 geometry, geom2 geometry) -- Inlines index magic CREATE OR REPLACE FUNCTION ST_Contains(geom1 geometry, geom2 geometry) RETURNS boolean - AS 'SELECT $1 && $2 AND _ST_Contains($1,$2)' + AS 'SELECT $1 ~ $2 AND _ST_Contains($1,$2)' LANGUAGE 'sql' IMMUTABLE; -- Availability: 1.2.2 @@ -3588,7 +3588,7 @@ CREATE OR REPLACE FUNCTION _ST_CoveredBy(geom1 geometry, geom2 geometry) -- Availability: 1.2.2 CREATE OR REPLACE FUNCTION ST_CoveredBy(geom1 geometry, geom2 geometry) RETURNS boolean - AS 'SELECT $1 && $2 AND _ST_CoveredBy($1,$2)' + AS 'SELECT $1 @ $2 AND _ST_CoveredBy($1,$2)' LANGUAGE 'sql' IMMUTABLE; -- Availability: 1.2.2 @@ -3602,7 +3602,7 @@ CREATE OR REPLACE FUNCTION _ST_Covers(geom1 geometry, geom2 geometry) -- Inlines index magic CREATE OR REPLACE FUNCTION ST_Covers(geom1 geometry, geom2 geometry) RETURNS boolean - AS 'SELECT $1 && $2 AND _ST_Covers($1,$2)' + AS 'SELECT $1 ~ $2 AND _ST_Covers($1,$2)' LANGUAGE 'sql' IMMUTABLE; -- Availability: 1.4.0 @@ -3616,7 +3616,7 @@ CREATE OR REPLACE FUNCTION _ST_ContainsProperly(geom1 geometry, geom2 geometry) -- Inlines index magic CREATE OR REPLACE FUNCTION ST_ContainsProperly(geom1 geometry, geom2 geometry) RETURNS boolean - AS 'SELECT $1 && $2 AND _ST_ContainsProperly($1,$2)' + AS 'SELECT $1 ~ $2 AND _ST_ContainsProperly($1,$2)' LANGUAGE 'sql' IMMUTABLE; -- PostGIS equivalent function: overlaps(geom1 geometry, geom2 geometry) @@ -3636,7 +3636,7 @@ CREATE OR REPLACE FUNCTION _ST_Within(geom1 geometry, geom2 geometry) -- Inlines index magic CREATE OR REPLACE FUNCTION ST_Within(geom1 geometry, geom2 geometry) RETURNS boolean - AS 'SELECT $1 && $2 AND _ST_Contains($2,$1)' + AS 'SELECT $2 ~ $1 AND _ST_Contains($2,$1)' LANGUAGE 'sql' IMMUTABLE; -- Availability: 1.2.2 -- 2.50.1