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

Commitb7d6795

Browse files
committed
Disallow comments on columns of relation types other than tables, views,
and composite types, which are the only relkinds for which pg_dump supportexists for dumping column comments. There is no obvious usefulness forcomments on columns of sequences or toast tables; and while comments onindex columns might have some value, it's not worth the risk of compatibilityproblems due to possible changes in the algorithm for assigning names toindex columns. Per discussion.In consequence, remove now-dead code for copying such comments in CREATE TABLELIKE.
1 parentde0d75e commitb7d6795

File tree

4 files changed

+26
-53
lines changed

4 files changed

+26
-53
lines changed

‎src/backend/commands/comment.c

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Copyright (c) 1996-2009, PostgreSQL Global Development Group
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.110 2009/12/21 01:34:11 rhaas Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.111 2009/12/22 23:54:17 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -627,6 +627,22 @@ CommentAttribute(List *qualname, char *comment)
627627
aclcheck_error(ACLCHECK_NOT_OWNER,ACL_KIND_CLASS,
628628
RelationGetRelationName(relation));
629629

630+
/*
631+
* Allow comments only on columns of tables, views, and composite types
632+
* (which are the only relkinds for which pg_dump will dump per-column
633+
* comments). In particular we wish to disallow comments on index
634+
* columns, because the naming of an index's columns may change across
635+
* PG versions, so dumping per-column comments could create reload
636+
* failures.
637+
*/
638+
if (relation->rd_rel->relkind!=RELKIND_RELATION&&
639+
relation->rd_rel->relkind!=RELKIND_VIEW&&
640+
relation->rd_rel->relkind!=RELKIND_COMPOSITE_TYPE)
641+
ereport(ERROR,
642+
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
643+
errmsg("\"%s\" is not a table, view, or composite type",
644+
RelationGetRelationName(relation))));
645+
630646
/* Now, fetch the attribute number from the system cache */
631647

632648
attnum=get_attnum(RelationGetRelid(relation),attrname);

‎src/backend/parser/parse_utilcmd.c

