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

Commitbeaf5ae

Browse files
committed
Fix ALTER TABLE ADD COLUMN so that constraints of domain types are
enforced properly when there is no explicit default value for the newcolumn. Per report from Craig Perras.
1 parentad538d8 commitbeaf5ae

File tree

2 files changed

+44
-12
lines changed

2 files changed

+44
-12
lines changed

‎src/backend/commands/tablecmds.c‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.142 2005/01/10 20:02:20 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.143 2005/01/24 23:21:57 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -35,6 +35,7 @@
3535
#include"commands/tablecmds.h"
3636
#include"commands/tablespace.h"
3737
#include"commands/trigger.h"
38+
#include"commands/typecmds.h"
3839
#include"executor/executor.h"
3940
#include"lib/stringinfo.h"
4041
#include"miscadmin.h"
@@ -2853,6 +2854,7 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
28532854
intminattnum,
28542855
maxatts;
28552856
HeapTupletypeTuple;
2857+
OidtypeOid;
28562858
Form_pg_typetform;
28572859
Expr*defval;
28582860

@@ -2930,9 +2932,10 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
29302932

29312933
typeTuple=typenameType(colDef->typename);
29322934
tform= (Form_pg_type)GETSTRUCT(typeTuple);
2935+
typeOid=HeapTupleGetOid(typeTuple);
29332936

29342937
/* make sure datatype is legal for a column */
2935-
CheckAttributeType(colDef->colname,HeapTupleGetOid(typeTuple));
2938+
CheckAttributeType(colDef->colname,typeOid);
29362939

29372940
attributeTuple=heap_addheader(Natts_pg_attribute,
29382941
false,
@@ -2943,7 +2946,7 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
29432946

29442947
attribute->attrelid=myrelid;
29452948
namestrcpy(&(attribute->attname),colDef->colname);
2946-
attribute->atttypid=HeapTupleGetOid(typeTuple);
2949+
attribute->atttypid=typeOid;
29472950
attribute->attstattarget=-1;
29482951
attribute->attlen=tform->typlen;
29492952
attribute->attcacheoff=-1;
@@ -3015,11 +3018,37 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
30153018
* and return NULL if so, so without any modification of the tuple
30163019
* data we will get the effect of NULL values in the new column.
30173020
*
3021+
* An exception occurs when the new column is of a domain type: the
3022+
* domain might have a NOT NULL constraint, or a check constraint that
3023+
* indirectly rejects nulls. If there are any domain constraints then
3024+
* we construct an explicit NULL default value that will be passed through
3025+
* CoerceToDomain processing. (This is a tad inefficient, since it
3026+
* causes rewriting the table which we really don't have to do, but
3027+
* the present design of domain processing doesn't offer any simple way
3028+
* of checking the constraints more directly.)
3029+
*
30183030
* Note: we use build_column_default, and not just the cooked default
30193031
* returned by AddRelationRawConstraints, so that the right thing
30203032
* happens when a datatype's default applies.
30213033
*/
30223034
defval= (Expr*)build_column_default(rel,attribute->attnum);
3035+
3036+
if (!defval&&GetDomainConstraints(typeOid)!=NIL)
3037+
{
3038+
Oidbasetype=getBaseType(typeOid);
3039+
3040+
defval= (Expr*)makeNullConst(basetype);
3041+
defval= (Expr*)coerce_to_target_type(NULL,
3042+
(Node*)defval,
3043+
basetype,
3044+
typeOid,
3045+
colDef->typename->typmod,
3046+
COERCION_ASSIGNMENT,
3047+
COERCE_IMPLICIT_CAST);
3048+
if (defval==NULL)/* should not happen */
3049+
elog(ERROR,"failed to coerce base type to domain");
3050+
}
3051+
30233052
if (defval)
30243053
{
30253054
NewColumnValue*newval;

‎src/backend/commands/typecmds.c‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.65 2004/12/3121:59:42 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.66 2005/01/24 23:21:57 tgl Exp $
1212
*
1313
* DESCRIPTION
1414
* The "DefineFoo" routines take the parse tree and pick out the
@@ -1929,6 +1929,9 @@ domainAddConstraint(Oid domainOid, Oid domainNamespace, Oid baseTypeOid,
19291929
* This is called by the executor during plan startup for a CoerceToDomain
19301930
* expression node. The given constraints will be checked for each value
19311931
* passed through the node.
1932+
*
1933+
* We allow this to be called for non-domain types, in which case the result
1934+
* is always NIL.
19321935
*/
19331936
List*
19341937
GetDomainConstraints(OidtypeOid)
@@ -1954,6 +1957,13 @@ GetDomainConstraints(Oid typeOid)
19541957
elog(ERROR,"cache lookup failed for type %u",typeOid);
19551958
typTup= (Form_pg_type)GETSTRUCT(tup);
19561959

1960+
if (typTup->typtype!='d')
1961+
{
1962+
/* Not a domain, so done */
1963+
ReleaseSysCache(tup);
1964+
break;
1965+
}
1966+
19571967
/* Test for NOT NULL Constraint */
19581968
if (typTup->typnotnull)
19591969
notNull= true;
@@ -2010,14 +2020,7 @@ GetDomainConstraints(Oid typeOid)
20102020

20112021
systable_endscan(scan);
20122022

2013-
if (typTup->typtype!='d')
2014-
{
2015-
/* Not a domain, so done */
2016-
ReleaseSysCache(tup);
2017-
break;
2018-
}
2019-
2020-
/* else loop to next domain in stack */
2023+
/* loop to next domain in stack */
20212024
typeOid=typTup->typbasetype;
20222025
ReleaseSysCache(tup);
20232026
}

0 commit comments

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