From 5bb2300b59b74cdc7c8e3f0bf3c8d31c27657670 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 20 Nov 2000 20:36:57 +0000 Subject: Revise handling of oldstyle/newstyle functions per recent discussions in pghackers list. Support for oldstyle internal functions is gone (no longer needed, since conversion is complete) and pg_language entry 'internal' now implies newstyle call convention. pg_language entry 'newC' is gone; both old and newstyle dynamically loaded C functions are now called language 'C'. A newstyle function must be identified by an associated info routine. See src/backend/utils/fmgr/README. --- src/backend/commands/trigger.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/backend/commands/trigger.c') diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 22dfcac0524..cc31a0eb48b 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.80 2000/11/16 22:30:18 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.81 2000/11/20 20:36:47 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -169,10 +169,7 @@ CreateTrigger(CreateTrigStmt *stmt) funclang = ((Form_pg_proc) GETSTRUCT(tuple))->prolang; ReleaseSysCache(tuple); - if (funclang != ClanguageId && - funclang != NEWClanguageId && - funclang != INTERNALlanguageId && - funclang != NEWINTERNALlanguageId) + if (funclang != ClanguageId && funclang != INTERNALlanguageId) { HeapTuple langTup; @@ -180,10 +177,10 @@ CreateTrigger(CreateTrigStmt *stmt) ObjectIdGetDatum(funclang), 0, 0, 0); if (!HeapTupleIsValid(langTup)) - elog(ERROR, "CreateTrigger: cache lookup for PL %u failed", + elog(ERROR, "CreateTrigger: cache lookup for language %u failed", funclang); if (((Form_pg_language) GETSTRUCT(langTup))->lanispl == false) - elog(ERROR, "CreateTrigger: only builtin, C and PL functions are supported"); + elog(ERROR, "CreateTrigger: only internal, C and PL functions are supported"); ReleaseSysCache(langTup); } -- cgit v1.2.3