Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2acab05

Browse files
committed
Fix error reporting for index expressions of prohibited types.
If CheckAttributeType() threw an error about the datatype of anindex 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 commitcfc5008, by not noticingthat the column's attname was used above where I'd placed theassignment of it.In HEAD and v12, this is trivially fixable by moving up theassignment of attname. Before v12 the code is a bit more messy;to avoid doing substantial refactoring, I took the lazy way outand just put in two copies of the assignment code.Report and patch by Amit Langote. Back-patch to all supportedbranches.Discussion:https://postgr.es/m/CA+HiwqFA+BGyBFimjiYXXMa2Hc3fcL0+OJOyzUNjhU4NCa_XXw@mail.gmail.com
1 parent5184f11 commit2acab05

File tree

3 files changed

+57
-9
lines changed

3 files changed

+57
-9
lines changed

‎src/backend/catalog/index.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,14 @@ ConstructTupleDescriptor(Relation heapRelation,
312312
to->attcollation= (i<numkeyatts) ?
313313
collationObjectId[i] :InvalidOid;
314314

315+
/*
316+
* Set the attribute name as specified by caller.
317+
*/
318+
if (colnames_item==NULL)/* shouldn't happen */
319+
elog(ERROR,"too few entries in colnames list");
320+
namestrcpy(&to->attname, (constchar*)lfirst(colnames_item));
321+
colnames_item=lnext(indexColNames,colnames_item);
322+
315323
/*
316324
* For simple index columns, we copy some pg_attribute fields from the
317325
* parent relation. For expressions we have to look at the expression
@@ -329,7 +337,6 @@ ConstructTupleDescriptor(Relation heapRelation,
329337
from=TupleDescAttr(heapTupDesc,
330338
AttrNumberGetAttrOffset(atnum));
331339

332-
namecpy(&to->attname,&from->attname);
333340
to->atttypid=from->atttypid;
334341
to->attlen=from->attlen;
335342
to->attndims=from->attndims;
@@ -390,14 +397,6 @@ ConstructTupleDescriptor(Relation heapRelation,
390397
*/
391398
to->attrelid=InvalidOid;
392399

393-
/*
394-
* Set the attribute name as specified by caller.
395-
*/
396-
if (colnames_item==NULL)/* shouldn't happen */
397-
elog(ERROR,"too few entries in colnames list");
398-
namestrcpy(&to->attname, (constchar*)lfirst(colnames_item));
399-
colnames_item=lnext(indexColNames,colnames_item);
400-
401400
/*
402401
* Check the opclass and index AM to see if either provides a keytype
403402
* (overriding the attribute type). Opclass (if exists) takes

‎src/test/regress/expected/create_index.out

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,6 +1281,23 @@ ERROR: duplicate key value violates unique constraint "func_index_index"
12811281
DETAIL: Key (textcat(f1, f2))=(ABCDEF) already exists.
12821282
-- but this shouldn't:
12831283
INSERT INTO func_index_heap VALUES('QWERTY');
1284+
-- while we're here, see that the metadata looks sane
1285+
\d func_index_heap
1286+
Table "public.func_index_heap"
1287+
Column | Type | Collation | Nullable | Default
1288+
--------+------+-----------+----------+---------
1289+
f1 | text | | |
1290+
f2 | text | | |
1291+
Indexes:
1292+
"func_index_index" UNIQUE, btree (textcat(f1, f2))
1293+
1294+
\d func_index_index
1295+
Index "public.func_index_index"
1296+
Column | Type | Key? | Definition
1297+
---------+------+------+-----------------
1298+
textcat | text | yes | textcat(f1, f2)
1299+
unique, btree, for table "public.func_index_heap"
1300+
12841301
--
12851302
-- Same test, expressional index
12861303
--
@@ -1296,6 +1313,26 @@ ERROR: duplicate key value violates unique constraint "func_index_index"
12961313
DETAIL: Key ((f1 || f2))=(ABCDEF) already exists.
12971314
-- but this shouldn't:
12981315
INSERT INTO func_index_heap VALUES('QWERTY');
1316+
-- while we're here, see that the metadata looks sane
1317+
\d func_index_heap
1318+
Table "public.func_index_heap"
1319+
Column | Type | Collation | Nullable | Default
1320+
--------+------+-----------+----------+---------
1321+
f1 | text | | |
1322+
f2 | text | | |
1323+
Indexes:
1324+
"func_index_index" UNIQUE, btree ((f1 || f2))
1325+
1326+
\d func_index_index
1327+
Index "public.func_index_index"
1328+
Column | Type | Key? | Definition
1329+
--------+------+------+------------
1330+
expr | text | yes | (f1 || f2)
1331+
unique, btree, for table "public.func_index_heap"
1332+
1333+
-- this should fail because of unsafe column type (anonymous record)
1334+
create index on func_index_heap ((f1 || f2), (row(f1, f2)));
1335+
ERROR: column "row" has pseudo-type record
12991336
--
13001337
-- Test unique index with included columns
13011338
--

‎src/test/regress/sql/create_index.sql

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,10 @@ INSERT INTO func_index_heap VALUES('ABCD', 'EF');
401401
-- but this shouldn't:
402402
INSERT INTO func_index_heapVALUES('QWERTY');
403403

404+
-- while we're here, see that the metadata looks sane
405+
\d func_index_heap
406+
\d func_index_index
407+
404408

405409
--
406410
-- Same test, expressional index
@@ -417,6 +421,14 @@ INSERT INTO func_index_heap VALUES('ABCD', 'EF');
417421
-- but this shouldn't:
418422
INSERT INTO func_index_heapVALUES('QWERTY');
419423

424+
-- while we're here, see that the metadata looks sane
425+
\d func_index_heap
426+
\d func_index_index
427+
428+
-- this should fail because of unsafe column type (anonymous record)
429+
createindexon func_index_heap ((f1|| f2), (row(f1, f2)));
430+
431+
420432
--
421433
-- Test unique index with included columns
422434
--

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp