diff options
Diffstat (limited to 'src/backend/commands/tablecmds.c')
| -rw-r--r-- | src/backend/commands/tablecmds.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 8023ba83420..cda8687e448 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.53 2002/11/11 22:19:21 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.54 2002/11/15 02:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -2632,14 +2632,16 @@ AlterTableAddConstraint(Oid myrelid, bool recurse, */ if (constr->name) { - if (ConstraintNameIsUsed(RelationGetRelid(rel), + if (ConstraintNameIsUsed(CONSTRAINT_RELATION, + RelationGetRelid(rel), RelationGetNamespace(rel), constr->name)) elog(ERROR, "constraint \"%s\" already exists for relation \"%s\"", constr->name, RelationGetRelationName(rel)); } else - constr->name = GenerateConstraintName(RelationGetRelid(rel), + constr->name = GenerateConstraintName(CONSTRAINT_RELATION, + RelationGetRelid(rel), RelationGetNamespace(rel), &counter); @@ -2668,7 +2670,8 @@ AlterTableAddConstraint(Oid myrelid, bool recurse, */ if (fkconstraint->constr_name) { - if (ConstraintNameIsUsed(RelationGetRelid(rel), + if (ConstraintNameIsUsed(CONSTRAINT_RELATION, + RelationGetRelid(rel), RelationGetNamespace(rel), fkconstraint->constr_name)) elog(ERROR, "constraint \"%s\" already exists for relation \"%s\"", @@ -2676,7 +2679,8 @@ AlterTableAddConstraint(Oid myrelid, bool recurse, RelationGetRelationName(rel)); } else - fkconstraint->constr_name = GenerateConstraintName(RelationGetRelid(rel), + fkconstraint->constr_name = GenerateConstraintName(CONSTRAINT_RELATION, + RelationGetRelid(rel), RelationGetNamespace(rel), &counter); @@ -2734,7 +2738,7 @@ AlterTableAddCheckConstraint(Relation rel, Constraint *constr) /* * Convert the A_EXPR in raw_expr into an EXPR */ - expr = transformExpr(pstate, constr->raw_expr); + expr = transformExpr(pstate, constr->raw_expr, NULL); /* * Make sure it yields a boolean result. |