Fix error reporting for index expressions of prohibited types.

If CheckAttributeType() threw an error about the datatype of an
index expression column, it would report an empty column name,
which is pretty unhelpful and certainly not the intended behavior.
I (tgl) evidently broke this in commit cfc5008a5, by not noticing
that the column's attname was used above where I'd placed the
assignment of it.

In HEAD and v12, this is trivially fixable by moving up the
assignment of attname.  Before v12 the code is a bit more messy;
to avoid doing substantial refactoring, I took the lazy way out
and just put in two copies of the assignment code.

Report and patch by Amit Langote.  Back-patch to all supported
branches.

Discussion: https://postgr.es/m/CA+HiwqFA+BGyBFimjiYXXMa2Hc3fcL0+OJOyzUNjhU4NCa_XXw@mail.gmail.com

diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index e9df990962cb31e63f8b3f7f2b155f41d5da8470..6912809113d2a698e9545bf8e902b12743f71805 100644 (file)
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -343,6 +343,14 @@ ConstructTupleDescriptor(Relation heapRelation,
             */
            memcpy(to, from, ATTRIBUTE_FIXED_PART_SIZE);
 
+           /*
+            * Set the attribute name as specified by caller.
+            */
+           if (colnames_item == NULL)      /* shouldn't happen */
+               elog(ERROR, "too few entries in colnames list");
+           namestrcpy(&to->attname, (const char *) lfirst(colnames_item));
+           colnames_item = lnext(colnames_item);
+
            /*
             * Fix the stuff that should not be the same as the underlying
             * attr
@@ -364,6 +372,14 @@ ConstructTupleDescriptor(Relation heapRelation,
 
            MemSet(to, 0, ATTRIBUTE_FIXED_PART_SIZE);
 
+           /*
+            * Set the attribute name as specified by caller.
+            */
+           if (colnames_item == NULL)      /* shouldn't happen */
+               elog(ERROR, "too few entries in colnames list");
+           namestrcpy(&to->attname, (const char *) lfirst(colnames_item));
+           colnames_item = lnext(colnames_item);
+
            if (indexpr_item == NULL)   /* shouldn't happen */
                elog(ERROR, "too few entries in indexprs list");
            indexkey = (Node *) lfirst(indexpr_item);
@@ -416,14 +432,6 @@ ConstructTupleDescriptor(Relation heapRelation,
         */
        to->attrelid = InvalidOid;
 
-       /*
-        * Set the attribute name as specified by caller.
-        */
-       if (colnames_item == NULL)      /* shouldn't happen */
-           elog(ERROR, "too few entries in colnames list");
-       namestrcpy(&to->attname, (const char *) lfirst(colnames_item));
-       colnames_item = lnext(colnames_item);
-
        /*
         * Check the opclass and index AM to see if either provides a keytype
         * (overriding the attribute type).  Opclass takes precedence.

diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out
index 728cd1eabe7e41a3487d2813f653f6c84cf89fd9..18f3fffcd2b81016d48e36e00c4b140fa6359934 100644 (file)
--- a/src/test/regress/expected/create_index.out
+++ b/src/test/regress/expected/create_index.out
@@ -2256,6 +2256,23 @@ ERROR:  duplicate key value violates unique constraint "func_index_index"
 DETAIL:  Key (textcat(f1, f2))=(ABCDEF) already exists.
 -- but this shouldn't:
 INSERT INTO func_index_heap VALUES('QWERTY');
+-- while we're here, see that the metadata looks sane
+\d func_index_heap
+Table "public.func_index_heap"
+ Column | Type | Modifiers 
+--------+------+-----------
+ f1     | text | 
+ f2     | text | 
+Indexes:
+    "func_index_index" UNIQUE, btree (textcat(f1, f2))
+
+\d func_index_index
+ Index "public.func_index_index"
+ Column  | Type |   Definition    
+---------+------+-----------------
+ textcat | text | textcat(f1, f2)
+unique, btree, for table "public.func_index_heap"
+
 --
 -- Same test, expressional index
 --
@@ -2271,6 +2288,26 @@ ERROR:  duplicate key value violates unique constraint "func_index_index"
 DETAIL:  Key ((f1 || f2))=(ABCDEF) already exists.
 -- but this shouldn't:
 INSERT INTO func_index_heap VALUES('QWERTY');
+-- while we're here, see that the metadata looks sane
+\d func_index_heap
+Table "public.func_index_heap"
+ Column | Type | Modifiers 
+--------+------+-----------
+ f1     | text | 
+ f2     | text | 
+Indexes:
+    "func_index_index" UNIQUE, btree ((f1 || f2))
+
+\d func_index_index
+Index "public.func_index_index"
+ Column | Type | Definition 
+--------+------+------------
+ expr   | text | (f1 || f2)
+unique, btree, for table "public.func_index_heap"
+
+-- this should fail because of unsafe column type (anonymous record)
+create index on func_index_heap ((f1 || f2), (row(f1, f2)));
+ERROR:  column "row" has pseudo-type record
 --
 -- Also try building functional, expressional, and partial indexes on
 -- tables that already contain data.

diff --git a/src/test/regress/sql/create_index.sql b/src/test/regress/sql/create_index.sql
index 5008e981ab0dff24c7ceb32ed619a9abbb22a8ba..f826084512cdb8a95d3a3fb60e944adc85a18b80 100644 (file)
--- a/src/test/regress/sql/create_index.sql
+++ b/src/test/regress/sql/create_index.sql
@@ -678,6 +678,10 @@ INSERT INTO func_index_heap VALUES('ABCD', 'EF');
 -- but this shouldn't:
 INSERT INTO func_index_heap VALUES('QWERTY');
 
+-- while we're here, see that the metadata looks sane
+\d func_index_heap
+\d func_index_index
+
 
 --
 -- Same test, expressional index
@@ -694,6 +698,14 @@ INSERT INTO func_index_heap VALUES('ABCD', 'EF');
 -- but this shouldn't:
 INSERT INTO func_index_heap VALUES('QWERTY');
 
+-- while we're here, see that the metadata looks sane
+\d func_index_heap
+\d func_index_index
+
+-- this should fail because of unsafe column type (anonymous record)
+create index on func_index_heap ((f1 || f2), (row(f1, f2)));
+
+
 --
 -- Also try building functional, expressional, and partial indexes on
 -- tables that already contain data.