Reverts r17926

References #4546

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

diff --git a/NEWS b/NEWS
index 34473fbd56024a178b9112fab612a177a8619e6d..8f940e0ac774c7d8981a62750fabc652efad6c68 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,6 @@ 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 cbc8fd3835fcef793fc0352e1739899914e3d385..76a2c01ac0151a141f09c607e83436601da5df25 100644 (file)
--- 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;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

diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index af7feb96c56187c5309c6b0a10a4e6fd0044417a..26d82ee3087fb91a890872ab06d8a82024675a40 100644 (file)
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -5570,7 +5570,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;
@@ -5578,8 +5578,7 @@ BEGIN
        RETURN geom;
 END;
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL
-SET search_path = @extschema@;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT _PARALLEL;
 
 --
 -- SFSQL 1.1
@@ -5616,8 +5615,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"
@@ -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 --
 
 -----------------------------------------------------------------------

diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index 8f6bab71ea22666e76840cf3798ac3957b0fc972..046fbb57ec0f6553126c3a14dc846e7c4f8aa801 100644 (file)
--- 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;s'SET search_path = @extschema@''g;" > $@
+       $(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@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 7fd1b50daf9ce59f518b1a15b52a0185ba9d322a..484111d08524abc26222437157153964f72e9dfc 100644 (file)
--- a/raster/rt_pg/rtpostgis.sql.in
+++ b/raster/rt_pg/rtpostgis.sql.in
@@ -2410,8 +2410,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' IMMUTABLE _PARALLEL
-       SET search_path = @extschema@;
+       $$ LANGUAGE 'plpgsql' IMMUTABLE _PARALLEL;
 
 CREATE OR REPLACE FUNCTION st_asraster(
        geom geometry,
@@ -7736,8 +7735,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
@@ -9099,8 +9097,7 @@ BEGIN
 
   RETURN;
 END;
-$$ LANGUAGE 'plpgsql' STABLE STRICT
-SET search_path = @extschema@;
+$$ LANGUAGE 'plpgsql' STABLE STRICT;
 
 ------------------------------------------------------------------------------
 -- ST_CreateOverview