From: Regina Obe <lr@pcorp.us>
Date: Fri, 1 Jul 2011 00:02:14 +0000 (+0000)
Subject: fix build -- had functions installed out of order of dependency
X-Git-Tag: 2.0.0alpha1~1312
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a0bcd71891a4e058bf25769b7e2999777cbaacc;p=postgis

fix build -- had functions installed out of order of dependency

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

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index b437bf592..d0df5c4e2 100644
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -4881,12 +4881,9 @@ SELECT replace(replace(split_part(s.consrc, ' = ', 2), ')', ''), '(', '')::integ
 $$
 LANGUAGE 'sql' STABLE STRICT;
 
--- support function to pull out geometry type from constraint check
--- will return pretty name instead of ugly name
-CREATE OR REPLACE FUNCTION postgis_constraint_type(geomschema text, geomtable text, geomcolumn text) RETURNS varchar AS
+CREATE OR REPLACE FUNCTION postgis_constraint_dims(geomschema text, geomtable text, geomcolumn text) RETURNS integer AS
 $$
-SELECT  postgis_type_name(replace(split_part(s.consrc, '''', 2), ')', '')::varchar
-		, postgis_constraint_dims($1,$2,$3), true )
+SELECT  replace(split_part(s.consrc, ' = ', 2), ')', '')::integer
 		 FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
 		 WHERE n.nspname = $1
 		 AND c.relname = $2
@@ -4895,13 +4892,16 @@ SELECT  postgis_type_name(replace(split_part(s.consrc, '''', 2), ')', '')::varch
 		 AND s.connamespace = n.oid
 		 AND s.conrelid = c.oid
 		 AND a.attnum = ANY (s.conkey)
-		 AND s.consrc LIKE '%geometrytype(% = %';
+		 AND s.consrc LIKE '%ndims(% = %';
 $$
 LANGUAGE 'sql' STABLE STRICT;
 
-CREATE OR REPLACE FUNCTION postgis_constraint_dims(geomschema text, geomtable text, geomcolumn text) RETURNS integer AS
+-- support function to pull out geometry type from constraint check
+-- will return pretty name instead of ugly name
+CREATE OR REPLACE FUNCTION postgis_constraint_type(geomschema text, geomtable text, geomcolumn text) RETURNS varchar AS
 $$
-SELECT  replace(split_part(s.consrc, ' = ', 2), ')', '')::integer
+SELECT  postgis_type_name(replace(split_part(s.consrc, '''', 2), ')', '')::varchar
+		, postgis_constraint_dims($1,$2,$3), true )
 		 FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s
 		 WHERE n.nspname = $1
 		 AND c.relname = $2
@@ -4910,11 +4910,10 @@ SELECT  replace(split_part(s.consrc, ' = ', 2), ')', '')::integer
 		 AND s.connamespace = n.oid
 		 AND s.conrelid = c.oid
 		 AND a.attnum = ANY (s.conkey)
-		 AND s.consrc LIKE '%ndims(% = %';
+		 AND s.consrc LIKE '%geometrytype(% = %';
 $$
 LANGUAGE 'sql' STABLE STRICT;
 
-
 CREATE OR REPLACE VIEW geometry_columns_v AS 
  SELECT current_database()::varchar(256) AS f_table_catalog, 
     n.nspname::varchar(256) AS f_table_schema,