diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-10-06 00:55:35 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-10-06 00:55:35 +0000 |
| commit | 8e3384e35df25479371fb196ec49e58c7940a5a6 (patch) | |
| tree | f9a8b5a218e0491848f9244b50974440e1af4471 /src/backend/commands/tablecmds.c | |
| parent | 83a673808dc3a47363eae6388bea8571e2bc07a3 (diff) | |
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.
Diffstat (limited to 'src/backend/commands/tablecmds.c')
| -rw-r--r-- | src/backend/commands/tablecmds.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 6ea4457d817..a2bd54c183a 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.288.2.1 2009/08/07 15:28:07 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.288.2.2 2009/10/06 00:55:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -486,7 +486,7 @@ DefineRelation(CreateStmt *stmt, char relkind) cooked->contype = CONSTR_DEFAULT; cooked->name = NULL; cooked->attnum = attnum; - cooked->expr = stringToNode(colDef->cooked_default); + cooked->expr = colDef->cooked_default; cooked->is_local = true; /* not used for defaults */ cooked->inhcount = 0; /* ditto */ cookedDefaults = lappend(cookedDefaults, cooked); @@ -1136,8 +1136,8 @@ MergeAttributes(List *schema, List *supers, bool istemp, List *constraints = NIL; int parentsWithOids = 0; bool have_bogus_defaults = false; - char *bogus_marker = "Bogus!"; /* marks conflicting defaults */ int child_attno; + static Node bogus_marker = { 0 }; /* marks conflicting defaults */ /* * Check for and reject tables with too many columns. We perform this @@ -1321,7 +1321,7 @@ MergeAttributes(List *schema, List *supers, bool istemp, */ if (attribute->atthasdef) { - char *this_default = NULL; + Node *this_default = NULL; AttrDefault *attrdef; int i; @@ -1332,7 +1332,7 @@ MergeAttributes(List *schema, List *supers, bool istemp, { if (attrdef[i].adnum == parent_attno) { - this_default = attrdef[i].adbin; + this_default = stringToNode(attrdef[i].adbin); break; } } @@ -1350,10 +1350,10 @@ MergeAttributes(List *schema, List *supers, bool istemp, */ Assert(def->raw_default == NULL); if (def->cooked_default == NULL) - def->cooked_default = pstrdup(this_default); - else if (strcmp(def->cooked_default, this_default) != 0) + def->cooked_default = this_default; + else if (!equal(def->cooked_default, this_default)) { - def->cooked_default = bogus_marker; + def->cooked_default = &bogus_marker; have_bogus_defaults = true; } } @@ -1492,7 +1492,7 @@ MergeAttributes(List *schema, List *supers, bool istemp, { ColumnDef *def = lfirst(entry); - if (def->cooked_default == bogus_marker) + if (def->cooked_default == &bogus_marker) ereport(ERROR, (errcode(ERRCODE_INVALID_COLUMN_DEFINITION), errmsg("column \"%s\" inherits conflicting default values", |