open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Now we are able to CREATE PROCEDURAL LANGUAGE (Thanks, Jan).

Browse Source
REL6_4
Vadim B. Mikheev 28 years ago
parent 9db2992640
commit 7bff4c5078
16 changed files with 638 additions and 145 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      src/backend/commands/Makefile
  2. 53
      src/backend/commands/define.c
  3. 205
      src/backend/commands/proclang.c
  4. 108
      src/backend/commands/trigger.c
  5. 51
      src/backend/parser/gram.y
  6. 6
      src/backend/parser/keywords.c
  7. 24
      src/backend/tcop/utility.c
  8. 8
      src/backend/utils/Gen_fmgrtab.sh.in
  9. 21
      src/backend/utils/cache/syscache.c
  10. 107
      src/backend/utils/fmgr/fmgr.c
  11. 20
      src/include/catalog/pg_language.h
  12. 17
      src/include/commands/proclang.h
  13. 4
      src/include/nodes/nodes.h
  14. 143
      src/include/nodes/parsenodes.h
  15. 3
      src/include/utils/rel.h
  16. 3
      src/include/utils/syscache.h

4
src/backend/commands/Makefile
Unescape View File

@ -4,7 +4,7 @@
# Makefile for commands # Makefile for commands
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.4 1997/08/31 11:40:12 vadim Exp $ # $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.5 1997/10/28 14:54:43 vadim Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -19,7 +19,7 @@ CFLAGS+=$(INCLUDE_OPT)
OBJS = async.o creatinh.o command.o copy.o defind.o define.o \ OBJS = async.o creatinh.o command.o copy.o defind.o define.o \
purge.o remove.o rename.o vacuum.o version.o view.o cluster.o \ purge.o remove.o rename.o vacuum.o version.o view.o cluster.o \
recipe.o explain.o sequence.o trigger.o recipe.o explain.o sequence.o trigger.o proclang.o
all: SUBSYS.o all: SUBSYS.o

53
src/backend/commands/define.c
Unescape View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.16 1997/09/08 21:42:38 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.17 1997/10/28 14:54:46 vadim Exp $
* *
* DESCRIPTION * DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the * The "DefineFoo" routines take the parse tree and pick out the
@ -45,6 +45,7 @@
#include <catalog/pg_operator.h> #include <catalog/pg_operator.h>
#include <catalog/pg_proc.h> #include <catalog/pg_proc.h>
#include <catalog/pg_type.h> #include <catalog/pg_type.h>
#include <catalog/pg_language.h>
#include <utils/syscache.h> #include <utils/syscache.h>
#include <fmgr.h> /* for fmgr */ #include <fmgr.h> /* for fmgr */
#include <utils/builtins.h> /* prototype for textin() */ #include <utils/builtins.h> /* prototype for textin() */
@ -239,6 +240,8 @@ CreateFunction(ProcedureStmt *stmt, CommandDest dest)
bool canCache; bool canCache;
bool returnsSet; bool returnsSet;
bool lanisPL = false;
/* The function returns a set of values, as opposed to a singleton. */ /* The function returns a set of values, as opposed to a singleton. */
@ -262,19 +265,59 @@ CreateFunction(ProcedureStmt *stmt, CommandDest dest)
} }
else else
{ {
elog(WARN, HeapTuple languageTuple;
Form_pg_language languageStruct;
/* Lookup the language in the system cache */
languageTuple = SearchSysCacheTuple(LANNAME,
PointerGetDatum(languageName),
0, 0, 0);
if (!HeapTupleIsValid(languageTuple)) {
elog(WARN,
"Unrecognized language specified in a CREATE FUNCTION: " "Unrecognized language specified in a CREATE FUNCTION: "
"'%s'. Recognized languages are sql, C, and internal.", "'%s'. Recognized languages are sql, C, internal "
"and the created procedural languages.",
languageName); languageName);
}
/* Check that this language is a PL */
languageStruct = (Form_pg_language) GETSTRUCT(languageTuple);
if (!(languageStruct->lanispl)) {
elog(WARN,
"Language '%s' isn't defined as PL", languageName);
}
/*
* Functions in untrusted procedural languages are
* restricted to be defined by postgres superusers only
*/
if (languageStruct->lanpltrusted == false && !superuser()) {
elog(WARN, "Only users with Postgres superuser privilege "
"are permitted to create a function in the '%s' "
"language.",
languageName);
}
lanisPL = true;
/*
* These are meaningless
*/
perbyte_cpu = percall_cpu = 0;
byte_pct = outin_ratio = 100;
canCache = false;
} }
interpret_AS_clause(languageName, stmt->as, &prosrc_str, &probin_str); interpret_AS_clause(languageName, stmt->as, &prosrc_str, &probin_str);
if (strcmp(languageName, "sql") != 0 && !superuser()) if (strcmp(languageName, "sql") != 0 && lanisPL == false && !superuser())
elog(WARN, elog(WARN,
"Only users with Postgres superuser privilege are permitted " "Only users with Postgres superuser privilege are permitted "
"to create a function " "to create a function "
"in the '%s' language. Others may use the 'sql' language.", "in the '%s' language. Others may use the 'sql' language "
"or the created procedural languages.",
languageName); languageName);
/* Above does not return. */ /* Above does not return. */
else else

205
src/backend/commands/proclang.c
Unescape View File

@ -0,0 +1,205 @@
/*-------------------------------------------------------------------------
*
* proclang.c--
* PostgreSQL PROCEDURAL LANGUAGE support code.
*
*-------------------------------------------------------------------------
*/
#include <ctype.h>
#include <string.h>
#include "postgres.h"
#include "access/heapam.h"
#include "catalog/catname.h"
#include "catalog/pg_user.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_language.h"
#include "utils/syscache.h"
#include "commands/proclang.h"
#include "fmgr.h"
static void
case_translate_language_name(const char *input, char *output)
{
/*-------------------------------------------------------------------------
Translate the input language name to lower case, except if it's C,
translate to upper case.
--------------------------------------------------------------------------*/
int i;
for (i = 0; i < NAMEDATALEN && input[i] != '\0'; ++i)
output[i] = tolower(input[i]);
output[i] = '\0';
if (strcmp(output, "c") == 0)
output[0] = 'C';
}
/* ---------------------------------------------------------------------
* CREATE PROCEDURAL LANGUAGE
* ---------------------------------------------------------------------
*/
void
CreateProceduralLanguage(CreatePLangStmt * stmt)
{
char languageName[NAMEDATALEN];
HeapTuple langTup;
HeapTuple procTup;
Oid typev[8];
char nulls[Natts_pg_language];
Datum values[Natts_pg_language];
Relation rdesc;
HeapTuple tup;
TupleDesc tupDesc;
int i;
/* ----------------
* Check permission
* ----------------
*/
if (!superuser())
{
elog(WARN, "Only users with Postgres superuser privilege are "
"permitted to create procedural languages");
}
/* ----------------
* Translate the language name and check that
* this language doesn't already exist
* ----------------
*/
case_translate_language_name(stmt->plname, languageName);
langTup = SearchSysCacheTuple(LANNAME,
PointerGetDatum(languageName),
0, 0, 0);
if (HeapTupleIsValid(langTup))
{
elog(WARN, "Language %s already exists", languageName);
}
/* ----------------
* Lookup the PL handler function and check that it is
* of return type Opaque
* ----------------
*/
memset(typev, 0, sizeof(typev));
procTup = SearchSysCacheTuple(PRONAME,
PointerGetDatum(stmt->plhandler),
UInt16GetDatum(0),
PointerGetDatum(typev),
0);
if (!HeapTupleIsValid(procTup))
{
elog(WARN, "PL handler function %s() doesn't exist",
stmt->plhandler);
}
if (((Form_pg_proc) GETSTRUCT(procTup))->prorettype != InvalidOid)
{
elog(WARN, "PL handler function %s() isn't of return type Opaque",
stmt->plhandler);
}
/* ----------------
* Insert the new language into pg_language
* ----------------
*/
for (i = 0; i < Natts_pg_language; i++)
{
nulls[i] = ' ';
values[i] = (Datum) NULL;
}
i = 0;
values[i++] = PointerGetDatum(languageName);
values[i++] = Int8GetDatum((bool) 1);
values[i++] = Int8GetDatum(stmt->pltrusted);
values[i++] = ObjectIdGetDatum(procTup->t_oid);
values[i++] = (Datum) fmgr(TextInRegProcedure, stmt->plcompiler);
rdesc = heap_openr(LanguageRelationName);
tupDesc = rdesc->rd_att;
tup = heap_formtuple(tupDesc, values, nulls);
heap_insert(rdesc, tup);
heap_close(rdesc);
return;
}
/* ---------------------------------------------------------------------
* DROP PROCEDURAL LANGUAGE
* ---------------------------------------------------------------------
*/
void
DropProceduralLanguage(DropPLangStmt * stmt)
{
char languageName[NAMEDATALEN];
HeapTuple langTup;
Relation rdesc;
HeapScanDesc scanDesc;
ScanKeyData scanKeyData;
HeapTuple tup;
/* ----------------
* Check permission
* ----------------
*/
if (!superuser())
{
elog(WARN, "Only users with Postgres superuser privilege are "
"permitted to drop procedural languages");
}
/* ----------------
* Translate the language name, check that
* this language exist and is a PL
* ----------------
*/
case_translate_language_name(stmt->plname, languageName);
langTup = SearchSysCacheTuple(LANNAME,
PointerGetDatum(languageName),
0, 0, 0);
if (!HeapTupleIsValid(langTup))
{
elog(WARN, "Language %s doesn't exist", languageName);
}
if (!((Form_pg_language) GETSTRUCT(langTup))->lanispl)
{
elog(WARN, "Language %s isn't a created procedural language",
languageName);
}
/* ----------------
* Now scan pg_language and delete the PL tuple
* ----------------
*/
rdesc = heap_openr(LanguageRelationName);
ScanKeyEntryInitialize(&scanKeyData, 0, Anum_pg_language_lanname,
F_NAMEEQ, PointerGetDatum(languageName));
scanDesc = heap_beginscan(rdesc, 0, NowTimeQual, 1, &scanKeyData);
tup = heap_getnext(scanDesc, 0, (Buffer *) NULL);
if (!HeapTupleIsValid(tup))
{
elog(WARN, "Language with name '%s' not found", languageName);
}
heap_delete(rdesc, &(tup->t_ctid));
heap_endscan(scanDesc);
heap_close(rdesc);
}

