Prevent a rowtype from being included in itself via a range.

We probably should have thought of this case when ranges were added,
but we didn't.  (It's not the fault of commit eb51af71f, because
ranges didn't exist then.)

It's an old bug, so back-patch to all supported branches.

Discussion: https://postgr.es/m/7782.1577051475@sss.pgh.pa.us

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 8404904710929e785ce7ff9ffbda26350088d569..ce5a5d741debabc1ff8ff73c031b8f037450bc22 100644 (file)
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -655,6 +655,15 @@ CheckAttributeType(const char *attname,
 
                containing_rowtypes = list_delete_last(containing_rowtypes);
        }
+       else if (att_typtype == TYPTYPE_RANGE)
+       {
+               /*
+                * If it's a range, recurse to check its subtype.
+                */
+               CheckAttributeType(attname, get_range_subtype(atttypid), attcollation,
+                                                  containing_rowtypes,
+                                                  flags);
+       }
        else if (OidIsValid((att_typelem = get_element_type(atttypid))))
        {
                /*

diff --git a/src/test/regress/expected/rangetypes.out b/src/test/regress/expected/rangetypes.out
index 6fd16bddd18c048cfd6d204f5fe49f0c9205afff..5ed6ae47ec3c632be10044bba1f9666578de921f 100644 (file)
--- a/src/test/regress/expected/rangetypes.out
+++ b/src/test/regress/expected/rangetypes.out
@@ -1375,6 +1375,9 @@ select *, row_to_json(upper(t)) as u from
  ["(5,6)","(7,8)") | {"a":7,"b":8}
 (2 rows)
 
+-- this must be rejected to avoid self-inclusion issues:
+alter type two_ints add attribute c two_ints_range;
+ERROR:  composite type two_ints cannot be made a member of itself
 drop type two_ints cascade;
 NOTICE:  drop cascades to type two_ints_range
 --

diff --git a/src/test/regress/sql/rangetypes.sql b/src/test/regress/sql/rangetypes.sql
index 8960add976f4d70c22c314b1cb27417c363d9370..2d0ec8964e6768870d2e154176622c8a41cf0f0d 100644 (file)
--- a/src/test/regress/sql/rangetypes.sql
+++ b/src/test/regress/sql/rangetypes.sql
@@ -463,6 +463,9 @@ select *, row_to_json(upper(t)) as u from
   (values (two_ints_range(row(1,2), row(3,4))),
           (two_ints_range(row(5,6), row(7,8)))) v(t);
 
+-- this must be rejected to avoid self-inclusion issues:
+alter type two_ints add attribute c two_ints_range;
+
 drop type two_ints cascade;
 
 --