From 45f93316e10cc271cfcc9b3c7b587b3433d306f5 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 18:09:19 +0000
Subject: [PATCH] Revert r17929

References #4546


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

diff --git a/NEWS b/NEWS
index 38b563fe2..286a834ee 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,6 @@ XXXX/XX/XX
   - #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)
   - #4547, Fix AddRasterConstraints handling of empty tables (Sandro Santilli)
 
 PostGIS 2.3.10
diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index 8daba6c34..3b6cf5eb3 100644
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -175,7 +175,7 @@ $(PG_OBJS): ../liblwgeom/.libs/liblwgeom.a ../libpgcommon/libpgcommon.a ../postg
 # 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;s'SET search_path = @extschema@''g;" > $@
+	$(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g;s'@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 1db37937c..bebb96679 100644
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -5132,7 +5132,7 @@ BEGIN
 
 	geom := @extschema@.ST_BuildArea(mline);
 
-	IF @extschema@.GeometryType(geom) != 'POLYGON'
+	IF GeometryType(geom) != 'POLYGON'
 	THEN
 		RAISE EXCEPTION 'Input returns more then a single polygon, try using BdMPolyFromText instead';
 	END IF;
@@ -5140,8 +5140,7 @@ BEGIN
 	RETURN geom;
 END;
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL
-SET search_path = @extschema@;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL;
 
 --
 -- SFSQL 1.1
@@ -5178,8 +5177,7 @@ BEGIN
 	RETURN geom;
 END;
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL
-SET search_path = @extschema@;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL;
 
 /* Should we include the .sql directly here ? */
 #include "long_xact.sql.in"
@@ -5678,8 +5676,7 @@ $$
 
 	END;
 $$
-  LANGUAGE plpgsql IMMUTABLE STRICT _PARALLEL
-  SET search_path = @extschema@;
+  LANGUAGE plpgsql IMMUTABLE STRICT _PARALLEL;
 
 CREATE OR REPLACE FUNCTION ST_ConcaveHull(param_geom geometry, param_pctconvex float, param_allow_holes boolean DEFAULT false) RETURNS geometry AS
 $$
@@ -5834,7 +5831,6 @@ $$
 	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 4bed9f037..ed54859dd 100644
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -102,7 +102,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;s'SET search_path = @extschema@''g;" > $@
+	$(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/rtpostgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g;s'@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 f7c07332c..51449a9e3 100644
--- a/raster/rt_pg/rtpostgis.sql.in
+++ b/raster/rt_pg/rtpostgis.sql.in
@@ -2341,8 +2341,7 @@ 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' STABLE
-	SET search_path = @extschema@;
+	$$ LANGUAGE 'plpgsql' STABLE;
 
 CREATE OR REPLACE FUNCTION st_asraster(
 	geom geometry,
@@ -7396,8 +7395,7 @@ 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
-	SET search_path = @extschema@;
+	COST 100;
 
 CREATE OR REPLACE FUNCTION _drop_raster_constraint_coverage_tile(rastschema name, rasttable name, rastcolumn name)
 	RETURNS boolean AS
@@ -8747,8 +8745,7 @@ BEGIN
 
   RETURN;
 END;
-$$ LANGUAGE 'plpgsql' STABLE STRICT
-SET search_path = @extschema@;
+$$ LANGUAGE 'plpgsql' STABLE STRICT;
 
 ------------------------------------------------------------------------------
 -- ST_CreateOverview
-- 
2.49.0