108
src/backend/commands/trigger.c
Unescape View File

@ -26,11 +26,11 @@
#include "utils/mcxt.h" #include "utils/mcxt.h"
#include "utils/inval.h" #include "utils/inval.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/syscache.h"
#ifndef NO_SECURITY #ifndef NO_SECURITY
#include "miscadmin.h" #include "miscadmin.h"
#include "utils/acl.h" #include "utils/acl.h"
#include "utils/syscache.h"
#endif #endif
TriggerData *CurrentTriggerData = NULL; TriggerData *CurrentTriggerData = NULL;
@ -87,7 +87,7 @@ CreateTrigger(CreateTrigStmt * stmt)
if (stmt->row) if (stmt->row)
TRIGGER_SETT_ROW(tgtype); TRIGGER_SETT_ROW(tgtype);
else else
elog (WARN, "CreateTrigger: STATEMENT triggers are unimplemented, yet"); elog(WARN, "CreateTrigger: STATEMENT triggers are unimplemented, yet");
for (i = 0; i < 3 && stmt->actions[i]; i++) for (i = 0; i < 3 && stmt->actions[i]; i++)
{ {
@ -142,7 +142,22 @@ CreateTrigger(CreateTrigStmt * stmt)
elog(WARN, "CreateTrigger: function %s () does not exist", stmt->funcname); elog(WARN, "CreateTrigger: function %s () does not exist", stmt->funcname);
if (((Form_pg_proc) GETSTRUCT(tuple))->prolang != ClanguageId) if (((Form_pg_proc) GETSTRUCT(tuple))->prolang != ClanguageId)
elog(WARN, "CreateTrigger: only C functions are supported"); {
HeapTuple langTup;
langTup = SearchSysCacheTuple(LANOID,
ObjectIdGetDatum(((Form_pg_proc) GETSTRUCT(tuple))->prolang),
0, 0, 0);
if (!HeapTupleIsValid(langTup))
{
elog(WARN, "CreateTrigger: cache lookup for PL failed");
}
if (((Form_pg_language) GETSTRUCT(langTup))->lanispl == false)
{
elog(WARN, "CreateTrigger: only C and PL functions are supported");
}
}
MemSet(nulls, ' ', Natts_pg_trigger * sizeof(char)); MemSet(nulls, ' ', Natts_pg_trigger * sizeof(char));
@ -159,10 +174,10 @@ CreateTrigger(CreateTrigStmt * stmt)
foreach(le, stmt->args) foreach(le, stmt->args)
{ {
char *ar = (char *) lfirst(le); char *ar = (char *) lfirst(le);
len += strlen(ar) + 4; len += strlen(ar) + 4;
for ( ; *ar; ar++) for (; *ar; ar++)
{ {
if (*ar == '\\') if (*ar == '\\')
len++; len++;
@ -172,8 +187,8 @@ CreateTrigger(CreateTrigStmt * stmt)
args[0] = 0; args[0] = 0;
foreach(le, stmt->args) foreach(le, stmt->args)
{ {
char *s = (char *) lfirst(le); char *s = (char *) lfirst(le);
char *d = args + strlen(args); char *d = args + strlen(args);
while (*s) while (*s)
{ {
@ -399,6 +414,7 @@ RelationBuildTriggers(Relation relation)
build->tgname = nameout(&(pg_trigger->tgname)); build->tgname = nameout(&(pg_trigger->tgname));
build->tgfoid = pg_trigger->tgfoid; build->tgfoid = pg_trigger->tgfoid;
build->tgfunc = NULL; build->tgfunc = NULL;
build->tgplfunc = NULL;
build->tgtype = pg_trigger->tgtype; build->tgtype = pg_trigger->tgtype;
build->tgnargs = pg_trigger->tgnargs; build->tgnargs = pg_trigger->tgnargs;
memcpy(build->tgattr, &(pg_trigger->tgattr), 8 * sizeof(int16)); memcpy(build->tgattr, &(pg_trigger->tgattr), 8 * sizeof(int16));
@ -578,6 +594,54 @@ DescribeTrigger(TriggerDesc * trigdesc, Trigger * trigger)
} }
static HeapTuple
ExecCallTriggerFunc(Trigger * trigger)
{
if (trigger->tgfunc != NULL)
{
return (HeapTuple) ((*(trigger->tgfunc)) ());
}
if (trigger->tgplfunc == NULL)
{
HeapTuple procTuple;
HeapTuple langTuple;
Form_pg_proc procStruct;
Form_pg_language langStruct;
int nargs;
procTuple = SearchSysCacheTuple(PROOID,
ObjectIdGetDatum(trigger->tgfoid),
0, 0, 0);
if (!HeapTupleIsValid(procTuple))
{
elog(WARN, "ExecCallTriggerFunc(): Cache lookup for proc %ld failed",
ObjectIdGetDatum(trigger->tgfoid));
}
procStruct = (Form_pg_proc) GETSTRUCT(procTuple);
langTuple = SearchSysCacheTuple(LANOID,
ObjectIdGetDatum(procStruct->prolang),
0, 0, 0);
if (!HeapTupleIsValid(langTuple))
{
elog(WARN, "ExecCallTriggerFunc(): Cache lookup for language %ld failed",
ObjectIdGetDatum(procStruct->prolang));
}
langStruct = (Form_pg_language) GETSTRUCT(langTuple);
if (langStruct->lanispl == false)
{
fmgr_info(trigger->tgfoid, &(trigger->tgfunc), &nargs);
return (HeapTuple) ((*(trigger->tgfunc)) ());
}
fmgr_info(langStruct->lanplcallfoid, &(trigger->tgplfunc), &nargs);
}
return (HeapTuple) ((*(trigger->tgplfunc)) (trigger->tgfoid));
}
HeapTuple HeapTuple
ExecBRInsertTriggers(Relation rel, HeapTuple trigtuple) ExecBRInsertTriggers(Relation rel, HeapTuple trigtuple)
{ {
@ -586,7 +650,6 @@ ExecBRInsertTriggers(Relation rel, HeapTuple trigtuple)
Trigger **trigger = rel->trigdesc->tg_before_row[TRIGGER_EVENT_INSERT]; Trigger **trigger = rel->trigdesc->tg_before_row[TRIGGER_EVENT_INSERT];
HeapTuple newtuple = trigtuple; HeapTuple newtuple = trigtuple;
HeapTuple oldtuple; HeapTuple oldtuple;
int nargs;
int i; int i;
SaveTriggerData = (TriggerData *) palloc(sizeof(TriggerData)); SaveTriggerData = (TriggerData *) palloc(sizeof(TriggerData));
@ -599,9 +662,7 @@ ExecBRInsertTriggers(Relation rel, HeapTuple trigtuple)
CurrentTriggerData = SaveTriggerData; CurrentTriggerData = SaveTriggerData;
CurrentTriggerData->tg_trigtuple = oldtuple = newtuple; CurrentTriggerData->tg_trigtuple = oldtuple = newtuple;
CurrentTriggerData->tg_trigger = trigger[i]; CurrentTriggerData->tg_trigger = trigger[i];
if (trigger[i]->tgfunc == NULL) newtuple = ExecCallTriggerFunc(trigger[i]);
fmgr_info(trigger[i]->tgfoid, &(trigger[i]->tgfunc), &nargs);
newtuple = (HeapTuple) ((*(trigger[i]->tgfunc)) ());
if (newtuple == NULL) if (newtuple == NULL)
break; break;
else if (oldtuple != newtuple && oldtuple != trigtuple) else if (oldtuple != newtuple && oldtuple != trigtuple)
@ -618,7 +679,6 @@ ExecARInsertTriggers(Relation rel, HeapTuple trigtuple)
TriggerData *SaveTriggerData; TriggerData *SaveTriggerData;
int ntrigs = rel->trigdesc->n_after_row[TRIGGER_EVENT_INSERT]; int ntrigs = rel->trigdesc->n_after_row[TRIGGER_EVENT_INSERT];
Trigger **trigger = rel->trigdesc->tg_after_row[TRIGGER_EVENT_INSERT]; Trigger **trigger = rel->trigdesc->tg_after_row[TRIGGER_EVENT_INSERT];
int nargs;
int i; int i;
SaveTriggerData = (TriggerData *) palloc(sizeof(TriggerData)); SaveTriggerData = (TriggerData *) palloc(sizeof(TriggerData));
@ -630,9 +690,7 @@ ExecARInsertTriggers(Relation rel, HeapTuple trigtuple)
CurrentTriggerData = SaveTriggerData; CurrentTriggerData = SaveTriggerData;
CurrentTriggerData->tg_trigtuple = trigtuple; CurrentTriggerData->tg_trigtuple = trigtuple;
CurrentTriggerData->tg_trigger = trigger[i]; CurrentTriggerData->tg_trigger = trigger[i];
if (trigger[i]->tgfunc == NULL) ExecCallTriggerFunc(trigger[i]);
fmgr_info(trigger[i]->tgfoid, &(trigger[i]->tgfunc), &nargs);
(void) ((*(trigger[i]->tgfunc)) ());
} }
CurrentTriggerData = NULL; CurrentTriggerData = NULL;
pfree(SaveTriggerData); pfree(SaveTriggerData);
@ -647,7 +705,6 @@ ExecBRDeleteTriggers(Relation rel, ItemPointer tupleid)
Trigger **trigger = rel->trigdesc->tg_before_row[TRIGGER_EVENT_DELETE]; Trigger **trigger = rel->trigdesc->tg_before_row[TRIGGER_EVENT_DELETE];
HeapTuple trigtuple; HeapTuple trigtuple;
HeapTuple newtuple = NULL; HeapTuple newtuple = NULL;
int nargs;
int i; int i;
trigtuple = GetTupleForTrigger(rel, tupleid, true); trigtuple = GetTupleForTrigger(rel, tupleid, true);
@ -664,9 +721,7 @@ ExecBRDeleteTriggers(Relation rel, ItemPointer tupleid)
CurrentTriggerData = SaveTriggerData; CurrentTriggerData = SaveTriggerData;
CurrentTriggerData->tg_trigtuple = trigtuple; CurrentTriggerData->tg_trigtuple = trigtuple;
CurrentTriggerData->tg_trigger = trigger[i]; CurrentTriggerData->tg_trigger = trigger[i];
if (trigger[i]->tgfunc == NULL) newtuple = ExecCallTriggerFunc(trigger[i]);
fmgr_info(trigger[i]->tgfoid, &(trigger[i]->tgfunc), &nargs);
newtuple = (HeapTuple) ((*(trigger[i]->tgfunc)) ());
if (newtuple == NULL) if (newtuple == NULL)
break; break;
} }
@ -684,7 +739,6 @@ ExecARDeleteTriggers(Relation rel, ItemPointer tupleid)
int ntrigs = rel->trigdesc->n_after_row[TRIGGER_EVENT_DELETE]; int ntrigs = rel->trigdesc->n_after_row[TRIGGER_EVENT_DELETE];
Trigger **trigger = rel->trigdesc->tg_after_row[TRIGGER_EVENT_DELETE]; Trigger **trigger = rel->trigdesc->tg_after_row[TRIGGER_EVENT_DELETE];
HeapTuple trigtuple; HeapTuple trigtuple;
int nargs;
int i; int i;
trigtuple = GetTupleForTrigger(rel, tupleid, false); trigtuple = GetTupleForTrigger(rel, tupleid, false);
@ -700,9 +754,7 @@ ExecARDeleteTriggers(Relation rel, ItemPointer tupleid)
CurrentTriggerData = SaveTriggerData; CurrentTriggerData = SaveTriggerData;
CurrentTriggerData->tg_trigtuple = trigtuple; CurrentTriggerData->tg_trigtuple = trigtuple;
CurrentTriggerData->tg_trigger = trigger[i]; CurrentTriggerData->tg_trigger = trigger[i];
if (trigger[i]->tgfunc == NULL) ExecCallTriggerFunc(trigger[i]);
fmgr_info(trigger[i]->tgfoid, &(trigger[i]->tgfunc), &nargs);
(void) ((*(trigger[i]->tgfunc)) ());
} }
CurrentTriggerData = NULL; CurrentTriggerData = NULL;
pfree(SaveTriggerData); pfree(SaveTriggerData);
@ -719,7 +771,6 @@ ExecBRUpdateTriggers(Relation rel, ItemPointer tupleid, HeapTuple newtuple)
HeapTuple trigtuple; HeapTuple trigtuple;
HeapTuple oldtuple; HeapTuple oldtuple;
HeapTuple intuple = newtuple; HeapTuple intuple = newtuple;
int nargs;
int i; int i;
trigtuple = GetTupleForTrigger(rel, tupleid, true); trigtuple = GetTupleForTrigger(rel, tupleid, true);
@ -736,9 +787,7 @@ ExecBRUpdateTriggers(Relation rel, ItemPointer tupleid, HeapTuple newtuple)
CurrentTriggerData->tg_trigtuple = trigtuple; CurrentTriggerData->tg_trigtuple = trigtuple;
CurrentTriggerData->tg_newtuple = oldtuple = newtuple; CurrentTriggerData->tg_newtuple = oldtuple = newtuple;
CurrentTriggerData->tg_trigger = trigger[i]; CurrentTriggerData->tg_trigger = trigger[i];
if (trigger[i]->tgfunc == NULL) newtuple = ExecCallTriggerFunc(trigger[i]);
fmgr_info(trigger[i]->tgfoid, &(trigger[i]->tgfunc), &nargs);
newtuple = (HeapTuple) ((*(trigger[i]->tgfunc)) ());
if (newtuple == NULL) if (newtuple == NULL)
break; break;
else if (oldtuple != newtuple && oldtuple != intuple) else if (oldtuple != newtuple && oldtuple != intuple)
@ -757,7 +806,6 @@ ExecARUpdateTriggers(Relation rel, ItemPointer tupleid, HeapTuple newtuple)
int ntrigs = rel->trigdesc->n_after_row[TRIGGER_EVENT_UPDATE]; int ntrigs = rel->trigdesc->n_after_row[TRIGGER_EVENT_UPDATE];
Trigger **trigger = rel->trigdesc->tg_after_row[TRIGGER_EVENT_UPDATE]; Trigger **trigger = rel->trigdesc->tg_after_row[TRIGGER_EVENT_UPDATE];
HeapTuple trigtuple; HeapTuple trigtuple;
int nargs;
int i; int i;
trigtuple = GetTupleForTrigger(rel, tupleid, false); trigtuple = GetTupleForTrigger(rel, tupleid, false);
@ -773,9 +821,7 @@ ExecARUpdateTriggers(Relation rel, ItemPointer tupleid, HeapTuple newtuple)
CurrentTriggerData->tg_trigtuple = trigtuple; CurrentTriggerData->tg_trigtuple = trigtuple;
CurrentTriggerData->tg_newtuple = newtuple; CurrentTriggerData->tg_newtuple = newtuple;
CurrentTriggerData->tg_trigger = trigger[i]; CurrentTriggerData->tg_trigger = trigger[i];
if (trigger[i]->tgfunc == NULL) ExecCallTriggerFunc(trigger[i]);
fmgr_info(trigger[i]->tgfoid, &(trigger[i]->tgfunc), &nargs);
(void) ((*(trigger[i]->tgfunc)) ());
} }
CurrentTriggerData = NULL; CurrentTriggerData = NULL;
pfree(SaveTriggerData); pfree(SaveTriggerData);

51
src/backend/parser/gram.y
Unescape View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.58 1997/10/25 05:56:41 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.59 1997/10/28 14:56:08 vadim Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -109,6 +109,7 @@ static char *FlattenStringList(List *list);
AddAttrStmt, ClosePortalStmt, AddAttrStmt, ClosePortalStmt,
CopyStmt, CreateStmt, CreateSeqStmt, DefineStmt, DestroyStmt, CopyStmt, CreateStmt, CreateSeqStmt, DefineStmt, DestroyStmt,
ExtendStmt, FetchStmt, GrantStmt, CreateTrigStmt, DropTrigStmt, ExtendStmt, FetchStmt, GrantStmt, CreateTrigStmt, DropTrigStmt,
CreatePLangStmt, DropPLangStmt,
IndexStmt, ListenStmt, OptimizableStmt, IndexStmt, ListenStmt, OptimizableStmt,
ProcedureStmt, PurgeStmt, ProcedureStmt, PurgeStmt,
RecipeStmt, RemoveAggrStmt, RemoveOperStmt, RemoveFuncStmt, RemoveStmt, RecipeStmt, RemoveAggrStmt, RemoveOperStmt, RemoveFuncStmt, RemoveStmt,
@ -119,7 +120,7 @@ static char *FlattenStringList(List *list);
%type <node> SubSelect %type <node> SubSelect
%type <str> join_expr, join_outer, join_spec %type <str> join_expr, join_outer, join_spec
%type <boolean> TriggerActionTime, TriggerForSpec %type <boolean> TriggerActionTime, TriggerForSpec, PLangTrusted
%type <str> TriggerEvents, TriggerFuncArg %type <str> TriggerEvents, TriggerFuncArg
@ -225,9 +226,9 @@ static char *FlattenStringList(List *list);
/* Keywords (in SQL92 reserved words) */ /* Keywords (in SQL92 reserved words) */
%token ACTION, ADD, ALL, ALTER, AND, AS, ASC, %token ACTION, ADD, ALL, ALTER, AND, AS, ASC,
BEGIN_TRANS, BETWEEN, BOTH, BY, BEGIN_TRANS, BETWEEN, BOTH, BY,
CASCADE, CAST, CHAR, CHARACTER, CHECK, CLOSE, CASCADE, CAST, CHAR, CHARACTER, CHECK, CLOSE, COLLATE, COLUMN, COMMIT,
COLLATE, COLUMN, COMMIT, CONSTRAINT, CREATE, CROSS, CONSTRAINT, CREATE, CROSS, CURRENT, CURRENT_DATE, CURRENT_TIME,
CURRENT, CURRENT_DATE, CURRENT_TIME, CURRENT_TIMESTAMP, CURRENT_USER, CURSOR, CURRENT_TIMESTAMP, CURRENT_USER, CURSOR,
DAY_P, DECIMAL, DECLARE, DEFAULT, DELETE, DESC, DISTINCT, DOUBLE, DROP, DAY_P, DECIMAL, DECLARE, DEFAULT, DELETE, DESC, DISTINCT, DOUBLE, DROP,
END_TRANS, EXECUTE, EXISTS, EXTRACT, END_TRANS, EXECUTE, EXISTS, EXTRACT,
FETCH, FLOAT, FOR, FOREIGN, FROM, FULL, FETCH, FLOAT, FOR, FOREIGN, FROM, FULL,
@ -256,12 +257,12 @@ static char *FlattenStringList(List *list);
APPEND, ARCHIVE, ARCH_STORE, APPEND, ARCHIVE, ARCH_STORE,
BACKWARD, BEFORE, BINARY, CHANGE, CLUSTER, COPY, BACKWARD, BEFORE, BINARY, CHANGE, CLUSTER, COPY,
DATABASE, DELIMITERS, DO, EXPLAIN, EXTEND, DATABASE, DELIMITERS, DO, EXPLAIN, EXTEND,
FORWARD, FUNCTION, HEAVY, FORWARD, FUNCTION, HANDLER, HEAVY,
INDEX, INHERITS, INSTEAD, ISNULL, INDEX, INHERITS, INSTEAD, ISNULL,
LIGHT, LISTEN, LOAD, MERGE, MOVE, LANCOMPILER, LIGHT, LISTEN, LOAD, MERGE, MOVE,
NEW, NONE, NOTHING, OIDS, OPERATOR, PURGE, NEW, NONE, NOTHING, OIDS, OPERATOR, PROCEDURAL, PURGE,
RECIPE, RENAME, REPLACE, RESET, RETRIEVE, RETURNS, RULE, RECIPE, RENAME, REPLACE, RESET, RETRIEVE, RETURNS, RULE,
SEQUENCE, SETOF, SHOW, STDIN, STDOUT, STORE, SEQUENCE, SETOF, SHOW, STDIN, STDOUT, STORE, TRUSTED,
VACUUM, VERBOSE, VERSION VACUUM, VERBOSE, VERSION
/* Special keywords, not in the query language - see the "lex" file */ /* Special keywords, not in the query language - see the "lex" file */
@ -318,10 +319,12 @@ stmt : AddAttrStmt
| CopyStmt | CopyStmt
| CreateStmt | CreateStmt
| CreateSeqStmt | CreateSeqStmt
| CreatePLangStmt
| CreateTrigStmt | CreateTrigStmt
| ClusterStmt | ClusterStmt
| DefineStmt | DefineStmt
| DestroyStmt | DestroyStmt
| DropPLangStmt
| DropTrigStmt | DropTrigStmt
| ExtendStmt | ExtendStmt
| ExplainStmt | ExplainStmt
@ -857,6 +860,36 @@ OptSeqElem: IDENT NumConst
} }
; ;
/*****************************************************************************
*
* QUERIES :
* CREATE PROCEDURAL LANGUAGE ...
* DROP PROCEDURAL LANGUAGE ...
*
*****************************************************************************/
CreatePLangStmt: CREATE PLangTrusted PROCEDURAL LANGUAGE Sconst
HANDLER def_name LANCOMPILER Sconst
{
CreatePLangStmt *n = makeNode(CreatePLangStmt);
n->plname = $5;
n->plhandler = $7;
n->plcompiler = $9;
n->pltrusted = $2;
$$ = (Node *)n;
}
;
PLangTrusted: TRUSTED { $$ = TRUE; }
| { $$ = FALSE; }
DropPLangStmt: DROP PROCEDURAL LANGUAGE Sconst
{
DropPLangStmt *n = makeNode(DropPLangStmt);
n->plname = $4;
$$ = (Node *)n;
}
;
/***************************************************************************** /*****************************************************************************
* *

6
src/backend/parser/keywords.c
Unescape View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.20 1997/10/25 05:44:11 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.21 1997/10/28 14:56:10 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -104,6 +104,7 @@ static ScanKeyword ScanKeywords[] = {
{"function", FUNCTION}, {"function", FUNCTION},
{"grant", GRANT}, {"grant", GRANT},
{"group", GROUP}, {"group", GROUP},
{"handler", HANDLER},
{"having", HAVING}, {"having", HAVING},
{"heavy", HEAVY}, {"heavy", HEAVY},
{"hour", HOUR_P}, {"hour", HOUR_P},
@ -119,6 +120,7 @@ static ScanKeyword ScanKeywords[] = {
{"isnull", ISNULL}, {"isnull", ISNULL},
{"join", JOIN}, {"join", JOIN},
{"key", KEY}, {"key", KEY},
{"lancompiler", LANCOMPILER},
{"language", LANGUAGE}, {"language", LANGUAGE},
{"leading", LEADING}, {"leading", LEADING},
{"left", LEFT}, {"left", LEFT},
@ -156,6 +158,7 @@ static ScanKeyword ScanKeywords[] = {
{"precision", PRECISION}, {"precision", PRECISION},
{"primary", PRIMARY}, {"primary", PRIMARY},
{"privileges", PRIVILEGES}, {"privileges", PRIVILEGES},
{"procedural", PROCEDURAL},
{"procedure", PROCEDURE}, {"procedure", PROCEDURE},
{"public", PUBLIC}, {"public", PUBLIC},
{"purge", PURGE}, {"purge", PURGE},
@ -188,6 +191,7 @@ static ScanKeyword ScanKeywords[] = {
{"trigger", TRIGGER}, {"trigger", TRIGGER},
{"trim", TRIM}, {"trim", TRIM},
{"true", TRUE_P}, {"true", TRUE_P},
{"trusted", TRUSTED},
{"type", TYPE_P}, {"type", TYPE_P},
{"union", UNION}, {"union", UNION},
{"unique", UNIQUE}, {"unique", UNIQUE},

24
src/backend/tcop/utility.c
Unescape View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.26 1997/10/25 05:34:07 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.27 1997/10/28 14:57:24 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,6 +35,7 @@
#include "commands/recipe.h" #include "commands/recipe.h"
#include "commands/explain.h" #include "commands/explain.h"
#include "commands/trigger.h" #include "commands/trigger.h"
#include "commands/proclang.h"
#include "nodes/parsenodes.h" #include "nodes/parsenodes.h"
#include "../backend/parser/parse.h" #include "../backend/parser/parse.h"
@ -75,7 +76,7 @@
* ---------------- * ----------------
*/ */
void void
ProcessUtility(Node *parsetree, ProcessUtility(Node * parsetree,
CommandDest dest) CommandDest dest)
{ {
char *commandTag = NULL; char *commandTag = NULL;
@ -150,7 +151,7 @@ ProcessUtility(Node *parsetree,
count = stmt->howMany; count = stmt->howMany;
PerformPortalFetch(portalName, forward, count, commandTag, PerformPortalFetch(portalName, forward, count, commandTag,
(stmt->ismove) ? None : dest); /* /dev/null for MOVE */ (stmt->ismove) ? None : dest); /* /dev/null for MOVE */
} }
break; break;
@ -718,6 +719,23 @@ ProcessUtility(Node *parsetree,
DropTrigger((DropTrigStmt *) parsetree); DropTrigger((DropTrigStmt *) parsetree);
break; break;
/*
* ************* PROCEDURAL LANGUAGE statements *****************
*/
case T_CreatePLangStmt:
commandTag = "CREATE";
CHECK_IF_ABORTED();
CreateProceduralLanguage((CreatePLangStmt *) parsetree);
break;
case T_DropPLangStmt:
commandTag = "DROP";
CHECK_IF_ABORTED();
DropProceduralLanguage((DropPLangStmt *) parsetree);
break;
/* /*
* ******************************** default ******************************** * ******************************** default ********************************
* *

8
src/backend/utils/Gen_fmgrtab.sh.in
Unescape View File

@ -8,7 +8,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.4 1997/07/28 00:55:41 momjian Exp $ # $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.5 1997/10/28 15:02:24 vadim Exp $
# #
# NOTES # NOTES
# Passes any -D options on to cpp prior to generating the list # Passes any -D options on to cpp prior to generating the list
@ -81,7 +81,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: Gen_fmgrtab.sh.in,v 1.4 1997/07/28 00:55:41 momjian Exp $ * $Id: Gen_fmgrtab.sh.in,v 1.5 1997/10/28 15:02:24 vadim Exp $
* *
* NOTES * NOTES
* ****************************** * ******************************
@ -114,6 +114,8 @@ typedef struct {
/* /*
* defined in fmgr.c * defined in fmgr.c
*/ */
extern char *fmgr_pl(Oid func_id, int n_arguments, FmgrValues *values,
bool *isNull);
extern char *fmgr_c(func_ptr user_fn, Oid func_id, int n_arguments, extern char *fmgr_c(func_ptr user_fn, Oid func_id, int n_arguments,
FmgrValues *values, bool *isNull); FmgrValues *values, bool *isNull);
extern void fmgr_info(Oid procedureId, func_ptr *function, int *nargs); extern void fmgr_info(Oid procedureId, func_ptr *function, int *nargs);
@ -175,7 +177,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.4 1997/07/28 00:55:41 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.5 1997/10/28 15:02:24 vadim Exp $
* *
* NOTES * NOTES
* *

21
src/backend/utils/cache/syscache.c vendored
Unescape View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.9 1997/09/18 20:22:25 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.10 1997/10/28 15:03:06 vadim Exp $
* *
* NOTES * NOTES
* These routines allow the parser/planner/executor to perform * These routines allow the parser/planner/executor to perform
@ -57,7 +57,7 @@ extern bool AMI_OVERRIDE; /* XXX style */
#include "utils/syscache.h" #include "utils/syscache.h"
#include "catalog/indexing.h" #include "catalog/indexing.h"
typedef HeapTuple (*ScanFunc) (); typedef HeapTuple(*ScanFunc) ();
/* ---------------- /* ----------------
* Warning: cacheinfo[] below is changed, then be sure and * Warning: cacheinfo[] below is changed, then be sure and
@ -179,7 +179,7 @@ static struct cachedesc cacheinfo[] = {
0, 0,
0, 0,
0}, 0},
offsetof(TypeTupleFormData, typalign) +sizeof(char), offsetof(TypeTupleFormData, typalign) + sizeof(char),
TypeNameIndex, TypeNameIndex,
TypeNameIndexScan}, TypeNameIndexScan},
{TypeRelationName, /* TYPOID */ {TypeRelationName, /* TYPOID */
@ -316,7 +316,16 @@ static struct cachedesc cacheinfo[] = {
0}, 0},
sizeof(FormData_pg_opclass), sizeof(FormData_pg_opclass),
NULL, NULL,
(ScanFunc) NULL} (ScanFunc) NULL},
{LanguageRelationName, /* LANOID */
1,
{ObjectIdAttributeNumber,
0,
0,
0},
offsetof(FormData_pg_language, lancompiler),
NULL,
NULL}
}; };
static struct catcache *SysCache[ static struct catcache *SysCache[
@ -383,7 +392,7 @@ InitCatalogCache()
* XXX The tuple that is returned is NOT supposed to be pfree'd! * XXX The tuple that is returned is NOT supposed to be pfree'd!
*/ */
HeapTuple HeapTuple
SearchSysCacheTuple(int cacheId,/* cache selection code */ SearchSysCacheTuple(int cacheId, /* cache selection code */
Datum key1, Datum key1,
Datum key2, Datum key2,
Datum key3, Datum key3,
@ -562,7 +571,7 @@ SearchSysCacheGetAttribute(int cacheId,
: attributeLength; /* fixed length */ : attributeLength; /* fixed length */
tmp = (char *) palloc(size); tmp = (char *) palloc(size);
memmove(tmp, (void *)attributeValue, size); memmove(tmp, (void *) attributeValue, size);
returnValue = (void *) tmp; returnValue = (void *) tmp;
} }

107
src/backend/utils/fmgr/fmgr.c
Unescape View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.6 1997/09/08 21:49:07 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.7 1997/10/28 15:05:32 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -28,13 +28,69 @@
#include "utils/elog.h" #include "utils/elog.h"
#include "nodes/parsenodes.h"
#include "commands/trigger.h"
char *
fmgr_pl(Oid func_id,
int n_arguments,
FmgrValues * values,
bool * isNull)
{
HeapTuple procedureTuple;
HeapTuple languageTuple;
Form_pg_proc procedureStruct;
Form_pg_language languageStruct;
func_ptr plcall_fn;
int plcall_nargs;
/* Fetch the pg_proc tuple from the syscache */
procedureTuple = SearchSysCacheTuple(PROOID,
ObjectIdGetDatum(func_id),
0, 0, 0);
if (!HeapTupleIsValid(procedureTuple))
{
elog(WARN, "fmgr_pl(): Cache lookup of procedure %ld failed.",
ObjectIdGetDatum(func_id));
}
procedureStruct = (Form_pg_proc) GETSTRUCT(procedureTuple);
/* Fetch the pg_language tuple from the syscache */
languageTuple = SearchSysCacheTuple(LANOID,
ObjectIdGetDatum(procedureStruct->prolang),
0, 0, 0);
if (!HeapTupleIsValid(languageTuple))
{
elog(WARN, "fmgr_pl(): Cache lookup of language %ld for procedure %ld failed.",
ObjectIdGetDatum(procedureStruct->prolang),
ObjectIdGetDatum(func_id));
}
languageStruct = (Form_pg_language) GETSTRUCT(languageTuple);
/* Get the function pointer for the PL call handler */
fmgr_info(languageStruct->lanplcallfoid, &plcall_fn, &plcall_nargs);
if (plcall_fn == NULL)
{
elog(WARN, "fmgr_pl(): failed to load PL handler for procedure %ld.",
ObjectIdGetDatum(func_id));
}
/* Call the PL handler */
CurrentTriggerData = NULL;
return (*plcall_fn) (func_id,
n_arguments,
values,
isNull);
}
char * char *
fmgr_c(func_ptr user_fn, fmgr_c(func_ptr user_fn,
Oid func_id, Oid func_id,
int n_arguments, int n_arguments,
FmgrValues *values, FmgrValues * values,
bool *isNull) bool * isNull)
{ {
char *returnValue = (char *) NULL; char *returnValue = (char *) NULL;
@ -43,11 +99,11 @@ fmgr_c(func_ptr user_fn,
{ {
/* /*
* a NULL func_ptr denotes untrusted function (in postgres 4.2). * a NULL func_ptr denotet untrusted function (in postgres 4.2).
* Untrusted functions have very limited use and is clumsy. We * Untrusted functions have very limited use and is clumsy. We now
* just get rid of it. * use this feature for procedural languages.
*/ */
elog(WARN, "internal error: untrusted function not supported."); return fmgr_pl(func_id, n_arguments, values, isNull);
} }
switch (n_arguments) switch (n_arguments)
@ -115,12 +171,14 @@ fmgr_c(func_ptr user_fn,
} }
void void
fmgr_info(Oid procedureId, func_ptr *function, int *nargs) fmgr_info(Oid procedureId, func_ptr * function, int *nargs)
{ {
func_ptr user_fn = NULL; func_ptr user_fn = NULL;
FmgrCall *fcp; FmgrCall *fcp;
HeapTuple procedureTuple; HeapTuple procedureTuple;
FormData_pg_proc *procedureStruct; FormData_pg_proc *procedureStruct;
HeapTuple languageTuple;
Form_pg_language languageStruct;
Oid language; Oid language;
if (!(fcp = fmgr_isbuiltin(procedureId))) if (!(fcp = fmgr_isbuiltin(procedureId)))
@ -158,8 +216,35 @@ fmgr_info(Oid procedureId, func_ptr *function, int *nargs)
*nargs = procedureStruct->pronargs; *nargs = procedureStruct->pronargs;
break; break;
default: default:
elog(WARN, "fmgr_info: function %d: unknown language %d",
procedureId, language); /*
* Might be a created procedural language Lookup the
* syscache for the language and check the lanispl flag If
* this is the case, we return a NULL function pointer and
* the number of arguments from the procedure.
*/
languageTuple = SearchSysCacheTuple(LANOID,
ObjectIdGetDatum(procedureStruct->prolang),
0, 0, 0);
if (!HeapTupleIsValid(languageTuple))
{
elog(WARN, "fmgr_info: %s %ld",
"Cache lookup for language %d failed",
ObjectIdGetDatum(procedureStruct->prolang));
}
languageStruct = (Form_pg_language)
GETSTRUCT(languageTuple);
if (languageStruct->lanispl)
{
user_fn = (func_ptr) NULL;
*nargs = procedureStruct->pronargs;
}
else
{
elog(WARN, "fmgr_info: function %d: unknown language %d",
procedureId, language);
}
break;
} }
} }
else else
@ -252,7 +337,7 @@ fmgr_ptr(func_ptr user_fn, Oid func_id,...)
* to fmgr_c(). * to fmgr_c().
*/ */
char * char *
fmgr_array_args(Oid procedureId, int nargs, char *args[], bool *isNull) fmgr_array_args(Oid procedureId, int nargs, char *args[], bool * isNull)
{ {
func_ptr user_fn; func_ptr user_fn;
int true_arguments; int true_arguments;

20
src/include/catalog/pg_language.h
Unescape View File

@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_language.h,v 1.4 1997/09/08 02:35:16 momjian Exp $ * $Id: pg_language.h,v 1.5 1997/10/28 15:08:05 vadim Exp $
* *
* NOTES * NOTES
* the genbki.sh script reads this file and generates .bki * the genbki.sh script reads this file and generates .bki
@ -33,6 +33,9 @@
CATALOG(pg_language) CATALOG(pg_language)
{ {
NameData lanname; NameData lanname;
bool lanispl; /* Is a procedural language */
bool lanpltrusted; /* PL is trusted */
Oid lanplcallfoid; /* Call handler for PL */
text lancompiler; /* VARIABLE LENGTH FIELD */ text lancompiler; /* VARIABLE LENGTH FIELD */
} FormData_pg_language; } FormData_pg_language;
@ -47,21 +50,24 @@ typedef FormData_pg_language *Form_pg_language;
* compiler constants for pg_language * compiler constants for pg_language
* ---------------- * ----------------
*/ */
#define Natts_pg_language 2 #define Natts_pg_language 5
#define Anum_pg_language_lanname 1 #define Anum_pg_language_lanname 1
#define Anum_pg_language_lancompiler 2 #define Anum_pg_language_lanispl 2
#define Anum_pg_language_lanpltrusted 3
#define Anum_pg_language_lanplcallfoid 4
#define Anum_pg_language_lancompiler 5
/* ---------------- /* ----------------
* initial contents of pg_language * initial contents of pg_language
* ---------------- * ----------------
*/ */
DATA(insert OID = 11 ( internal "n/a" )); DATA(insert OID = 11 ( internal f 0 0 "n/a" ));
#define INTERNALlanguageId 11 #define INTERNALlanguageId 11
DATA(insert OID = 12 ( lisp "/usr/ucb/liszt" )); DATA(insert OID = 12 ( lisp f 0 0 "/usr/ucb/liszt" ));
DATA(insert OID = 13 ( "C" "/bin/cc" )); DATA(insert OID = 13 ( "C" f 0 0 "/bin/cc" ));
#define ClanguageId 13 #define ClanguageId 13
DATA(insert OID = 14 ( "sql" "postgres")); DATA(insert OID = 14 ( "sql" f 0 0 "postgres"));
#define SQLlanguageId 14 #define SQLlanguageId 14

17
src/include/commands/proclang.h
Unescape View File

@ -0,0 +1,17 @@
/*-------------------------------------------------------------------------
*
* proclang.h--
* prototypes for proclang.c.
*
*
*-------------------------------------------------------------------------
*/
#ifndef PROCLANG_H
#define PROCLANG_H
#include <nodes/parsenodes.h>
extern void CreateProceduralLanguage(CreatePLangStmt * stmt);
extern void DropProceduralLanguage(DropPLangStmt * stmt);
#endif /* PROCLANG_H */

4
src/include/nodes/nodes.h
Unescape View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: nodes.h,v 1.15 1997/09/29 06:01:44 vadim Exp $ * $Id: nodes.h,v 1.16 1997/10/28 15:10:37 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -185,6 +185,8 @@ typedef enum NodeTag
T_VariableResetStmt, T_VariableResetStmt,
T_CreateTrigStmt, T_CreateTrigStmt,
T_DropTrigStmt, T_DropTrigStmt,
T_CreatePLangStmt,
T_DropPLangStmt,
T_A_Expr = 700, T_A_Expr = 700,
T_Attr, T_Attr,

143
src/include/nodes/parsenodes.h
Unescape View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: parsenodes.h,v 1.28 1997/09/29 06:01:46 vadim Exp $ * $Id: parsenodes.h,v 1.29 1997/10/28 15:10:39 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -64,7 +64,7 @@ typedef struct Query
List *join_relation_list_; /* list of relations generated by List *join_relation_list_; /* list of relations generated by
* joins */ * joins */
bool query_is_archival_; /* archival query flag */ bool query_is_archival_; /* archival query flag */
} Query; } Query;
/***************************************************************************** /*****************************************************************************
@ -98,7 +98,7 @@ typedef struct ChangeACLStmt
struct AclItem *aclitem; struct AclItem *aclitem;
unsigned modechg; unsigned modechg;
List *relNames; List *relNames;
} ChangeACLStmt; } ChangeACLStmt;
/* ---------------------- /* ----------------------
* Close Portal Statement * Close Portal Statement
@ -108,7 +108,7 @@ typedef struct ClosePortalStmt
{ {
NodeTag type; NodeTag type;
char *portalname; /* name of the portal (cursor) */ char *portalname; /* name of the portal (cursor) */
} ClosePortalStmt; } ClosePortalStmt;
/* ---------------------- /* ----------------------
* Copy Statement * Copy Statement
@ -123,7 +123,7 @@ typedef struct CopyStmt
int direction; /* TO or FROM */ int direction; /* TO or FROM */
char *filename; /* if NULL, use stdin/stdout */ char *filename; /* if NULL, use stdin/stdout */
char *delimiter; /* delimiter character, \t by default */ char *delimiter; /* delimiter character, \t by default */
} CopyStmt; } CopyStmt;
/* ---------------------- /* ----------------------
* Create Table Statement * Create Table Statement
@ -145,19 +145,19 @@ typedef struct CreateStmt
int location; /* smgrid (-1 if none) */ int location; /* smgrid (-1 if none) */
int archiveLoc; /* smgrid (-1 if none) */ int archiveLoc; /* smgrid (-1 if none) */
List *constraints; /* list of constraints (ConstaintDef) */ List *constraints; /* list of constraints (ConstaintDef) */
} CreateStmt; } CreateStmt;
typedef enum ConstrType typedef enum ConstrType
{ {
CONSTR_NONE, CONSTR_CHECK /* type of constaints */ CONSTR_NONE, CONSTR_CHECK /* type of constaints */
} ConstrType; } ConstrType;
typedef struct ConstraintDef typedef struct ConstraintDef
{ {
ConstrType type; ConstrType type;
char *name; /* name */ char *name; /* name */
void *def; /* definition */ void *def; /* definition */
} ConstraintDef; } ConstraintDef;
/* ---------------------- /* ----------------------
* Create/Drop TRIGGER Statements * Create/Drop TRIGGER Statements
@ -178,14 +178,35 @@ typedef struct CreateTrigStmt
char *text; /* AS 'text' */ char *text; /* AS 'text' */
List *attr; /* UPDATE OF a, b,... (NI) or NULL */ List *attr; /* UPDATE OF a, b,... (NI) or NULL */
char *when; /* WHEN 'a > 10 ...' (NI) or NULL */ char *when; /* WHEN 'a > 10 ...' (NI) or NULL */
} CreateTrigStmt; } CreateTrigStmt;
typedef struct DropTrigStmt typedef struct DropTrigStmt
{ {
NodeTag type; NodeTag type;
char *trigname; /* TRIGGER' name */ char *trigname; /* TRIGGER' name */
char *relname; /* triggered relation */ char *relname; /* triggered relation */
} DropTrigStmt; } DropTrigStmt;
/* ----------------------
* Create/Drop PROCEDURAL LANGUAGE Statement
* ----------------------
*/
typedef struct CreatePLangStmt
{
NodeTag type;
char *plname; /* PL name */
char *plhandler; /* PL call handler function */
char *plcompiler; /* lancompiler text */
bool pltrusted; /* PL is trusted */
} CreatePLangStmt;
typedef struct DropPLangStmt
{
NodeTag type;
char *plname; /* PL name */
} DropPLangStmt;
/* ---------------------- /* ----------------------
* Create SEQUENCE Statement * Create SEQUENCE Statement
@ -197,7 +218,7 @@ typedef struct CreateSeqStmt
NodeTag type; NodeTag type;
char *seqname; /* the relation to create */ char *seqname; /* the relation to create */
List *options; List *options;
} CreateSeqStmt; } CreateSeqStmt;
/* ---------------------- /* ----------------------
* Create Version Statement * Create Version Statement
@ -210,7 +231,7 @@ typedef struct VersionStmt
int direction; /* FORWARD | BACKWARD */ int direction; /* FORWARD | BACKWARD */
char *fromRelname; /* relation to create a version */ char *fromRelname; /* relation to create a version */
char *date; /* date of the snapshot */ char *date; /* date of the snapshot */
} VersionStmt; } VersionStmt;
/* ---------------------- /* ----------------------
* Create {Operator|Type|Aggregate} Statement * Create {Operator|Type|Aggregate} Statement
@ -222,7 +243,7 @@ typedef struct DefineStmt
int defType; /* OPERATOR|P_TYPE|AGGREGATE */ int defType; /* OPERATOR|P_TYPE|AGGREGATE */
char *defname; char *defname;
List *definition; /* a list of DefElem */ List *definition; /* a list of DefElem */
} DefineStmt; } DefineStmt;
/* ---------------------- /* ----------------------
* Drop Table Statement * Drop Table Statement
@ -233,7 +254,7 @@ typedef struct DestroyStmt
NodeTag type; NodeTag type;
List *relNames; /* relations to be dropped */ List *relNames; /* relations to be dropped */
bool sequence; bool sequence;
} DestroyStmt; } DestroyStmt;
/* ---------------------- /* ----------------------
* Extend Index Statement * Extend Index Statement
@ -246,7 +267,7 @@ typedef struct ExtendStmt
Node *whereClause; /* qualifications */ Node *whereClause; /* qualifications */
List *rangetable; /* range table, filled in by List *rangetable; /* range table, filled in by
* transformStmt() */ * transformStmt() */
} ExtendStmt; } ExtendStmt;
/* ---------------------- /* ----------------------
* Begin Recipe Statement * Begin Recipe Statement
@ -256,7 +277,7 @@ typedef struct RecipeStmt
{ {
NodeTag type; NodeTag type;
char *recipeName; /* name of the recipe */ char *recipeName; /* name of the recipe */
} RecipeStmt; } RecipeStmt;
/* ---------------------- /* ----------------------
* Fetch Statement * Fetch Statement
@ -269,7 +290,7 @@ typedef struct FetchStmt
int howMany; /* amount to fetch ("ALL" --> 0) */ int howMany; /* amount to fetch ("ALL" --> 0) */
char *portalname; /* name of portal (cursor) */ char *portalname; /* name of portal (cursor) */
bool ismove; /* TRUE if MOVE */ bool ismove; /* TRUE if MOVE */
} FetchStmt; } FetchStmt;
/* ---------------------- /* ----------------------
* Create Index Statement * Create Index Statement
@ -288,7 +309,7 @@ typedef struct IndexStmt
* transformStmt() */ * transformStmt() */
bool *lossy; /* is index lossy? */ bool *lossy; /* is index lossy? */
bool unique; /* is index unique? */ bool unique; /* is index unique? */
} IndexStmt; } IndexStmt;
/* ---------------------- /* ----------------------
* Create Function Statement * Create Function Statement
@ -305,7 +326,7 @@ typedef struct ProcedureStmt
List *withClause; /* a list of ParamString */ List *withClause; /* a list of ParamString */
char *as; /* the SQL statement or filename */ char *as; /* the SQL statement or filename */
char *language; /* C or SQL */ char *language; /* C or SQL */
} ProcedureStmt; } ProcedureStmt;
/* ---------------------- /* ----------------------
* Purge Statement * Purge Statement
@ -317,7 +338,7 @@ typedef struct PurgeStmt
char *relname; /* relation to purge */ char *relname; /* relation to purge */
char *beforeDate; /* purge before this date */ char *beforeDate; /* purge before this date */
char *afterDate; /* purge after this date */ char *afterDate; /* purge after this date */
} PurgeStmt; } PurgeStmt;
/* ---------------------- /* ----------------------
* Drop Aggregate Statement * Drop Aggregate Statement
@ -328,7 +349,7 @@ typedef struct RemoveAggrStmt
NodeTag type; NodeTag type;
char *aggname; /* aggregate to drop */ char *aggname; /* aggregate to drop */
char *aggtype; /* for this type */ char *aggtype; /* for this type */
} RemoveAggrStmt; } RemoveAggrStmt;
/* ---------------------- /* ----------------------
* Drop Function Statement * Drop Function Statement
@ -339,7 +360,7 @@ typedef struct RemoveFuncStmt
NodeTag type; NodeTag type;
char *funcname; /* function to drop */ char *funcname; /* function to drop */
List *args; /* types of the arguments */ List *args; /* types of the arguments */
} RemoveFuncStmt; } RemoveFuncStmt;
/* ---------------------- /* ----------------------
* Drop Operator Statement * Drop Operator Statement
@ -350,7 +371,7 @@ typedef struct RemoveOperStmt
NodeTag type; NodeTag type;
char *opname; /* operator to drop */ char *opname; /* operator to drop */
List *args; /* types of the arguments */ List *args; /* types of the arguments */
} RemoveOperStmt; } RemoveOperStmt;
/* ---------------------- /* ----------------------
* Drop {Type|Index|Rule|View} Statement * Drop {Type|Index|Rule|View} Statement
@ -361,7 +382,7 @@ typedef struct RemoveStmt
NodeTag type; NodeTag type;
int removeType; /* P_TYPE|INDEX|RULE|VIEW */ int removeType; /* P_TYPE|INDEX|RULE|VIEW */
char *name; /* name to drop */ char *name; /* name to drop */
} RemoveStmt; } RemoveStmt;
/* ---------------------- /* ----------------------
* Alter Table Statement * Alter Table Statement
@ -376,7 +397,7 @@ typedef struct RenameStmt
* the new name. Otherwise, rename this * the new name. Otherwise, rename this
* column name. */ * column name. */
char *newname; /* the new name */ char *newname; /* the new name */
} RenameStmt; } RenameStmt;
/* ---------------------- /* ----------------------
* Create Rule Statement * Create Rule Statement
@ -391,7 +412,7 @@ typedef struct RuleStmt
struct Attr *object; /* object affected */ struct Attr *object; /* object affected */
bool instead; /* is a 'do instead'? */ bool instead; /* is a 'do instead'? */
List *actions; /* the action statements */ List *actions; /* the action statements */
} RuleStmt; } RuleStmt;
/* ---------------------- /* ----------------------
* Notify Statement * Notify Statement
@ -401,7 +422,7 @@ typedef struct NotifyStmt
{ {
NodeTag type; NodeTag type;
char *relname; /* relation to notify */ char *relname; /* relation to notify */
} NotifyStmt; } NotifyStmt;
/* ---------------------- /* ----------------------
* Listen Statement * Listen Statement
@ -411,7 +432,7 @@ typedef struct ListenStmt
{ {
NodeTag type; NodeTag type;
char *relname; /* relation to listen on */ char *relname; /* relation to listen on */
} ListenStmt; } ListenStmt;
/* ---------------------- /* ----------------------
* {Begin|Abort|End} Transaction Statement * {Begin|Abort|End} Transaction Statement
@ -421,7 +442,7 @@ typedef struct TransactionStmt
{ {
NodeTag type; NodeTag type;
int command; /* BEGIN|END|ABORT */ int command; /* BEGIN|END|ABORT */
} TransactionStmt; } TransactionStmt;
/* ---------------------- /* ----------------------
* Create View Statement * Create View Statement
@ -432,7 +453,7 @@ typedef struct ViewStmt
NodeTag type; NodeTag type;
char *viewname; /* name of the view */ char *viewname; /* name of the view */
Query *query; /* the SQL statement */ Query *query; /* the SQL statement */
} ViewStmt; } ViewStmt;
/* ---------------------- /* ----------------------
* Load Statement * Load Statement
@ -442,7 +463,7 @@ typedef struct LoadStmt
{ {
NodeTag type; NodeTag type;
char *filename; /* file to load */ char *filename; /* file to load */
} LoadStmt; } LoadStmt;
/* ---------------------- /* ----------------------
* Createdb Statement * Createdb Statement
@ -452,7 +473,7 @@ typedef struct CreatedbStmt
{ {
NodeTag type; NodeTag type;
char *dbname; /* database to create */ char *dbname; /* database to create */
} CreatedbStmt; } CreatedbStmt;
/* ---------------------- /* ----------------------
* Destroydb Statement * Destroydb Statement
@ -462,7 +483,7 @@ typedef struct DestroydbStmt
{ {
NodeTag type; NodeTag type;
char *dbname; /* database to drop */ char *dbname; /* database to drop */
} DestroydbStmt; } DestroydbStmt;
/* ---------------------- /* ----------------------
* Cluster Statement (support pbrown's cluster index implementation) * Cluster Statement (support pbrown's cluster index implementation)
@ -473,7 +494,7 @@ typedef struct ClusterStmt
NodeTag type; NodeTag type;
char *relname; /* relation being indexed */ char *relname; /* relation being indexed */
char *indexname; /* original index defined */ char *indexname; /* original index defined */
} ClusterStmt; } ClusterStmt;
/* ---------------------- /* ----------------------
* Vacuum Statement * Vacuum Statement
@ -486,7 +507,7 @@ typedef struct VacuumStmt
bool analyze; /* analyze data */ bool analyze; /* analyze data */
char *vacrel; /* table to vacuum */ char *vacrel; /* table to vacuum */
List *va_spec; /* columns to analyse */ List *va_spec; /* columns to analyse */
} VacuumStmt; } VacuumStmt;
/* ---------------------- /* ----------------------
* Explain Statement * Explain Statement
@ -497,7 +518,7 @@ typedef struct ExplainStmt
NodeTag type; NodeTag type;
Query *query; /* the query */ Query *query; /* the query */
bool verbose; /* print plan info */ bool verbose; /* print plan info */
} ExplainStmt; } ExplainStmt;
/* ---------------------- /* ----------------------
* Set Statement * Set Statement
@ -509,7 +530,7 @@ typedef struct VariableSetStmt
NodeTag type; NodeTag type;
char *name; char *name;
char *value; char *value;
} VariableSetStmt; } VariableSetStmt;
/* ---------------------- /* ----------------------
* Show Statement * Show Statement
@ -520,7 +541,7 @@ typedef struct VariableShowStmt
{ {
NodeTag type; NodeTag type;
char *name; char *name;
} VariableShowStmt; } VariableShowStmt;
/* ---------------------- /* ----------------------
* Reset Statement * Reset Statement
@ -531,7 +552,7 @@ typedef struct VariableResetStmt
{ {
NodeTag type; NodeTag type;
char *name; char *name;
} VariableResetStmt; } VariableResetStmt;
/***************************************************************************** /*****************************************************************************
@ -561,7 +582,7 @@ typedef struct DeleteStmt
NodeTag type; NodeTag type;
char *relname; /* relation to delete from */ char *relname; /* relation to delete from */
Node *whereClause; /* qualifications */ Node *whereClause; /* qualifications */
} DeleteStmt; } DeleteStmt;
/* ---------------------- /* ----------------------
* Update Statement * Update Statement
@ -574,7 +595,7 @@ typedef struct ReplaceStmt
List *targetList; /* the target list (of ResTarget) */ List *targetList; /* the target list (of ResTarget) */
Node *whereClause; /* qualifications */ Node *whereClause; /* qualifications */
List *fromClause; /* the from clause */ List *fromClause; /* the from clause */
} ReplaceStmt; } ReplaceStmt;
/* ---------------------- /* ----------------------
* Create Cursor Statement * Create Cursor Statement
@ -591,7 +612,7 @@ typedef struct CursorStmt
Node *whereClause; /* qualifications */ Node *whereClause; /* qualifications */
List *groupClause; /* group by clause */ List *groupClause; /* group by clause */
List *sortClause; /* sort clause (a list of SortGroupBy's) */ List *sortClause; /* sort clause (a list of SortGroupBy's) */
} CursorStmt; } CursorStmt;
/* ---------------------- /* ----------------------
* Select Statement * Select Statement
@ -609,7 +630,7 @@ typedef struct RetrieveStmt
Node *havingClause; /* having conditional-expression */ Node *havingClause; /* having conditional-expression */
List *selectClause; /* subselect parameters */ List *selectClause; /* subselect parameters */
List *sortClause; /* sort clause (a list of SortGroupBy's) */ List *sortClause; /* sort clause (a list of SortGroupBy's) */
} RetrieveStmt; } RetrieveStmt;
/**************************************************************************** /****************************************************************************
@ -628,7 +649,7 @@ typedef struct SubSelect
Node *whereClause; /* qualifications */ Node *whereClause; /* qualifications */
List *groupClause; /* group by clause */ List *groupClause; /* group by clause */
Node *havingClause; /* having conditional-expression */ Node *havingClause; /* having conditional-expression */
} SubSelect; } SubSelect;
/* /*
* TypeName - specifies a type in definitions * TypeName - specifies a type in definitions
@ -641,7 +662,7 @@ typedef struct TypeName
bool setof; /* is a set? */ bool setof; /* is a set? */
List *arrayBounds; /* array bounds */ List *arrayBounds; /* array bounds */
int typlen; /* length for char() and varchar() */ int typlen; /* length for char() and varchar() */
} TypeName; } TypeName;
/* /*
* ParamNo - specifies a parameter reference * ParamNo - specifies a parameter reference
@ -651,7 +672,7 @@ typedef struct ParamNo
NodeTag type; NodeTag type;
int number; /* the number of the parameter */ int number; /* the number of the parameter */
TypeName *typename; /* the typecast */ TypeName *typename; /* the typecast */
} ParamNo; } ParamNo;
/* /*
* A_Expr - binary expressions * A_Expr - binary expressions
@ -702,7 +723,7 @@ typedef struct ColumnDef
TypeName *typename; /* type of column */ TypeName *typename; /* type of column */
bool is_not_null; /* flag to NOT NULL constraint */ bool is_not_null; /* flag to NOT NULL constraint */
char *defval; /* default value of column */ char *defval; /* default value of column */
} ColumnDef; } ColumnDef;
/* /*
* Ident - * Ident -
@ -718,7 +739,7 @@ typedef struct Ident
List *indirection; /* array references */ List *indirection; /* array references */
bool isRel; /* is a relation - filled in by bool isRel; /* is a relation - filled in by
* transformExpr() */ * transformExpr() */
} Ident; } Ident;
/* /*
* FuncCall - a function/aggregate invocation * FuncCall - a function/aggregate invocation
@ -728,7 +749,7 @@ typedef struct FuncCall
NodeTag type; NodeTag type;
char *funcname; /* name of function */ char *funcname; /* name of function */
List *args; /* the arguments (list of exprs) */ List *args; /* the arguments (list of exprs) */
} FuncCall; } FuncCall;
/* /*
* A_Indices - array reference or bounds ([lidx:uidx] or [uidx]) * A_Indices - array reference or bounds ([lidx:uidx] or [uidx])
@ -751,7 +772,7 @@ typedef struct ResTarget
List *indirection; /* array references */ List *indirection; /* array references */
Node *val; /* the value of the result (A_Expr or Node *val; /* the value of the result (A_Expr or
* Attr) (or A_Const) */ * Attr) (or A_Const) */
} ResTarget; } ResTarget;
/* /*
* ParamString - used in with clauses * ParamString - used in with clauses
@ -761,7 +782,7 @@ typedef struct ParamString
NodeTag type; NodeTag type;
char *name; char *name;
char *val; char *val;
} ParamString; } ParamString;
/* /*
* TimeRange - specifies a time range * TimeRange - specifies a time range
@ -771,7 +792,7 @@ typedef struct TimeRange
NodeTag type; NodeTag type;
char *startDate; char *startDate;
char *endDate; /* snapshot if NULL */ char *endDate; /* snapshot if NULL */
} TimeRange; } TimeRange;
/* /*
* RelExpr - relation expressions * RelExpr - relation expressions
@ -782,7 +803,7 @@ typedef struct RelExpr
char *relname; /* the relation name */ char *relname; /* the relation name */
bool inh; /* inheritance query */ bool inh; /* inheritance query */
TimeRange *timeRange; /* the time range */ TimeRange *timeRange; /* the time range */
} RelExpr; } RelExpr;
/* /*
* SortGroupBy - for order by clause * SortGroupBy - for order by clause
@ -794,7 +815,7 @@ typedef struct SortGroupBy
char *range; char *range;
char *name; /* name of column to sort on */ char *name; /* name of column to sort on */
char *useOp; /* operator to use */ char *useOp; /* operator to use */
} SortGroupBy; } SortGroupBy;
/* /*
* RangeVar - range variable, used in from clauses * RangeVar - range variable, used in from clauses
@ -804,7 +825,7 @@ typedef struct RangeVar
NodeTag type; NodeTag type;
RelExpr *relExpr; /* the relation expression */ RelExpr *relExpr; /* the relation expression */
char *name; /* the name to be referenced (optional) */ char *name; /* the name to be referenced (optional) */
} RangeVar; } RangeVar;
/* /*
* IndexElem - index parameters (used in create index) * IndexElem - index parameters (used in create index)
@ -816,7 +837,7 @@ typedef struct IndexElem
List *args; /* if not NULL, function index */ List *args; /* if not NULL, function index */
char *class; char *class;
TypeName *tname; /* type of index's keys (optional) */ TypeName *tname; /* type of index's keys (optional) */
} IndexElem; } IndexElem;
/* /*
* DefElem - * DefElem -
@ -827,7 +848,7 @@ typedef struct DefElem
NodeTag type; NodeTag type;
char *defname; char *defname;
Node *arg; /* a (Value *) or a (TypeName *) */ Node *arg; /* a (Value *) or a (TypeName *) */
} DefElem; } DefElem;
/**************************************************************************** /****************************************************************************
@ -847,7 +868,7 @@ typedef struct TargetEntry
Resdom *resdom; /* fjoin overload this to be a list?? */ Resdom *resdom; /* fjoin overload this to be a list?? */
Fjoin *fjoin; Fjoin *fjoin;
Node *expr; /* can be a list too */ Node *expr; /* can be a list too */
} TargetEntry; } TargetEntry;
/* /*
* RangeTblEntry - * RangeTblEntry -
@ -873,7 +894,7 @@ typedef struct RangeTblEntry
bool archive; /* filled in by plan_archive */ bool archive; /* filled in by plan_archive */
bool inFromCl; /* comes from From Clause */ bool inFromCl; /* comes from From Clause */
TimeQual timeQual; /* filled in by pg_plan */ TimeQual timeQual; /* filled in by pg_plan */
} RangeTblEntry; } RangeTblEntry;
/* /*
* SortClause - * SortClause -
@ -884,7 +905,7 @@ typedef struct SortClause
NodeTag type; NodeTag type;
Resdom *resdom; /* attributes in tlist to be sorted */ Resdom *resdom; /* attributes in tlist to be sorted */
Oid opoid; /* sort operators */ Oid opoid; /* sort operators */
} SortClause; } SortClause;
/* /*
* GroupClause - * GroupClause -
@ -895,6 +916,6 @@ typedef struct GroupClause
NodeTag type; NodeTag type;
TargetEntry *entry; /* attributes to group on */ TargetEntry *entry; /* attributes to group on */
Oid grpOpoid; /* the sort operator to use */ Oid grpOpoid; /* the sort operator to use */
} GroupClause; } GroupClause;
#endif /* PARSENODES_H */ #endif /* PARSENODES_H */

3
src/include/utils/rel.h
Unescape View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: rel.h,v 1.12 1997/09/08 21:55:16 momjian Exp $ * $Id: rel.h,v 1.13 1997/10/28 15:11:43 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -25,6 +25,7 @@ typedef struct Trigger
char *tgname; char *tgname;
Oid tgfoid; Oid tgfoid;
func_ptr tgfunc; func_ptr tgfunc;
func_ptr tgplfunc;
int16 tgtype; int16 tgtype;
int16 tgnargs; int16 tgnargs;
int16 tgattr[8]; int16 tgattr[8];

3
src/include/utils/syscache.h
Unescape View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: syscache.h,v 1.7 1997/09/08 21:55:17 momjian Exp $ * $Id: syscache.h,v 1.8 1997/10/28 15:11:45 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -59,6 +59,7 @@
#define REWRITENAME 25 #define REWRITENAME 25
#define PROSRC 26 #define PROSRC 26
#define CLADEFTYPE 27 #define CLADEFTYPE 27
#define LANOID 28
/* ---------------- /* ----------------
* struct cachedesc: information needed for a call to InitSysCache() * struct cachedesc: information needed for a call to InitSysCache()

Write Preview
Loading…
Cancel
Save