mirror of
https://github.com/postgres/postgres.git
synced 2025-06-16 06:01:02 +03:00
Change CREATE TABLE so that column default expressions coming from different
inheritance parent tables are compared using equal(), instead of doing strcmp() on the nodeToString representation. The old implementation was always a tad cheesy, and it finally fails completely as of 8.4, now that the node tree might contain syntax location information. equal() knows it's supposed to ignore those fields, but strcmp() hardly can. Per recent report from Scott Ribe.
This commit is contained in:
@ -19,7 +19,7 @@
|
||||
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/backend/parser/parse_utilcmd.c,v 2.25 2009/07/30 02:45:37 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/parser/parse_utilcmd.c,v 2.26 2009/10/06 00:55:26 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -644,7 +644,7 @@ transformInhRelation(ParseState *pstate, CreateStmtContext *cxt,
|
||||
*/
|
||||
if (attribute->atthasdef && including_defaults)
|
||||
{
|
||||
char *this_default = NULL;
|
||||
Node *this_default = NULL;
|
||||
AttrDefault *attrdef;
|
||||
int i;
|
||||
|
||||
@ -655,7 +655,7 @@ transformInhRelation(ParseState *pstate, CreateStmtContext *cxt,
|
||||
{
|
||||
if (attrdef[i].adnum == parent_attno)
|
||||
{
|
||||
this_default = attrdef[i].adbin;
|
||||
this_default = stringToNode(attrdef[i].adbin);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -666,7 +666,7 @@ transformInhRelation(ParseState *pstate, CreateStmtContext *cxt,
|
||||
* but it can't; so default is ready to apply to child.
|
||||
*/
|
||||
|
||||
def->cooked_default = pstrdup(this_default);
|
||||
def->cooked_default = this_default;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user