@ operator not schema qualified and ~ not schema qualified in some places

apply patch with adjustments. Patch provided by Shane StClair (Axiom Data Science)
References #3750 for trunk PostGIS 2.4.0

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

diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 4f58b0b8c28bf723ef674d60acbdff0f6c87da9a..015643a09dcfa2de2a0a9e6626765fe64aee0e79 100644 (file)
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -4094,7 +4094,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 @extschema@._ST_CoveredBy($1,$2)'
+       AS 'SELECT $1 OPERATOR(@extschema@.@) $2 AND @extschema@._ST_CoveredBy($1,$2)'
        LANGUAGE 'sql' IMMUTABLE _PARALLEL;
 
 -- Availability: 1.2.2

diff --git a/raster/rt_pg/rtpostgis.sql.in b/raster/rt_pg/rtpostgis.sql.in
index 58b52747e0538b2b329b7b8120ef2978cdb0f09d..4007ce356ee43c71a4110e11ae744d6edb9f0432 100644 (file)
--- a/raster/rt_pg/rtpostgis.sql.in
+++ b/raster/rt_pg/rtpostgis.sql.in
@@ -5718,7 +5718,7 @@ CREATE OR REPLACE FUNCTION raster_same(raster, raster)
 
 CREATE OR REPLACE FUNCTION raster_contained(raster, raster)
     RETURNS bool
-    AS 'select $1::geometry @ $2::geometry'
+    AS 'select $1::geometry OPERATOR(@extschema@.@) $2::geometry'
     LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
 
 CREATE OR REPLACE FUNCTION raster_contain(raster, raster)
@@ -5742,7 +5742,7 @@ CREATE OR REPLACE FUNCTION raster_geometry_contain(raster, geometry)
 -- Availability: 2.0.5
 CREATE OR REPLACE FUNCTION raster_contained_by_geometry(raster, geometry)
     RETURNS bool
-    AS 'select $1::geometry @ $2'
+    AS 'select $1::geometry OPERATOR(@extschema@.@) $2'
     LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
 
 -- Availability: 2.0.0
@@ -5756,13 +5756,13 @@ CREATE OR REPLACE FUNCTION raster_geometry_overlap(raster, geometry)
 -- Availability: 2.0.0
 CREATE OR REPLACE FUNCTION geometry_raster_contain(geometry, raster)
     RETURNS bool
-    AS 'select $1 ~ $2::geometry'
+    AS 'select $1 OPERATOR(@extschema@.~) $2::geometry'
     LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
 
 -- Availability: 2.0.5
 CREATE OR REPLACE FUNCTION geometry_contained_by_raster(geometry, raster)
     RETURNS bool
-    AS 'select $1 @ $2::geometry'
+    AS 'select $1 OPERATOR(@extschema@.@) $2::geometry'
     LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
 
 -- Availability: 2.0.0