From 705469f5ddda2c803ea92ee2519b46fb1853719e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ra=C3=BAl=20Mar=C3=ADn=20Rodr=C3=ADguez?=
 <rmrodriguez@carto.com>
Date: Thu, 17 Oct 2019 10:35:55 +0000
Subject: [PATCH] Fix ST_ConcaveHull under FDW

References #4546


git-svn-id: http://svn.osgeo.org/postgis/branches/3.0@17926 b70326c6-7e19-0410-871a-916f4a2858ee
---
 NEWS                          |  1 +
 postgis/Makefile.in           |  2 +-
 postgis/postgis.sql.in        | 14 +++++++++-----
 raster/rt_pg/Makefile.in      |  2 +-
 raster/rt_pg/rtpostgis.sql.in |  9 ++++++---
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index 8f940e0ac..34473fbd5 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Additional performance enhancements if running GEOS 3.8+
   - #4536, Fix leak in lwcollection_from_wkb_state (Raúl Marín)
   - #4537, Fix leak in WKT collection parser (Raúl Marín)
   - #4535, WKB: Avoid buffer overflow (Raúl Marín)
+  - #4546, Fix ST_ConcaveHull under FDW (Raúl Marín)
 
 PostGIS 3.0.0rc1
 2019/10/08
diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index 76a2c01ac..cbc8fd383 100644
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -235,7 +235,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'\$(MODULEPATH)'g;s'@extschema@\.''g" > $@
+	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@extschema@\.''g;s'SET search_path = @extschema@''g;" > $@
 
 #this is redundant but trying to fold in with extension just hangs
 postgis_upgrade.sql.in: postgis.sql ../utils/postgis_proc_upgrade.pl
diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 26d82ee30..af7feb96c 100644
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -5570,7 +5570,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;
@@ -5578,7 +5578,8 @@ BEGIN
 	RETURN geom;
 END;
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL
+SET search_path = @extschema@;
 
 --
 -- SFSQL 1.1
@@ -5615,7 +5616,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"
@@ -6070,7 +6072,8 @@ $$
 
 	END;
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL _COST_HIGH;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL _COST_HIGH
+SET search_path = @extschema@;
 
 -- Availability: 2.0.0
 -- Changed: 2.5.0
@@ -6232,7 +6235,8 @@ $$
             RETURN var_resultgeom;
 	END;
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL _COST_HIGH;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL _COST_HIGH
+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 046fbb57e..8f6bab71e 100644
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -114,7 +114,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'\$(MODULEPATH)'g;s'@extschema@\.''g" > $@
+	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@extschema@\.''g;s'SET search_path = @extschema@''g;" > $@
 
 ../../liblwgeom/.libs/liblwgeom.a:
 	$(MAKE) -C ../../liblwgeom
diff --git a/raster/rt_pg/rtpostgis.sql.in b/raster/rt_pg/rtpostgis.sql.in
index a8a483aeb..fbeccbbbc 100644
--- 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
-- 
2.49.0