|
19 | 19 | * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group |
20 | 20 | * Portions Copyright (c) 1994, Regents of the University of California |
21 | 21 | * |
22 | | - *$PostgreSQL: pgsql/src/backend/parser/parse_utilcmd.c,v 2.32 2009/12/15 17:57:47 tgl Exp $ |
| 22 | + *$PostgreSQL: pgsql/src/backend/parser/parse_utilcmd.c,v 2.33 2009/12/20 18:28:14 tgl Exp $ |
23 | 23 | * |
24 | 24 | *------------------------------------------------------------------------- |
25 | 25 | */ |
@@ -745,58 +745,62 @@ transformInhRelation(ParseState *pstate, CreateStmtContext *cxt, |
745 | 745 | /* Copy comment on index */ |
746 | 746 | if (inhRelation->options&CREATE_TABLE_LIKE_COMMENTS) |
747 | 747 | { |
| 748 | +Form_pg_attribute*attrs; |
748 | 749 | CommentStmt*stmt; |
749 | | -ListCell*lc; |
750 | | -inti; |
| 750 | +intcolno; |
751 | 751 |
|
752 | 752 | comment=GetComment(parent_index_oid,RelationRelationId,0); |
753 | 753 |
|
754 | 754 | if (comment!=NULL) |
755 | 755 | { |
756 | | -/* Assign name for index because CommentStmt requires name. */ |
| 756 | +/* |
| 757 | + * We have to assign the index a name now, so that we |
| 758 | + * can reference it in CommentStmt. |
| 759 | + */ |
757 | 760 | if (index_stmt->idxname==NULL) |
758 | | -index_stmt->idxname=chooseIndexName(cxt->relation,index_stmt); |
| 761 | +index_stmt->idxname=chooseIndexName(cxt->relation, |
| 762 | +index_stmt); |
759 | 763 |
|
760 | 764 | stmt=makeNode(CommentStmt); |
761 | 765 | stmt->objtype=OBJECT_INDEX; |
762 | | -stmt->objname=list_make2(makeString(cxt->relation->schemaname), |
763 | | -makeString(index_stmt->idxname)); |
| 766 | +stmt->objname= |
| 767 | +list_make2(makeString(cxt->relation->schemaname), |
| 768 | +makeString(index_stmt->idxname)); |
764 | 769 | stmt->objargs=NIL; |
765 | 770 | stmt->comment=comment; |
766 | 771 |
|
767 | 772 | cxt->alist=lappend(cxt->alist,stmt); |
768 | 773 | } |
769 | 774 |
|
770 | | -/* Copy comment on index's columns */ |
771 | | -i=0; |
772 | | -foreach(lc,index_stmt->indexParams) |
| 775 | +/* Copy comments on index's columns */ |
| 776 | +attrs=RelationGetDescr(parent_index)->attrs; |
| 777 | +for (colno=1; |
| 778 | +colno <=RelationGetNumberOfAttributes(parent_index); |
| 779 | +colno++) |
773 | 780 | { |
774 | 781 | char*attname; |
775 | 782 |
|
776 | | -i++; |
777 | | -comment=GetComment(parent_index_oid,RelationRelationId,i); |
| 783 | +comment=GetComment(parent_index_oid,RelationRelationId, |
| 784 | +colno); |
778 | 785 | if (comment==NULL) |
779 | 786 | continue; |
780 | 787 |
|
781 | | -/* Assign name for index because CommentStmt requires name. */ |
| 788 | +/* |
| 789 | + * We have to assign the index a name now, so that we |
| 790 | + * can reference it in CommentStmt. |
| 791 | + */ |
782 | 792 | if (index_stmt->idxname==NULL) |
783 | | -index_stmt->idxname=chooseIndexName(cxt->relation,index_stmt); |
| 793 | +index_stmt->idxname=chooseIndexName(cxt->relation, |
| 794 | +index_stmt); |
784 | 795 |
|
785 | | -attname= ((IndexElem*)lfirst(lc))->name; |
786 | | - |
787 | | -/* expression index has a dummy column name */ |
788 | | -if (attname==NULL) |
789 | | -{ |
790 | | -attname=palloc(NAMEDATALEN); |
791 | | -sprintf(attname,"pg_expression_%d",i); |
792 | | -} |
| 796 | +attname=NameStr(attrs[colno-1]->attname); |
793 | 797 |
|
794 | 798 | stmt=makeNode(CommentStmt); |
795 | 799 | stmt->objtype=OBJECT_COLUMN; |
796 | | -stmt->objname=list_make3( |
797 | | -makeString(cxt->relation->schemaname), |
798 | | -makeString(index_stmt->idxname), |
799 | | -makeString(attname)); |
| 800 | +stmt->objname= |
| 801 | +list_make3(makeString(cxt->relation->schemaname), |
| 802 | +makeString(index_stmt->idxname), |
| 803 | +makeString(attname)); |
800 | 804 | stmt->objargs=NIL; |
801 | 805 | stmt->comment=comment; |
802 | 806 |
|
|