[postgis-tickets] r17314 - Schema qualify all geometry casts in raster code, otherwise materialized views do not resture
Regina Obe
lr at pcorp.us
Sat Mar 9 10:37:56 PST 2019
Author: robe
Date: 2019-03-09 10:37:56 -0800 (Sat, 09 Mar 2019)
New Revision: 17314
Modified:
trunk/raster/rt_pg/rtpostgis.sql.in
Log:
Schema qualify all geometry casts in raster code, otherwise materialized views do not resture
References #4291 for PostGIS 3.0.0
Modified: trunk/raster/rt_pg/rtpostgis.sql.in
===================================================================
--- trunk/raster/rt_pg/rtpostgis.sql.in 2019-03-09 06:54:12 UTC (rev 17313)
+++ trunk/raster/rt_pg/rtpostgis.sql.in 2019-03-09 18:37:56 UTC (rev 17314)
@@ -5968,52 +5968,52 @@
CREATE OR REPLACE FUNCTION raster_left(raster, raster)
RETURNS bool
- AS 'select $1::geometry << $2::geometry'
+ AS 'select $1::@extschema at .geometry << $2::@extschema at .geometry'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
CREATE OR REPLACE FUNCTION raster_right(raster, raster)
RETURNS bool
- AS 'select $1::geometry >> $2::geometry'
+ AS 'select $1::@extschema at .geometry >> $2::@extschema at .geometry'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
CREATE OR REPLACE FUNCTION raster_overabove(raster, raster)
RETURNS bool
- AS 'select $1::geometry |&> $2::geometry'
+ AS 'select $1::@extschema at .geometry |&> $2::@extschema at .geometry'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
CREATE OR REPLACE FUNCTION raster_overbelow(raster, raster)
RETURNS bool
- AS 'select $1::geometry &<| $2::geometry'
+ AS 'select $1::@extschema at .geometry &<| $2::@extschema at .geometry'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
CREATE OR REPLACE FUNCTION raster_above(raster, raster)
RETURNS bool
- AS 'select $1::geometry |>> $2::geometry'
+ AS 'select $1::@extschema at .geometry |>> $2::@extschema at .geometry'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
CREATE OR REPLACE FUNCTION raster_below(raster, raster)
RETURNS bool
- AS 'select $1::geometry <<| $2::geometry'
+ AS 'select $1::@extschema at .geometry <<| $2::@extschema at .geometry'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
CREATE OR REPLACE FUNCTION raster_same(raster, raster)
RETURNS bool
- AS 'select $1::geometry ~= $2::geometry'
+ AS 'select $1::@extschema at .geometry ~= $2::@extschema at .geometry'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
CREATE OR REPLACE FUNCTION raster_contained(raster, raster)
RETURNS bool
- AS 'select $1::geometry OPERATOR(@extschema at .@) $2::geometry'
+ AS 'select $1::@extschema at .geometry OPERATOR(@extschema at .@) $2::@extschema at .geometry'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
CREATE OR REPLACE FUNCTION raster_contain(raster, raster)
RETURNS bool
- AS 'select $1::geometry ~ $2::geometry'
+ AS 'select $1::@extschema at .geometry ~ $2::@extschema at .geometry'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
CREATE OR REPLACE FUNCTION raster_overlap(raster, raster)
RETURNS bool
- AS 'select $1::geometry OPERATOR(@extschema at .&&) $2::geometry'
+ AS 'select $1::@extschema at .geometry OPERATOR(@extschema at .&&) $2::@extschema at .geometry'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
-- raster/geometry functions
@@ -6021,19 +6021,19 @@
-- Availability: 2.0.0
CREATE OR REPLACE FUNCTION raster_geometry_contain(raster, geometry)
RETURNS bool
- AS 'select $1::geometry ~ $2'
+ AS 'select $1::@extschema at .geometry ~ $2'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
-- Availability: 2.0.5
CREATE OR REPLACE FUNCTION raster_contained_by_geometry(raster, geometry)
RETURNS bool
- AS 'select $1::geometry OPERATOR(@extschema at .@) $2'
+ AS 'select $1::@extschema at .geometry OPERATOR(@extschema at .@) $2'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
-- Availability: 2.0.0
CREATE OR REPLACE FUNCTION raster_geometry_overlap(raster, geometry)
RETURNS bool
- AS 'select $1::geometry OPERATOR(@extschema at .&&) $2'
+ AS 'select $1::@extschema at .geometry OPERATOR(@extschema at .&&) $2'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
-- geometry/raster functions
@@ -6041,19 +6041,19 @@
-- Availability: 2.0.0
CREATE OR REPLACE FUNCTION geometry_raster_contain(geometry, raster)
RETURNS bool
- AS 'select $1 OPERATOR(@extschema at .~) $2::geometry'
+ AS 'select $1 OPERATOR(@extschema at .~) $2::@extschema at .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 OPERATOR(@extschema at .@) $2::geometry'
+ AS 'select $1 OPERATOR(@extschema at .@) $2::@extschema at .geometry'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
-- Availability: 2.0.0
CREATE OR REPLACE FUNCTION geometry_raster_overlap(geometry, raster)
RETURNS bool
- AS 'select $1 OPERATOR(@extschema at .&&) $2::geometry'
+ AS 'select $1 OPERATOR(@extschema at .&&) $2::@extschema at .geometry'
LANGUAGE 'sql' IMMUTABLE STRICT _PARALLEL;
------------------------------------------------------------------------------
@@ -6443,7 +6443,7 @@
-- This function can not be STRICT
CREATE OR REPLACE FUNCTION st_intersects(geom geometry, rast raster, nband integer DEFAULT NULL)
RETURNS boolean AS
- $$ SELECT $1 OPERATOR(@extschema at .&&) $2::geometry AND @extschema at ._st_intersects($1, $2, $3); $$
+ $$ SELECT $1 OPERATOR(@extschema at .&&) $2::@extschema at .geometry AND @extschema at ._st_intersects($1, $2, $3); $$
LANGUAGE 'sql' IMMUTABLE _PARALLEL
COST 1000;
@@ -6453,13 +6453,13 @@
CREATE OR REPLACE FUNCTION st_intersects(rast raster, geom geometry, nband integer DEFAULT NULL)
RETURNS boolean
- AS $$ SELECT $1::geometry OPERATOR(@extschema at .&&) $2 AND @extschema at ._st_intersects($2, $1, $3) $$
+ AS $$ SELECT $1::@extschema at .geometry OPERATOR(@extschema at .&&) $2 AND @extschema at ._st_intersects($2, $1, $3) $$
LANGUAGE 'sql' IMMUTABLE _PARALLEL
COST 1000;
CREATE OR REPLACE FUNCTION st_intersects(rast raster, nband integer, geom geometry)
RETURNS boolean
- AS $$ SELECT $1::geometry OPERATOR(@extschema at .&&) $3 AND @extschema at ._st_intersects($3, $1, $2) $$
+ AS $$ SELECT $1::@extschema at .geometry OPERATOR(@extschema at .&&) $3 AND @extschema at ._st_intersects($3, $1, $2) $$
LANGUAGE 'sql' IMMUTABLE _PARALLEL
COST 1000;
@@ -6629,7 +6629,7 @@
CREATE OR REPLACE FUNCTION ST_DWithin(rast1 raster, nband1 integer, rast2 raster, nband2 integer, distance double precision)
RETURNS boolean
- AS $$ SELECT $1::geometry OPERATOR(@extschema at .&&) ST_Expand(ST_ConvexHull($3), $5) AND $3::geometry OPERATOR(@extschema at .&&) ST_Expand(ST_ConvexHull($1), $5) AND CASE WHEN $2 IS NULL OR $4 IS NULL THEN @extschema at ._ST_dwithin(st_convexhull($1), st_convexhull($3), $5) ELSE @extschema at ._ST_dwithin($1, $2, $3, $4, $5) END $$
+ AS $$ SELECT $1::@extschema at .geometry OPERATOR(@extschema at .&&) ST_Expand(ST_ConvexHull($3), $5) AND $3::geometry OPERATOR(@extschema at .&&) ST_Expand(ST_ConvexHull($1), $5) AND CASE WHEN $2 IS NULL OR $4 IS NULL THEN @extschema at ._ST_dwithin(st_convexhull($1), st_convexhull($3), $5) ELSE @extschema at ._ST_dwithin($1, $2, $3, $4, $5) END $$
LANGUAGE 'sql' IMMUTABLE _PARALLEL
COST 1000;
@@ -6651,7 +6651,7 @@
CREATE OR REPLACE FUNCTION ST_DFullyWithin(rast1 raster, nband1 integer, rast2 raster, nband2 integer, distance double precision)
RETURNS boolean
- AS $$ SELECT $1::geometry OPERATOR(@extschema at .&&) @extschema at .ST_Expand(@extschema at .ST_ConvexHull($3), $5) AND $3::geometry OPERATOR(@extschema at .&&) @extschema at .ST_Expand(@extschema at .ST_ConvexHull($1), $5) AND CASE WHEN $2 IS NULL OR $4 IS NULL THEN @extschema at ._ST_DFullyWithin(@extschema at .ST_ConvexHull($1), @extschema at .ST_Convexhull($3), $5) ELSE @extschema at ._ST_DFullyWithin($1, $2, $3, $4, $5) END $$
+ AS $$ SELECT $1::@extschema at .geometry OPERATOR(@extschema at .&&) @extschema at .ST_Expand(@extschema at .ST_ConvexHull($3), $5) AND $3::geometry OPERATOR(@extschema at .&&) @extschema at .ST_Expand(@extschema at .ST_ConvexHull($1), $5) AND CASE WHEN $2 IS NULL OR $4 IS NULL THEN @extschema at ._ST_DFullyWithin(@extschema at .ST_ConvexHull($1), @extschema at .ST_Convexhull($3), $5) ELSE @extschema at ._ST_DFullyWithin($1, $2, $3, $4, $5) END $$
LANGUAGE 'sql' IMMUTABLE _PARALLEL
COST 1000;
More information about the postgis-tickets
mailing list