From 6ebc90b0455ffe9dc0bcaf85185b2746008003f6 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 19 Aug 2002 15:08:47 +0000 Subject: Remove Ident nodetype in favor of using String nodes; this fixes some latent wrong-struct-type bugs and makes the coding style more uniform, since the majority of places working with lists of column names were already using Strings not Idents. While at it, remove vestigial support for Stream node type, and otherwise-unreferenced nodes.h entries for T_TupleCount and T_BaseNode. NB: full recompile is recommended due to changes of Node type numbers. This shouldn't force an initdb though. --- src/backend/commands/tablecmds.c | 47 +++++++++++++++------------------------- 1 file changed, 17 insertions(+), 30 deletions(-) (limited to 'src/backend/commands/tablecmds.c') diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 72ecd6d0ce4..c6e8d686d41 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.29 2002/08/15 16:36:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.30 2002/08/19 15:08:46 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2677,17 +2677,17 @@ validateForeignKeyConstraint(FkConstraint *fkconstraint, count = 4; foreach(list, fkconstraint->fk_attrs) { - Ident *fk_at = lfirst(list); + char *fk_at = strVal(lfirst(list)); - trig.tgargs[count] = fk_at->name; + trig.tgargs[count] = fk_at; count += 2; } count = 5; foreach(list, fkconstraint->pk_attrs) { - Ident *pk_at = lfirst(list); + char *pk_at = strVal(lfirst(list)); - trig.tgargs[count] = pk_at->name; + trig.tgargs[count] = pk_at; count += 2; } trig.tgnargs = count - 1; @@ -2746,13 +2746,13 @@ createForeignKeyConstraint(Relation rel, Relation pkrel, i = 0; foreach(l, fkconstraint->fk_attrs) { - Ident *id = (Ident *) lfirst(l); + char *id = strVal(lfirst(l)); AttrNumber attno; - attno = get_attnum(RelationGetRelid(rel), id->name); + attno = get_attnum(RelationGetRelid(rel), id); if (attno == InvalidAttrNumber) elog(ERROR, "Relation \"%s\" has no column \"%s\"", - RelationGetRelationName(rel), id->name); + RelationGetRelationName(rel), id); fkattr[i++] = attno; } @@ -2762,13 +2762,13 @@ createForeignKeyConstraint(Relation rel, Relation pkrel, i = 0; foreach(l, fkconstraint->pk_attrs) { - Ident *id = (Ident *) lfirst(l); + char *id = strVal(lfirst(l)); AttrNumber attno; - attno = get_attnum(RelationGetRelid(pkrel), id->name); + attno = get_attnum(RelationGetRelid(pkrel), id); if (attno == InvalidAttrNumber) elog(ERROR, "Relation \"%s\" has no column \"%s\"", - RelationGetRelationName(pkrel), id->name); + RelationGetRelationName(pkrel), id); pkattr[i++] = attno; } @@ -2804,7 +2804,6 @@ createForeignKeyTriggers(Relation rel, FkConstraint *fkconstraint, CreateTrigStmt *fk_trigger; List *fk_attr; List *pk_attr; - Ident *id; ObjectAddress trigobj, constrobj; @@ -2867,12 +2866,8 @@ createForeignKeyTriggers(Relation rel, FkConstraint *fkconstraint, while (fk_attr != NIL) { - id = (Ident *) lfirst(fk_attr); - fk_trigger->args = lappend(fk_trigger->args, makeString(id->name)); - - id = (Ident *) lfirst(pk_attr); - fk_trigger->args = lappend(fk_trigger->args, makeString(id->name)); - + fk_trigger->args = lappend(fk_trigger->args, lfirst(fk_attr)); + fk_trigger->args = lappend(fk_trigger->args, lfirst(pk_attr)); fk_attr = lnext(fk_attr); pk_attr = lnext(pk_attr); } @@ -2942,12 +2937,8 @@ createForeignKeyTriggers(Relation rel, FkConstraint *fkconstraint, pk_attr = fkconstraint->pk_attrs; while (fk_attr != NIL) { - id = (Ident *) lfirst(fk_attr); - fk_trigger->args = lappend(fk_trigger->args, makeString(id->name)); - - id = (Ident *) lfirst(pk_attr); - fk_trigger->args = lappend(fk_trigger->args, makeString(id->name)); - + fk_trigger->args = lappend(fk_trigger->args, lfirst(fk_attr)); + fk_trigger->args = lappend(fk_trigger->args, lfirst(pk_attr)); fk_attr = lnext(fk_attr); pk_attr = lnext(pk_attr); } @@ -3017,12 +3008,8 @@ createForeignKeyTriggers(Relation rel, FkConstraint *fkconstraint, pk_attr = fkconstraint->pk_attrs; while (fk_attr != NIL) { - id = (Ident *) lfirst(fk_attr); - fk_trigger->args = lappend(fk_trigger->args, makeString(id->name)); - - id = (Ident *) lfirst(pk_attr); - fk_trigger->args = lappend(fk_trigger->args, makeString(id->name)); - + fk_trigger->args = lappend(fk_trigger->args, lfirst(fk_attr)); + fk_trigger->args = lappend(fk_trigger->args, lfirst(pk_attr)); fk_attr = lnext(fk_attr); pk_attr = lnext(pk_attr); } -- cgit v1.2.3