Add composite-type attributes to information_schema.element_types view

diff --git a/doc/src/sgml/information_schema.sgml b/doc/src/sgml/information_schema.sgml
index ab9ce2aa4a81c32a52c723293fba13a36322f466..396d3e76365f690e7c48178ecb719036cf02b45a 100644 (file)
--- a/doc/src/sgml/information_schema.sgml
+++ b/doc/src/sgml/information_schema.sgml
@@ -2147,7 +2147,7 @@
 
   
    The view element_types contains the data type
-   descriptors of the elements of arrays.  When a table column,
+   descriptors of the elements of arrays.  When a table column, composite-type attribute,
    domain, function parameter, or function return value is defined to
    be of an array type, the respective information schema view only
    contains ARRAY in the column
@@ -2212,9 +2212,11 @@ ORDER BY c.ordinal_position;
       
        The type of the object that uses the array being described: one
        of TABLE (the array is used by a column of
-       that table), DOMAIN (the array is used by
-       that domain), ROUTINE (the array is used by
-       a parameter or the return data type of that function).
+       that table), USER-DEFINED TYPE (the array is
+       used by an attribute of that composite type),
+       DOMAIN (the array is used by that domain),
+       ROUTINE (the array is used by a parameter or
+       the return data type of that function).
       
      
 

diff --git a/src/backend/catalog/information_schema.sql b/src/backend/catalog/information_schema.sql
index 9334c7654d1c64457b0343beec22bb11aec17070..c7ccea333103a806b293f83b210255be5cfe12f9 100644 (file)
--- a/src/backend/catalog/information_schema.sql
+++ b/src/backend/catalog/information_schema.sql
@@ -2467,12 +2467,13 @@ CREATE VIEW element_types AS
 
     FROM pg_namespace n, pg_type at, pg_namespace nbt, pg_type bt,
          (
-           /* columns */
+           /* columns, attributes */
            SELECT c.relnamespace, CAST(c.relname AS sql_identifier),
-                  'TABLE'::text, a.attnum, a.atttypid
+                  CASE WHEN c.relkind = 'c' THEN 'USER-DEFINED TYPE'::text ELSE 'TABLE'::text END,
+                  a.attnum, a.atttypid
            FROM pg_class c, pg_attribute a
            WHERE c.oid = a.attrelid
-                 AND c.relkind IN ('r', 'v', 'f')
+                 AND c.relkind IN ('r', 'v', 'f', 'c')
                  AND attnum > 0 AND NOT attisdropped
 
            UNION ALL