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 b437bf5920ff5c5f62af775a6dffdcdaa8041211..d0df5c4e20fc3ced61d1744688e4016fe28750a4 100644 (file)
--- 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
 $$\r
 LANGUAGE 'sql' STABLE STRICT;\r
 \r
--- support function to pull out geometry type from constraint check\r
--- will return pretty name instead of ugly name\r
-CREATE OR REPLACE FUNCTION postgis_constraint_type(geomschema text, geomtable text, geomcolumn text) RETURNS varchar AS\r
+CREATE OR REPLACE FUNCTION postgis_constraint_dims(geomschema text, geomtable text, geomcolumn text) RETURNS integer AS\r
 $$\r
-SELECT  postgis_type_name(replace(split_part(s.consrc, '''', 2), ')', '')::varchar\r
-               , postgis_constraint_dims($1,$2,$3), true )\r
+SELECT  replace(split_part(s.consrc, ' = ', 2), ')', '')::integer\r
                 FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s\r
                 WHERE n.nspname = $1\r
                 AND c.relname = $2\r
@@ -4895,13 +4892,16 @@ SELECT  postgis_type_name(replace(split_part(s.consrc, '''', 2), ')', '')::varch
                 AND s.connamespace = n.oid\r
                 AND s.conrelid = c.oid\r
                 AND a.attnum = ANY (s.conkey)\r
-                AND s.consrc LIKE '%geometrytype(% = %';\r
+                AND s.consrc LIKE '%ndims(% = %';\r
 $$\r
 LANGUAGE 'sql' STABLE STRICT;\r
 \r
-CREATE OR REPLACE FUNCTION postgis_constraint_dims(geomschema text, geomtable text, geomcolumn text) RETURNS integer AS\r
+-- support function to pull out geometry type from constraint check\r
+-- will return pretty name instead of ugly name\r
+CREATE OR REPLACE FUNCTION postgis_constraint_type(geomschema text, geomtable text, geomcolumn text) RETURNS varchar AS\r
 $$\r
-SELECT  replace(split_part(s.consrc, ' = ', 2), ')', '')::integer\r
+SELECT  postgis_type_name(replace(split_part(s.consrc, '''', 2), ')', '')::varchar\r
+               , postgis_constraint_dims($1,$2,$3), true )\r
                 FROM pg_class c, pg_namespace n, pg_attribute a, pg_constraint s\r
                 WHERE n.nspname = $1\r
                 AND c.relname = $2\r
@@ -4910,11 +4910,10 @@ SELECT  replace(split_part(s.consrc, ' = ', 2), ')', '')::integer
                 AND s.connamespace = n.oid\r
                 AND s.conrelid = c.oid\r
                 AND a.attnum = ANY (s.conkey)\r
-                AND s.consrc LIKE '%ndims(% = %';\r
+                AND s.consrc LIKE '%geometrytype(% = %';\r
 $$\r
 LANGUAGE 'sql' STABLE STRICT;\r
 \r
-\r
 CREATE OR REPLACE VIEW geometry_columns_v AS \r
  SELECT current_database()::varchar(256) AS f_table_catalog, \r
     n.nspname::varchar(256) AS f_table_schema, \r