From 6ff47d2d8ca14a017dff95265b94f04af548a144 Mon Sep 17 00:00:00 2001 From: Bborie Park Date: Mon, 9 Jan 2012 19:02:49 +0000 Subject: [PATCH] Added conditional check to ST_Intersects(raster, int, raster, int) to deal with STRICT being set on _st_intersects(raster, int, raster, int). Fixes regression caused in r8714. git-svn-id: http://svn.osgeo.org/postgis/trunk@8728 b70326c6-7e19-0410-871a-916f4a2858ee --- raster/rt_pg/rtpostgis.sql.in.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/raster/rt_pg/rtpostgis.sql.in.c b/raster/rt_pg/rtpostgis.sql.in.c index 7ff10a57f..6b13c401a 100644 --- a/raster/rt_pg/rtpostgis.sql.in.c +++ b/raster/rt_pg/rtpostgis.sql.in.c @@ -2970,10 +2970,11 @@ CREATE OR REPLACE FUNCTION _st_intersects(rast1 raster, nband1 integer, rast2 ra CREATE OR REPLACE FUNCTION st_intersects(rast1 raster, nband1 integer, rast2 raster, nband2 integer) RETURNS boolean - AS $$ SELECT $1 && $3 AND _st_intersects($1, $2, $3, $4) $$ + AS $$ SELECT $1 && $3 AND CASE WHEN $2 IS NULL OR $4 IS NULL THEN TRUE ELSE _st_intersects($1, $2, $3, $4) END $$ LANGUAGE 'SQL' IMMUTABLE COST 1000; + CREATE OR REPLACE FUNCTION st_intersects(rast1 raster, rast2 raster) RETURNS boolean AS $$ SELECT $1 && $2 AND _st_intersects($1, 1, $2, 1) $$ -- 2.40.0