Limit geometry_columns view definition within 80 columns.

This is to avoid issues like #1449

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

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index c6008884cf4e642974f76394bbf7417eff997cdf..2b003bdeedbd8a1c623ba5da8b7d1d839a9e8a51 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -4329,21 +4329,35 @@ $$
 LANGUAGE 'sql' STABLE STRICT;\r
 \r
 CREATE OR REPLACE VIEW geometry_columns AS \r
- SELECT current_database()::varchar(256) AS f_table_catalog, \r
+  SELECT current_database()::varchar(256) AS f_table_catalog, \r
     n.nspname::varchar(256) AS f_table_schema, \r
     c.relname::varchar(256) AS f_table_name, \r
     a.attname::varchar(256) AS f_geometry_column, \r
-    COALESCE(NULLIF(postgis_typmod_dims(a.atttypmod),2), postgis_constraint_dims(n.nspname, c.relname, a.attname), 2) AS coord_dimension, \r
-    COALESCE(NULLIF(postgis_typmod_srid(a.atttypmod),0), postgis_constraint_srid(n.nspname, c.relname, a.attname), 0) AS srid, \r
-    -- force to be uppercase with no ZM so is backwards compatible with old geometry_columns\r
-    replace(replace(COALESCE(NULLIF(upper(postgis_typmod_type(a.atttypmod)::text), 'GEOMETRY'), postgis_constraint_type(n.nspname, c.relname, a.attname), 'GEOMETRY'), 'ZM', ''),'Z', '')::varchar(30) AS type\r
-   FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n\r
+    COALESCE(NULLIF(postgis_typmod_dims(a.atttypmod),2),\r
+             postgis_constraint_dims(n.nspname, c.relname, a.attname),\r
+             2) AS coord_dimension, \r
+    COALESCE(NULLIF(postgis_typmod_srid(a.atttypmod),0),\r
+             postgis_constraint_srid(n.nspname, c.relname, a.attname),\r
+             0) AS srid, \r
+    -- force to be uppercase with no ZM so is backwards compatible\r
+    -- with old geometry_columns\r
+    replace(\r
+      replace(\r
+        COALESCE(\r
+          NULLIF(upper(postgis_typmod_type(a.atttypmod)::text), 'GEOMETRY'),\r
+          postgis_constraint_type(n.nspname, c.relname, a.attname),\r
+          'GEOMETRY'\r
+        ), 'ZM', ''\r
+      ), 'Z', ''\r
+    )::varchar(30) AS type\r
+  FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n\r
   WHERE t.typname = 'geometry'::name \r
     AND a.attisdropped = false \r
     AND a.atttypid = t.oid \r
     AND a.attrelid = c.oid \r
     AND c.relnamespace = n.oid \r
-    AND (c.relkind = 'r'::"char" OR c.relkind = 'v'::"char") AND NOT pg_is_other_temp_schema(c.relnamespace);\r
+    AND (c.relkind = 'r'::"char" OR c.relkind = 'v'::"char")\r
+    AND NOT pg_is_other_temp_schema(c.relnamespace);\r
 \r
 -- TODO: support RETURNING and raise a WARNING\r
 CREATE OR REPLACE RULE geometry_columns_insert AS\r