Lines changed: 6 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
2020
* Portions Copyright (c) 1994, Regents of the University of California
2121
*
22-
*$PostgreSQL: pgsql/src/backend/parser/parse_utilcmd.c,v 2.33 2009/12/20 18:28:14 tgl Exp $
22+
*$PostgreSQL: pgsql/src/backend/parser/parse_utilcmd.c,v 2.34 2009/12/22 23:54:17 tgl Exp $
2323
*
2424
*-------------------------------------------------------------------------
2525
*/
@@ -745,14 +745,12 @@ transformInhRelation(ParseState *pstate, CreateStmtContext *cxt,
745745
/* Copy comment on index */
746746
if (inhRelation->options&CREATE_TABLE_LIKE_COMMENTS)
747747
{
748-
Form_pg_attribute*attrs;
749-
CommentStmt*stmt;
750-
intcolno;
751-
752748
comment=GetComment(parent_index_oid,RelationRelationId,0);
753-
749+
754750
if (comment!=NULL)
755751
{
752+
CommentStmt*stmt;
753+
756754
/*
757755
* We have to assign the index a name now, so that we
758756
* can reference it in CommentStmt.
@@ -771,41 +769,6 @@ transformInhRelation(ParseState *pstate, CreateStmtContext *cxt,
771769

772770
cxt->alist=lappend(cxt->alist,stmt);
773771
}
774-
775-
/* Copy comments on index's columns */
776-
attrs=RelationGetDescr(parent_index)->attrs;
777-
for (colno=1;
778-
colno <=RelationGetNumberOfAttributes(parent_index);
779-
colno++)
780-
{
781-
char*attname;
782-
783-
comment=GetComment(parent_index_oid,RelationRelationId,
784-
colno);
785-
if (comment==NULL)
786-
continue;
787-
788-
/*
789-
* We have to assign the index a name now, so that we
790-
* can reference it in CommentStmt.
791-
*/
792-
if (index_stmt->idxname==NULL)
793-
index_stmt->idxname=chooseIndexName(cxt->relation,
794-
index_stmt);
795-
796-
attname=NameStr(attrs[colno-1]->attname);
797-
798-
stmt=makeNode(CommentStmt);
799-
stmt->objtype=OBJECT_COLUMN;
800-
stmt->objname=
801-
list_make3(makeString(cxt->relation->schemaname),
802-
makeString(index_stmt->idxname),
803-
makeString(attname));
804-
stmt->objargs=NIL;
805-
stmt->comment=comment;
806-
807-
cxt->alist=lappend(cxt->alist,stmt);
808-
}
809772
}
810773

811774
/* Save it in the inh_indexes list for the time being */
@@ -832,12 +795,12 @@ static char *
832795
chooseIndexName(constRangeVar*relation,IndexStmt*index_stmt)
833796
{
834797
OidnamespaceId;
835-
798+
836799
namespaceId=RangeVarGetCreationNamespace(relation);
837800
if (index_stmt->primary)
838801
{
839802
/* no need for column list with pkey */
840-
returnChooseRelationName(relation->relname,NULL,
803+
returnChooseRelationName(relation->relname,NULL,
841804
"pkey",namespaceId);
842805
}
843806
elseif (index_stmt->excludeOpNames!=NIL)

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -931,8 +931,6 @@ COMMENT ON COLUMN t1.b IS 'B';
931931
COMMENT ON CONSTRAINT t1_a_check ON t1 IS 't1_a_check';
932932
COMMENT ON INDEX t1_pkey IS 'index pkey';
933933
COMMENT ON INDEX t1_b_key IS 'index b_key';
934-
COMMENT ON COLUMN t1_pkey.a IS 'index column pkey.a';
935-
COMMENT ON COLUMN t1_fnidx.pg_expression_1 IS 'index column fnidx';
936934
ALTER TABLE t1 ALTER COLUMN a SET STORAGE MAIN;
937935
CREATE TABLE t2 (c text);
938936
ALTER TABLE t2 ALTER COLUMN c SET STORAGE EXTERNAL;
@@ -1040,13 +1038,11 @@ Check constraints:
10401038
Has OIDs: no
10411039

10421040
SELECT c.relname, objsubid, description FROM pg_description, pg_index i, pg_class c WHERE classoid = 'pg_class'::regclass AND objoid = i.indexrelid AND c.oid = i.indexrelid AND i.indrelid = 't_all'::regclass ORDER BY c.relname, objsubid;
1043-
relname | objsubid |description
1044-
-------------+----------+---------------------
1041+
relname | objsubid | description
1042+
-------------+----------+-------------
10451043
t_all_b_key | 0 | index b_key
1046-
t_all_key | 1 | index column fnidx
10471044
t_all_pkey | 0 | index pkey
1048-
t_all_pkey | 1 | index column pkey.a
1049-
(4 rows)
1045+
(2 rows)
10501046

10511047
CREATE TABLE inh_error1 () INHERITS (t1, t4);
10521048
NOTICE: merging multiple inherited definitions of column "a"

‎src/test/regress/sql/inherit.sql

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,6 @@ COMMENT ON COLUMN t1.b IS 'B';
297297
COMMENT ON CONSTRAINT t1_a_check ON t1 IS't1_a_check';
298298
COMMENT ON INDEX t1_pkey IS'index pkey';
299299
COMMENT ON INDEX t1_b_key IS'index b_key';
300-
COMMENT ON COLUMN t1_pkey.a IS'index column pkey.a';
301-
COMMENT ON COLUMN t1_fnidx.pg_expression_1 IS'index column fnidx';
302300
ALTERTABLE t1 ALTER COLUMN aSET STORAGE MAIN;
303301

304302
CREATETABLEt2 (ctext);

0 commit comments

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