From acc47bf461b3bb48ced114185d0689df384751bb Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 9 Oct 2013 06:36:48 +0000 Subject: [PATCH] Put postgis_topology_scripts_installed() in topology schema (#2502) This was the only topology signature installed in the default schema. The postgis_full_version() function is updated to find it there. git-svn-id: http://svn.osgeo.org/postgis/trunk@12012 b70326c6-7e19-0410-871a-916f4a2858ee --- postgis/postgis.sql.in | 4 ++-- topology/topology.sql.in | 2 +- topology/topology_drop_before.sql.in | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in index e2f304ac4..6caa6c19a 100644 --- a/postgis/postgis.sql.in +++ b/postgis/postgis.sql.in @@ -2590,9 +2590,9 @@ BEGIN SELECT postgis_scripts_released() INTO relproc; select postgis_svn_version() INTO svnver; BEGIN - SELECT postgis_topology_scripts_installed() INTO topo_scr_ver; + SELECT topology.postgis_topology_scripts_installed() INTO topo_scr_ver; EXCEPTION - WHEN undefined_function THEN + WHEN undefined_function OR invalid_schema_name THEN topo_scr_ver := NULL; RAISE NOTICE 'Function postgis_topology_scripts_installed() not found. Is topology support enabled and topology.sql installed?'; END; diff --git a/topology/topology.sql.in b/topology/topology.sql.in index ca351a743..9deadf223 100644 --- a/topology/topology.sql.in +++ b/topology/topology.sql.in @@ -2003,7 +2003,7 @@ LANGUAGE 'plpgsql' VOLATILE STRICT; --general management -- #include "sql/manage/ManageHelper.sql.in" -CREATE OR REPLACE FUNCTION postgis_topology_scripts_installed() RETURNS text +CREATE OR REPLACE FUNCTION topology.postgis_topology_scripts_installed() RETURNS text AS _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION LANGUAGE 'sql' IMMUTABLE; diff --git a/topology/topology_drop_before.sql.in b/topology/topology_drop_before.sql.in index 2a4d24ff9..f1e79313f 100644 --- a/topology/topology_drop_before.sql.in +++ b/topology/topology_drop_before.sql.in @@ -15,3 +15,6 @@ -- I don't think too many people installed the bad name DROP FUNCTION IF EXISTS topology.toTopoGeom(Geometry, varchar, int, float8); +-- used to be in public, will now be moved to topology +DROP FUNCTION IF EXISTS postgis_topology_scripts_installed(); + -- 2.40.0