From a696b8a250cd9a206056bdcc56c66d82b4516673 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Wed, 10 Aug 2016 02:46:53 +0000 Subject: [PATCH] Remove search path on functions (slows down some functions) and no longer needed now we schema qualify all calls closes #3611 git-svn-id: http://svn.osgeo.org/postgis/trunk@15043 b70326c6-7e19-0410-871a-916f4a2858ee --- extensions/postgis/Makefile.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in index dbc207d9c..3a490b6fb 100644 --- a/extensions/postgis/Makefile.in +++ b/extensions/postgis/Makefile.in @@ -37,7 +37,7 @@ ifeq ($(PG91),yes) all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade -sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_proc_set_search_path.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/spatial_ref_sys_config_dump.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql +sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/spatial_ref_sys_config_dump.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql mkdir -p sql echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@ cat $^ >> $@ @@ -70,10 +70,7 @@ sql_bits/postgis.sql: ../../postgis/postgis_for_extension.sql sql_bits/postgis_comments.sql: ../../doc/postgis_comments.sql cp $< $@ - -sql_bits/postgis_proc_set_search_path.sql: ../../postgis/postgis_proc_set_search_path.sql - cp $< $@ - + #strip BEGIN/COMMIT since these are not allowed in extensions sql_bits/rtpostgis.sql: ../../raster/rt_pg/rtpostgis_for_extension.sql mkdir -p sql_bits @@ -96,7 +93,7 @@ sql_bits/raster_comments.sql: ../../doc/raster_comments.sql cp $< $@ #postgis_extension_upgrade_minor.sql is the one that contains both postgis AND raster -sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/postgis_proc_set_search_path.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql +sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@ cat $^ >> $@ -- 2.40.0