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

Commita051ef6

Browse files
committed
Remove collation information from TypeName, where it does not belong.
The initial collations patch treated a COLLATE spec as part of a TypeName,following what can only be described as brain fade on the part of the SQLcommittee. It's a lot more reasonable to treat COLLATE as a syntacticallyseparate object, so that it can be added in only the productions where itactually belongs, rather than needing to reject it in a boatload of placeswhere it doesn't belong (something the original patch mostly failed to do).In addition this change lets us meet the spec's requirement to allowCOLLATE anywhere in the clauses of a ColumnDef, and it avoids unfriendlybehavior for constructs such as "foo::type COLLATE collation".To do this, pull collation information out of TypeName and put it inColumnDef instead, thus reverting most of the collation-related changes inparse_type.c's API. I made one additional structural change, which was touse a ColumnDef as an intermediate node in AT_AlterColumnType AlterTableCmdnodes. This provides enough room to get rid of the "transform" wart inAlterTableCmd too, since the ColumnDef can carry the USING expressioneasily enough.Also fix some other minor bugs that have crept in in the same areas,like failure to copy recently-added fields of ColumnDef in copyfuncs.c.While at it, document the formerly secret ability to specify a collationin ALTER TABLE ALTER COLUMN TYPE, ALTER TYPE ADD ATTRIBUTE, andALTER TYPE ALTER ATTRIBUTE TYPE; and correct some misstatements aboutwhat the default collation selection will be when COLLATE is omitted.BTW, the three-parameter form of format_type() should go away too,since it just contributes to the confusion in this area; but I'll dothat in a separate patch.
1 parent01752f7 commita051ef6

28 files changed

+412
-246
lines changed

‎doc/src/sgml/ref/alter_table.sgml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
3232

3333
<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase>
3434

