mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CREATE DOMAIN ... DEFAULT NULL failed because gram.y special-cases DEFAULT

Browse Source 
NULL and DefineDomain didn't.  Bug goes all the way back to original coding
of domains.  Per bug #3396 from Sergey Burladyan.
This commit is contained in:
Tom Lane 2007-06-20 18:15:49 +00:00
parent 52ba24a156
commit a060d5ffdc
1 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/backend/commands/typecmds.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.105 2007/06/15 20:56:49 tgl Exp $ * $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.106 2007/06/20 18:15:49 tgl Exp $
* *
* DESCRIPTION * DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the * The "DefineFoo" routines take the parse tree and pick out the
@ -605,9 +605,9 @@ DefineDomain(CreateDomainStmt *stmt)
char typtype; char typtype;
Datum datum; Datum datum;
bool isnull; bool isnull;
Node *defaultExpr = NULL;
char *defaultValue = NULL; char *defaultValue = NULL;
char *defaultValueBin = NULL; char *defaultValueBin = NULL;
bool saw_default = false;
bool typNotNull = false; bool typNotNull = false;
bool nullDefined = false; bool nullDefined = false;
int32 typNDims = list_length(stmt->typename->arrayBounds); int32 typNDims = list_length(stmt->typename->arrayBounds);
@ -719,7 +719,6 @@ DefineDomain(CreateDomainStmt *stmt)
{ {
Node *newConstraint = lfirst(listptr); Node *newConstraint = lfirst(listptr);
Constraint *constr; Constraint *constr;
ParseState *pstate;
/* Check for unsupported constraint types */ /* Check for unsupported constraint types */
if (IsA(newConstraint, FkConstraint)) if (IsA(newConstraint, FkConstraint))
@ -740,19 +739,25 @@ DefineDomain(CreateDomainStmt *stmt)
/* /*
* The inherited default value may be overridden by the user * The inherited default value may be overridden by the user
* with the DEFAULT <expr> statement. * with the DEFAULT <expr> clause ... but only once.
*/ */
if (defaultExpr) if (saw_default)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("multiple default expressions"))); errmsg("multiple default expressions")));
saw_default = true;
if (constr->raw_expr)
{
ParseState *pstate;
Node *defaultExpr;
/* Create a dummy ParseState for transformExpr */ /* Create a dummy ParseState for transformExpr */
pstate = make_parsestate(NULL); pstate = make_parsestate(NULL);
/* /*
* Cook the constr->raw_expr into an expression. Note: Name is * Cook the constr->raw_expr into an expression.
* strictly for error message * Note: name is strictly for error message
*/ */
defaultExpr = cookDefault(pstate, constr->raw_expr, defaultExpr = cookDefault(pstate, constr->raw_expr,
basetypeoid, basetypeoid,
@ -760,15 +765,23 @@ DefineDomain(CreateDomainStmt *stmt)
domainName); domainName);
/* /*
* Expression must be stored as a nodeToString result, but we * Expression must be stored as a nodeToString result, but
* also require a valid textual representation (mainly to make * we also require a valid textual representation (mainly
* life easier for pg_dump). * to make life easier for pg_dump).
*/ */
defaultValue = deparse_expression(defaultExpr, defaultValue =
deparse_expression(defaultExpr,
deparse_context_for(domainName, deparse_context_for(domainName,
InvalidOid), InvalidOid),
false, false); false, false);
defaultValueBin = nodeToString(defaultExpr); defaultValueBin = nodeToString(defaultExpr);
}
else
{
/* DEFAULT NULL is same as not having a default */
defaultValue = NULL;
defaultValueBin = NULL;
}
break; break;
case CONSTR_NOTNULL: case CONSTR_NOTNULL: