[postgis-tickets] r17946 - Reverts r17926

[Raul]

Author: algunenano
Date: 2019-10-17 11:07:13 -0700 (Thu, 17 Oct 2019)
New Revision: 17946

Modified:
   branches/3.0/NEWS
   branches/3.0/postgis/Makefile.in
   branches/3.0/postgis/postgis.sql.in
   branches/3.0/raster/rt_pg/Makefile.in
   branches/3.0/raster/rt_pg/rtpostgis.sql.in
Log:
Reverts r17926

References #4546


Modified: branches/3.0/NEWS
===================================================================
--- branches/3.0/NEWS	2019-10-17 18:05:33 UTC (rev 17945)
+++ branches/3.0/NEWS	2019-10-17 18:07:13 UTC (rev 17946)
@@ -11,7 +11,6 @@
   - #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

Modified: branches/3.0/postgis/Makefile.in
===================================================================
--- branches/3.0/postgis/Makefile.in	2019-10-17 18:05:33 UTC (rev 17945)
+++ branches/3.0/postgis/Makefile.in	2019-10-17 18:07:13 UTC (rev 17946)
@@ -235,7 +235,7 @@
 # replace @extschema at . 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;s'SET search_path = @extschema@''g;" > $@
+	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@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

Modified: branches/3.0/postgis/postgis.sql.in
===================================================================
--- branches/3.0/postgis/postgis.sql.in	2019-10-17 18:05:33 UTC (rev 17945)
+++ branches/3.0/postgis/postgis.sql.in	2019-10-17 18:07:13 UTC (rev 17946)
@@ -5570,7 +5570,7 @@
 
 	geom := @extschema at .ST_BuildArea(mline);
 
-	IF @extschema at .GeometryType(geom) != 'POLYGON'
+	IF GeometryType(geom) != 'POLYGON'
 	THEN
 		RAISE EXCEPTION 'Input returns more then a single polygon, try using BdMPolyFromText instead';
 	END IF;
@@ -5578,8 +5578,7 @@
 	RETURN geom;
 END;
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL
-SET search_path = @extschema@;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL;
 
 --
 -- SFSQL 1.1
@@ -5616,8 +5615,7 @@
 	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"
@@ -6072,8 +6070,7 @@
 
 	END;
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL _COST_HIGH
-SET search_path = @extschema@;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL _COST_HIGH;
 
 -- Availability: 2.0.0
 -- Changed: 2.5.0
@@ -6235,8 +6232,7 @@
             RETURN var_resultgeom;
 	END;
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL _COST_HIGH
-SET search_path = @extschema@;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL _COST_HIGH;
 -- ST_ConcaveHull and Helper functions end here --
 
 -----------------------------------------------------------------------

Modified: branches/3.0/raster/rt_pg/Makefile.in
===================================================================
--- branches/3.0/raster/rt_pg/Makefile.in	2019-10-17 18:05:33 UTC (rev 17945)
+++ branches/3.0/raster/rt_pg/Makefile.in	2019-10-17 18:07:13 UTC (rev 17946)
@@ -114,7 +114,7 @@
 # replace @extschema at . 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;s'SET search_path = @extschema@''g;" > $@
+	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@extschema@\.''g" > $@
 
 ../../liblwgeom/.libs/liblwgeom.a:
 	$(MAKE) -C ../../liblwgeom

Modified: branches/3.0/raster/rt_pg/rtpostgis.sql.in
===================================================================
--- branches/3.0/raster/rt_pg/rtpostgis.sql.in	2019-10-17 18:05:33 UTC (rev 17945)
+++ branches/3.0/raster/rt_pg/rtpostgis.sql.in	2019-10-17 18:07:13 UTC (rev 17946)
@@ -2410,8 +2410,7 @@
 
 		RETURN @extschema at ._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
-	SET search_path = @extschema@;
+	$$ LANGUAGE 'plpgsql' IMMUTABLE _PARALLEL;
 
 CREATE OR REPLACE FUNCTION st_asraster(
 	geom geometry,
@@ -7736,8 +7735,7 @@
 		RETURN  @extschema at ._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
@@ -9099,8 +9097,7 @@
 
   RETURN;
 END;
-$$ LANGUAGE 'plpgsql' STABLE STRICT
-SET search_path = @extschema@;
+$$ LANGUAGE 'plpgsql' STABLE STRICT;
 
 ------------------------------------------------------------------------------
 -- ST_CreateOverview