35-
ADD [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ]
35+
ADD [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [<replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ]
3636
DROP [ COLUMN ] [ IF EXISTS ] <replaceable class="PARAMETER">column</replaceable> [ RESTRICT | CASCADE ]
37-
ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> [ SET DATA ] TYPE <replaceable class="PARAMETER">type</replaceable> [ USING <replaceable class="PARAMETER">expression</replaceable> ]
37+
ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> [ SET DATA ] TYPE <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [ USING <replaceable class="PARAMETER">expression</replaceable> ]
3838
ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> SET DEFAULT <replaceable class="PARAMETER">expression</replaceable>
3939
ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> DROP DEFAULT
4040
ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> { SET | DROP } NOT NULL
@@ -115,7 +115,11 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
115115
This form changes the type of a column of a table. Indexes and
116116
simple table constraints involving the column will be automatically
117117
converted to use the new column type by reparsing the originally
118-
supplied expression. The optional <literal>USING</literal>
118+
supplied expression.
119+
The optional <literal>COLLATE</literal> clause specifies a collation
120+
for the new column; if omitted, the collation is the default for the
121+
new column type.
122+
The optional <literal>USING</literal>
119123
clause specifies how to compute the new column value from the old;
120124
if omitted, the default conversion is the same as an assignment
121125
cast from old data type to new. A <literal>USING</literal>

‎doc/src/sgml/ref/alter_type.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> ADD VALUE <replacea
3232

3333
<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase>
3434

35-
ADD ATTRIBUTE <replaceable class="PARAMETER">attribute_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ CASCADE | RESTRICT ]
35+
ADD ATTRIBUTE <replaceable class="PARAMETER">attribute_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [CASCADE | RESTRICT ]
3636
DROP ATTRIBUTE [ IF EXISTS ] <replaceable class="PARAMETER">attribute_name</replaceable> [ CASCADE | RESTRICT ]
37-
ALTER ATTRIBUTE <replaceable class="PARAMETER">attribute_name</replaceable> [ SET DATA ] TYPE <replaceable class="PARAMETER">data_type</replaceable> [ CASCADE | RESTRICT ]
37+
ALTER ATTRIBUTE <replaceable class="PARAMETER">attribute_name</replaceable> [ SET DATA ] TYPE <replaceable class="PARAMETER">data_type</replaceable> [COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [CASCADE | RESTRICT ]
3838
</synopsis>
3939
</refsynopsisdiv>
4040

‎doc/src/sgml/ref/create_domain.sgml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
8989
<listitem>
9090
<para>
9191
An optional collation for the domain. If no collation is
92-
specified, the database default collation is used (which can
93-
be overridden when the domain is used to define a column).
92+
specified, the underlying data type's default collation is used.
93+
The underlying type must be collatable when <literal>COLLATE</>
94+
is specified.
9495
</para>
9596
</listitem>
9697
</varlistentry>

‎doc/src/sgml/ref/create_table.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,9 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
248248
<term><literal>COLLATE <replaceable>collation</replaceable></literal></term>
249249
<listitem>
250250
<para>
251-
The <literal>COLLATE</> clause assigns anondefaultcollation to
252-
the column. By default, the locale settingsofthe database are
253-
used.
251+
The <literal>COLLATE</> clause assigns a collation to
252+
the column (which must beofa collatable data type).
253+
If not specified, the column data type's default collation isused.
254254
</para>
255255
</listitem>
256256
</varlistentry>

‎src/backend/access/common/tupdesc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,8 @@ BuildDescForRelation(List *schema)
559559
attnum++;
560560

561561
attname=entry->colname;
562-
typenameTypeIdModColl(NULL,entry->typeName,&atttypid,&atttypmod,&attcollation);
562+
typenameTypeIdAndMod(NULL,entry->typeName,&atttypid,&atttypmod);
563+
attcollation=GetColumnDefCollation(NULL,entry,atttypid);
563564
attdim=list_length(entry->typeName->arrayBounds);
564565

565566
if (entry->typeName->setof)

‎src/backend/commands/collationcmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ DefineCollation(List *names, List *parameters)
9898
Oidcollid;
9999
HeapTupletp;
100100

101-
collid=LookupCollation(NULL,defGetQualifiedName(fromEl),-1);
101+
collid=get_collation_oid(defGetQualifiedName(fromEl),false);
102102
tp=SearchSysCache1(COLLOID,ObjectIdGetDatum(collid));
103103
if (!HeapTupleIsValid(tp))
104104
elog(ERROR,"cache lookup failed for collation %u",collid);

‎src/backend/commands/functioncmds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ compute_return_type(TypeName *returnType, Oid languageOid,
8787
Oidrettype;
8888
Typetyptup;
8989

90-
typtup=LookupTypeName(NULL,returnType,NULL,NULL);
90+
typtup=LookupTypeName(NULL,returnType,NULL);
9191

9292
if (typtup)
9393
{
@@ -207,7 +207,7 @@ examine_parameter_list(List *parameters, Oid languageOid,
207207
Oidtoid;
208208
Typetyptup;
209209

210-
typtup=LookupTypeName(NULL,t,NULL,NULL);
210+
typtup=LookupTypeName(NULL,t,NULL);
211211
if (typtup)
212212
{
213213
if (!((Form_pg_type)GETSTRUCT(typtup))->typisdefined)

‎src/backend/commands/sequence.c

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -139,63 +139,66 @@ DefineSequence(CreateSeqStmt *seq)
139139
coldef->inhcount=0;
140140
coldef->is_local= true;
141141
coldef->is_not_null= true;
142+
coldef->is_from_type= false;
142143
coldef->storage=0;
143144
coldef->raw_default=NULL;
144145
coldef->cooked_default=NULL;
146+
coldef->collClause=NULL;
147+
coldef->collOid=InvalidOid;
145148
coldef->constraints=NIL;
146149

147150
null[i-1]= false;
148151

149152
switch (i)
150153
{
151154
caseSEQ_COL_NAME:
152-
coldef->typeName=makeTypeNameFromOid(NAMEOID,-1,InvalidOid);
155+
coldef->typeName=makeTypeNameFromOid(NAMEOID,-1);
153156
coldef->colname="sequence_name";
154157
namestrcpy(&name,seq->sequence->relname);
155158
value[i-1]=NameGetDatum(&name);
156159
break;
157160
caseSEQ_COL_LASTVAL:
158-
coldef->typeName=makeTypeNameFromOid(INT8OID,-1,InvalidOid);
161+
coldef->typeName=makeTypeNameFromOid(INT8OID,-1);
159162
coldef->colname="last_value";
160163
value[i-1]=Int64GetDatumFast(new.last_value);
161164
break;
162165
caseSEQ_COL_STARTVAL:
163-
coldef->typeName=makeTypeNameFromOid(INT8OID,-1,InvalidOid);
166+
coldef->typeName=makeTypeNameFromOid(INT8OID,-1);
164167
coldef->colname="start_value";
165168
value[i-1]=Int64GetDatumFast(new.start_value);
166169
break;
167170
caseSEQ_COL_INCBY:
168-
coldef->typeName=makeTypeNameFromOid(INT8OID,-1,InvalidOid);
171+
coldef->typeName=makeTypeNameFromOid(INT8OID,-1);
169172
coldef->colname="increment_by";
170173
value[i-1]=Int64GetDatumFast(new.increment_by);
171174
break;
172175
caseSEQ_COL_MAXVALUE:
173-
coldef->typeName=makeTypeNameFromOid(INT8OID,-1,InvalidOid);
176+
coldef->typeName=makeTypeNameFromOid(INT8OID,-1);
174177
coldef->colname="max_value";
175178
value[i-1]=Int64GetDatumFast(new.max_value);
176179
break;
177180
caseSEQ_COL_MINVALUE:
178-
coldef->typeName=makeTypeNameFromOid(INT8OID,-1,InvalidOid);
181+
coldef->typeName=makeTypeNameFromOid(INT8OID,-1);
179182
coldef->colname="min_value";
180183
value[i-1]=Int64GetDatumFast(new.min_value);
181184
break;
182185
caseSEQ_COL_CACHE:
183-
coldef->typeName=makeTypeNameFromOid(INT8OID,-1,InvalidOid);
186+
coldef->typeName=makeTypeNameFromOid(INT8OID,-1);
184187
coldef->colname="cache_value";
185188
value[i-1]=Int64GetDatumFast(new.cache_value);
186189
break;
187190
caseSEQ_COL_LOG:
188-
coldef->typeName=makeTypeNameFromOid(INT8OID,-1,InvalidOid);
191+
coldef->typeName=makeTypeNameFromOid(INT8OID,-1);
189192
coldef->colname="log_cnt";
190193
value[i-1]=Int64GetDatum((int64)1);
191194
break;
192195
caseSEQ_COL_CYCLE:
193-
coldef->typeName=makeTypeNameFromOid(BOOLOID,-1,InvalidOid);
196+
coldef->typeName=makeTypeNameFromOid(BOOLOID,-1);
194197
coldef->colname="is_cycled";
195198
value[i-1]=BoolGetDatum(new.is_cycled);
196199
break;
197200
caseSEQ_COL_CALLED:
198-
coldef->typeName=makeTypeNameFromOid(BOOLOID,-1,InvalidOid);
201+
coldef->typeName=makeTypeNameFromOid(BOOLOID,-1);
199202
coldef->colname="is_called";
200203
value[i-1]=BoolGetDatum(false);
201204
break;

‎src/backend/commands/tablecmds.c

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ static void ATPrepAlterColumnType(List **wqueue,
339339
AlterTableCmd*cmd,LOCKMODElockmode);
340340
staticboolATColumnChangeRequiresRewrite(Node*expr,AttrNumbervarattno);
341341
staticvoidATExecAlterColumnType(AlteredTableInfo*tab,Relationrel,
342-
constchar*colName,TypeName*typeName,LOCKMODElockmode);
342+
AlterTableCmd*cmd,LOCKMODElockmode);
343343
staticvoidATPostAlterTypeCleanup(List**wqueue,AlteredTableInfo*tab,LOCKMODElockmode);
344344
staticvoidATPostAlterTypeParse(char*cmd,List**wqueue,LOCKMODElockmode);
345345
staticvoidchange_owner_recurse_to_sequences(OidrelationOid,
@@ -1433,7 +1433,7 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
14331433
(errmsg("merging multiple inherited definitions of column \"%s\"",
14341434
attributeName)));
14351435
def= (ColumnDef*)list_nth(inhSchema,exist_attno-1);
1436-
typenameTypeIdModColl(NULL,def->typeName,&defTypeId,&deftypmod,&defCollId);
1436+
typenameTypeIdAndMod(NULL,def->typeName,&defTypeId,&deftypmod);
14371437
if (defTypeId!=attribute->atttypid||
14381438
deftypmod!=attribute->atttypmod)
14391439
ereport(ERROR,
@@ -1443,6 +1443,7 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
14431443
errdetail("%s versus %s",
14441444
TypeNameToString(def->typeName),
14451445
format_type_be(attribute->atttypid))));
1446+
defCollId=GetColumnDefCollation(NULL,def,defTypeId);
14461447
if (defCollId!=attribute->attcollation)
14471448
ereport(ERROR,
14481449
(errcode(ERRCODE_COLLATION_MISMATCH),
@@ -1478,14 +1479,16 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
14781479
def=makeNode(ColumnDef);
14791480
def->colname=pstrdup(attributeName);
14801481
def->typeName=makeTypeNameFromOid(attribute->atttypid,
1481-
attribute->atttypmod,
1482-
attribute->attcollation);
1482+
attribute->atttypmod);
14831483
def->inhcount=1;
14841484
def->is_local= false;
14851485
def->is_not_null=attribute->attnotnull;
1486+
def->is_from_type= false;
14861487
def->storage=attribute->attstorage;
14871488
def->raw_default=NULL;
14881489
def->cooked_default=NULL;
1490+
def->collClause=NULL;
1491+
def->collOid=attribute->attcollation;
14891492
def->constraints=NIL;
14901493
inhSchema=lappend(inhSchema,def);
14911494
newattno[parent_attno-1]=++child_attno;
@@ -1616,8 +1619,8 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
16161619
(errmsg("merging column \"%s\" with inherited definition",
16171620
attributeName)));
16181621
def= (ColumnDef*)list_nth(inhSchema,exist_attno-1);
1619-
typenameTypeIdModColl(NULL,def->typeName,&defTypeId,&deftypmod,&defcollid);
1620-
typenameTypeIdModColl(NULL,newdef->typeName,&newTypeId,&newtypmod,&newcollid);
1622+
typenameTypeIdAndMod(NULL,def->typeName,&defTypeId,&deftypmod);
1623+
typenameTypeIdAndMod(NULL,newdef->typeName,&newTypeId,&newtypmod);
16211624
if (defTypeId!=newTypeId||deftypmod!=newtypmod)
16221625
ereport(ERROR,
16231626
(errcode(ERRCODE_DATATYPE_MISMATCH),
@@ -1626,6 +1629,8 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
16261629
errdetail("%s versus %s",
16271630
TypeNameToString(def->typeName),
16281631
TypeNameToString(newdef->typeName))));
1632+
defcollid=GetColumnDefCollation(NULL,def,defTypeId);
1633+
newcollid=GetColumnDefCollation(NULL,newdef,newTypeId);
16291634
if (defcollid!=newcollid)
16301635
ereport(ERROR,
16311636
(errcode(ERRCODE_COLLATION_MISMATCH),
@@ -3092,7 +3097,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
30923097
cmd->missing_ok,lockmode);
30933098
break;
30943099
caseAT_AlterColumnType:/* ALTER COLUMN TYPE */
3095-
ATExecAlterColumnType(tab,rel,cmd->name, (TypeName*)cmd->def,lockmode);
3100+
ATExecAlterColumnType(tab,rel,cmd,lockmode);
30963101
break;
30973102
caseAT_ChangeOwner:/* ALTER OWNER */
30983103
ATExecChangeOwner(RelationGetRelid(rel),
@@ -4129,13 +4134,14 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
41294134
Oidccollid;
41304135

41314136
/* Child column must match by type */
4132-
typenameTypeIdModColl(NULL,colDef->typeName,&ctypeId,&ctypmod,&ccollid);
4137+
typenameTypeIdAndMod(NULL,colDef->typeName,&ctypeId,&ctypmod);
41334138
if (ctypeId!=childatt->atttypid||
41344139
ctypmod!=childatt->atttypmod)
41354140
ereport(ERROR,
41364141
(errcode(ERRCODE_DATATYPE_MISMATCH),
41374142
errmsg("child table \"%s\" has different type for column \"%s\"",
41384143
RelationGetRelationName(rel),colDef->colname)));
4144+
ccollid=GetColumnDefCollation(NULL,colDef,ctypeId);
41394145
if (ccollid!=childatt->attcollation)
41404146
ereport(ERROR,
41414147
(errcode(ERRCODE_COLLATION_MISMATCH),
@@ -4201,9 +4207,10 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
42014207
MaxHeapAttributeNumber)));
42024208
}
42034209

4204-
typeTuple=typenameType(NULL,colDef->typeName,&typmod,&collOid);
4210+
typeTuple=typenameType(NULL,colDef->typeName,&typmod);
42054211
tform= (Form_pg_type)GETSTRUCT(typeTuple);
42064212
typeOid=HeapTupleGetOid(typeTuple);
4213+
collOid=GetColumnDefCollation(NULL,colDef,typeOid);
42074214

42084215
/* make sure datatype is legal for a column */
42094216
CheckAttributeType(colDef->colname,typeOid,collOid, false);
@@ -4413,7 +4420,7 @@ ATPrepAddOids(List **wqueue, Relation rel, bool recurse, AlterTableCmd *cmd, LOC
44134420
ColumnDef*cdef=makeNode(ColumnDef);
44144421

44154422
cdef->colname=pstrdup("oid");
4416-
cdef->typeName=makeTypeNameFromOid(OIDOID,-1,InvalidOid);
4423+
cdef->typeName=makeTypeNameFromOid(OIDOID,-1);
44174424
cdef->inhcount=0;
44184425
cdef->is_local= true;
44194426
cdef->is_not_null= true;
@@ -6471,14 +6478,15 @@ ATPrepAlterColumnType(List **wqueue,
64716478
AlterTableCmd*cmd,LOCKMODElockmode)
64726479
{
64736480
char*colName=cmd->name;
6474-
TypeName*typeName= (TypeName*)cmd->def;
6481+
ColumnDef*def= (ColumnDef*)cmd->def;
6482+
TypeName*typeName=def->typeName;
6483+
Node*transform=def->raw_default;
64756484
HeapTupletuple;
64766485
Form_pg_attributeattTup;
64776486
AttrNumberattnum;
64786487
Oidtargettype;
64796488
int32targettypmod;
64806489
Oidtargetcollid;
6481-
Node*transform;
64826490
NewColumnValue*newval;
64836491
ParseState*pstate=make_parsestate(NULL);
64846492

@@ -6512,7 +6520,10 @@ ATPrepAlterColumnType(List **wqueue,
65126520
colName)));
65136521

65146522
/* Look up the target type */
6515-
typenameTypeIdModColl(NULL,typeName,&targettype,&targettypmod,&targetcollid);
6523+
typenameTypeIdAndMod(NULL,typeName,&targettype,&targettypmod);
6524+
6525+
/* And the collation */
6526+
targetcollid=GetColumnDefCollation(NULL,def,targettype);
65166527

65176528
/* make sure datatype is legal for a column */
65186529
CheckAttributeType(colName,targettype,targetcollid, false);
@@ -6527,7 +6538,7 @@ ATPrepAlterColumnType(List **wqueue,
65276538
* because we need the expression to be parsed against the original table
65286539
* rowtype.
65296540
*/
6530-
if (cmd->transform)
6541+
if (transform)
65316542
{
65326543
RangeTblEntry*rte;
65336544

@@ -6539,7 +6550,7 @@ ATPrepAlterColumnType(List **wqueue,
65396550
true);
65406551
addRTEtoQuery(pstate,rte, false, true, true);
65416552

6542-
transform=transformExpr(pstate,cmd->transform);
6553+
transform=transformExpr(pstate,transform);
65436554

65446555
/* It can't return a set */
65456556
if (expression_returns_set(transform))
@@ -6592,16 +6603,13 @@ ATPrepAlterColumnType(List **wqueue,
65926603
if (ATColumnChangeRequiresRewrite(transform,attnum))
65936604
tab->rewrite= true;
65946605
}
6595-
elseif (tab->relkind==RELKIND_FOREIGN_TABLE)
6596-
{
6597-
if (cmd->transform)
6598-
ereport(ERROR,
6599-
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
6600-
errmsg("ALTER TYPE USING is not supported on foreign tables")));
6601-
}
6606+
elseif (transform)
6607+
ereport(ERROR,
6608+
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
6609+
errmsg("ALTER TYPE USING is only supported on plain tables")));
66026610

6603-
if (tab->relkind==RELKIND_COMPOSITE_TYPE
6604-
||tab->relkind==RELKIND_FOREIGN_TABLE)
6611+
if (tab->relkind==RELKIND_COMPOSITE_TYPE||
6612+
tab->relkind==RELKIND_FOREIGN_TABLE)
66056613
{
66066614
/*
66076615
* For composite types, do this check now. Tables will check
@@ -6667,8 +6675,11 @@ ATColumnChangeRequiresRewrite(Node *expr, AttrNumber varattno)
66676675

66686676
staticvoid
66696677
ATExecAlterColumnType(AlteredTableInfo*tab,Relationrel,
6670-
constchar*colName,TypeName*typeName,LOCKMODElockmode)
6678+
AlterTableCmd*cmd,LOCKMODElockmode)
66716679
{
6680+
char*colName=cmd->name;
6681+
ColumnDef*def= (ColumnDef*)cmd->def;
6682+
TypeName*typeName=def->typeName;
66726683
HeapTupleheapTup;
66736684
Form_pg_attributeattTup;
66746685
AttrNumberattnum;
@@ -6705,9 +6716,11 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
67056716
colName)));
67066717

67076718
/* Look up the target type (should not fail, since prep found it) */
6708-
typeTuple=typenameType(NULL,typeName,&targettypmod,&targetcollid);
6719+
typeTuple=typenameType(NULL,typeName,&targettypmod);
67096720
tform= (Form_pg_type)GETSTRUCT(typeTuple);
67106721
targettype=HeapTupleGetOid(typeTuple);
6722+
/* And the collation */
6723+
targetcollid=GetColumnDefCollation(NULL,def,targettype);
67116724

67126725
/*
67136726
* If there is a default expression for the column, get it and ensure we

0 commit comments

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