From 61aca818c486dbe000ce94c77cb1dd1f379baf67 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 3 Aug 2000 19:19:38 +0000 Subject: Modify heap_open()/heap_openr() API per pghackers discussion of 11 July. These two routines will now ALWAYS elog() on failure, whether you ask for a lock or not. If you really want to get a NULL return on failure, call the new routines heap_open_nofail()/heap_openr_nofail(). By my count there are only about three places that actually want that behavior. There were rather more than three places that were missing the check they needed to make under the old convention :-(. --- src/backend/commands/trigger.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/backend/commands/trigger.c') diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 17e61a379fb..a03f140b64f 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.74 2000/08/03 16:34:01 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.75 2000/08/03 19:19:18 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -92,9 +92,6 @@ CreateTrigger(CreateTrigStmt *stmt) * interested in getting the relation's OID... */ rel = heap_openr(stmt->constrrelname, NoLock); - if (rel == NULL) - elog(ERROR, "table \"%s\" does not exist", - stmt->constrrelname); constrrelid = rel->rd_id; heap_close(rel, NoLock); } @@ -440,12 +437,12 @@ RelationRemoveTriggers(Relation rel) pg_trigger = (Form_pg_trigger) GETSTRUCT(tup); refrel = heap_open(pg_trigger->tgrelid, NoLock); - stmt.relname = pstrdup(RelationGetRelationName(refrel)); + heap_close(refrel, NoLock); + stmt.trigname = DatumGetCString(DirectFunctionCall1(nameout, NameGetDatum(&pg_trigger->tgname))); - heap_close(refrel, NoLock); elog(NOTICE, "DROP TABLE implicitly drops referential integrity trigger from table \"%s\"", stmt.relname); -- cgit v1.2.3