diff options
| author | Bruce Momjian <bruce@momjian.us> | 1999-11-07 23:08:36 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1999-11-07 23:08:36 +0000 |
| commit | 86ef36c9078311d5ccba53c17702af0450b11e25 (patch) | |
| tree | a37836f78c4328e4b3a3ad6308a3779725546525 /src/backend/commands/trigger.c | |
| parent | df723a8a8aa3326d2ade8ad846a296e2e2500a64 (diff) | |
| download | postgresql-86ef36c9078311d5ccba53c17702af0450b11e25.tar.gz postgresql-86ef36c9078311d5ccba53c17702af0450b11e25.zip | |
New NameStr macro to convert Name to Str. No need for var.data anymore.
Fewer calls to nameout.
Better use of RelationGetRelationName.
Diffstat (limited to 'src/backend/commands/trigger.c')
| -rw-r--r-- | src/backend/commands/trigger.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 1bec6aa7626..cf68bbb8a70 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -391,8 +391,8 @@ RelationRemoveTriggers(Relation rel) pg_trigger = (Form_pg_trigger) GETSTRUCT(tup); refrel = heap_open(pg_trigger->tgrelid, NoLock); - stmt.relname = nameout(&(refrel->rd_rel->relname)); - stmt.trigname = nameout(&(pg_trigger->tgname)); + stmt.relname = pstrdup(RelationGetRelationName(refrel)); + stmt.trigname = nameout(&pg_trigger->tgname); DropTrigger(&stmt); @@ -450,7 +450,7 @@ RelationBuildTriggers(Relation relation) continue; if (found == ntrigs) elog(ERROR, "RelationBuildTriggers: unexpected record found for rel %.*s", - NAMEDATALEN, relation->rd_rel->relname.data); + NAMEDATALEN, RelationGetRelationName(relation)); pg_trigger = (Form_pg_trigger) GETSTRUCT(&tuple); @@ -461,7 +461,7 @@ RelationBuildTriggers(Relation relation) build = &(triggers[found]); build->tgoid = tuple.t_data->t_oid; - build->tgname = nameout(&(pg_trigger->tgname)); + build->tgname = nameout(&pg_trigger->tgname); build->tgfoid = pg_trigger->tgfoid; build->tgfunc.fn_addr = NULL; build->tgtype = pg_trigger->tgtype; @@ -476,7 +476,7 @@ RelationBuildTriggers(Relation relation) tgrel->rd_att, &isnull); if (isnull) elog(ERROR, "RelationBuildTriggers: tgargs IS NULL for rel %.*s", - NAMEDATALEN, relation->rd_rel->relname.data); + NAMEDATALEN, RelationGetRelationName(relation)); if (build->tgnargs > 0) { char *p; @@ -487,7 +487,7 @@ RelationBuildTriggers(Relation relation) tgrel->rd_att, &isnull); if (isnull) elog(ERROR, "RelationBuildTriggers: tgargs IS NULL for rel %.*s", - NAMEDATALEN, relation->rd_rel->relname.data); + NAMEDATALEN, RelationGetRelationName(relation)); p = (char *) VARDATA(val); build->tgargs = (char **) palloc(build->tgnargs * sizeof(char *)); for (i = 0; i < build->tgnargs; i++) @@ -507,7 +507,7 @@ RelationBuildTriggers(Relation relation) if (found < ntrigs) elog(ERROR, "RelationBuildTriggers: %d record not found for rel %.*s", ntrigs - found, - NAMEDATALEN, relation->rd_rel->relname.data); + NAMEDATALEN, RelationGetRelationName(relation)); index_endscan(sd); pfree(sd); |