Fix ST_ConcaveHull under FDW

References #4546

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

diff --git a/NEWS b/NEWS
index 21dcc84ec050a8df06ee6c7ae263ed42c195377d..49e3bdf3a291aa8faa7ea73025f3413629b863dc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ PostGIS 2.5.4
   - #4534, Fix leak in lwcurvepoly_from_wkb_state (Raúl Marín)
   - #4536, Fix leak in lwcollection_from_wkb_state (Raúl Marín)
   - #4537, Fix leak in WKT collection parser (Raúl Marín)
+  - #4546, Fix ST_ConcaveHull under FDW (Raúl Marín)
 
 
 PostGIS 2.5.3

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index fed3cb855a2e3a59615ab8239ddc42e861e79d22..3545c5094a8d3713ce8f94fc48d1f6e255eed3e0 100644 (file)
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -217,7 +217,7 @@ endif
 # replace @extschema@. with nothing, this is only used as placeholder for extension install
 %.sql: %.sql.in
        $(SQLPP) -I../libpgcommon $< | grep -v '^#' | \
-       $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g;s'@extschema@\.''g" > $@
+       $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g;s'@extschema@\.''g;s'SET search_path = @extschema@''g;" > $@
 
 postgis_upgrade_for_extension.sql: postgis_drop_before.sql postgis_upgrade_for_extension.sql.in postgis_drop_after.sql
        cat $^ > $@

diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 35ccb6a7ceb931bfab04bd1eab4161d1b07d649d..cbba564b5db0ca0a53b41ae67dad2cf2b28bd20d 100644 (file)
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -5370,7 +5370,7 @@ BEGIN
 
        geom := @extschema@.ST_BuildArea(mline);
 
-       IF GeometryType(geom) != 'POLYGON'
+       IF @extschema@.GeometryType(geom) != 'POLYGON'
        THEN
                RAISE EXCEPTION 'Input returns more then a single polygon, try using BdMPolyFromText instead';
        END IF;
@@ -5378,7 +5378,8 @@ BEGIN
        RETURN geom;
 END;
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL
+SET search_path = @extschema@;
 
 --
 -- SFSQL 1.1
@@ -5415,7 +5416,8 @@ BEGIN
        RETURN geom;
 END;
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL
+SET search_path = @extschema@;
 
 /* Should we include the .sql directly here ? */
 #include "long_xact.sql.in"
@@ -5927,7 +5929,8 @@ $$
 
        END;
 $$
-  LANGUAGE plpgsql IMMUTABLE STRICT _PARALLEL;
+  LANGUAGE plpgsql IMMUTABLE STRICT _PARALLEL
+  SET search_path = @extschema@;
 
 -- Availability: 2.0.0
 -- Changed: 2.5.0
@@ -6090,6 +6093,7 @@ $$
        END;
 $$
 LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL;
+SET search_path = @extschema@;
 -- ST_ConcaveHull and Helper functions end here --
 
 -----------------------------------------------------------------------

diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index 02609d8b4549db85fc412631fad8195efac1644e..fb7f2872de45d11b90997874cef315d28007ec0b 100644 (file)
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -103,7 +103,7 @@ endif
 # replace @extschema@. with nothing, this is only used as placeholder for extension install
 %.sql: %.sql.in
        $(SQLPP) -I../../postgis/ -I../../ $< | grep -v '^#' | \
-       $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/rtpostgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g;s'@extschema@\.''g" > $@
+       $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/rtpostgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g;s'@extschema@\.''g;s'SET search_path = @extschema@''g;" > $@
 
 rtpostgis_for_extension.sql: rtpostgis.sql.in
        $(SQLPP) -I../../postgis/ -I../../ $< | grep -v '^#' | \

diff --git a/raster/rt_pg/rtpostgis.sql.in b/raster/rt_pg/rtpostgis.sql.in
index 3ec8a136c37d1c2db9f63e31fd7175d77fd8cb7c..6fba9678472b2617ccff83e81df5610f51a0c683 100644 (file)
--- a/raster/rt_pg/rtpostgis.sql.in
+++ b/raster/rt_pg/rtpostgis.sql.in
@@ -2410,7 +2410,8 @@ CREATE OR REPLACE FUNCTION st_asraster(
 
                RETURN @extschema@._ST_asraster(g, scale_x, scale_y, NULL, NULL, $3, $4, $5, NULL, NULL, ul_x, ul_y, skew_x, skew_y, $6);
        END;
-       $$ LANGUAGE 'plpgsql' IMMUTABLE _PARALLEL;
+       $$ LANGUAGE 'plpgsql' IMMUTABLE _PARALLEL
+       SET search_path = @extschema@;
 
 CREATE OR REPLACE FUNCTION st_asraster(
        geom geometry,
@@ -7731,7 +7732,8 @@ CREATE OR REPLACE FUNCTION _add_raster_constraint_coverage_tile(rastschema name,
                RETURN  @extschema@._add_raster_constraint(cn, sql);
        END;
        $$ LANGUAGE 'plpgsql' VOLATILE STRICT
-       COST 100;
+       COST 100
+       SET search_path = @extschema@;
 
 CREATE OR REPLACE FUNCTION _drop_raster_constraint_coverage_tile(rastschema name, rasttable name, rastcolumn name)
        RETURNS boolean AS
@@ -9093,7 +9095,8 @@ BEGIN
 
   RETURN;
 END;
-$$ LANGUAGE 'plpgsql' STABLE STRICT;
+$$ LANGUAGE 'plpgsql' STABLE STRICT
+SET search_path = @extschema@;
 
 ------------------------------------------------------------------------------
 -- ST_CreateOverview