diff options
Diffstat (limited to 'src/include/executor')
-rw-r--r-- | src/include/executor/executor.h | 7 | ||||
-rw-r--r-- | src/include/executor/functions.h | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 7f894f26d8b..21d8335cfb1 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.113 2004/09/13 20:07:52 tgl Exp $ + * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.114 2004/10/07 18:38:51 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -85,8 +85,11 @@ extern TupleHashEntry LookupTupleHashEntry(TupleHashTable hashtable, /* * prototypes from functions in execJunk.c */ -extern JunkFilter *ExecInitJunkFilter(List *targetList, TupleDesc tupType, +extern JunkFilter *ExecInitJunkFilter(List *targetList, bool hasoid, TupleTableSlot *slot); +extern JunkFilter *ExecInitJunkFilterConversion(List *targetList, + TupleDesc cleanTupType, + TupleTableSlot *slot); extern bool ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot, char *attrName, Datum *value, bool *isNull); extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot); diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h index 5701d62056e..5c20f47b101 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/functions.h,v 1.22 2004/08/29 04:13:06 momjian Exp $ + * $PostgreSQL: pgsql/src/include/executor/functions.h,v 1.23 2004/10/07 18:38:51 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,13 @@ #define FUNCTIONS_H #include "fmgr.h" +#include "nodes/execnodes.h" + extern Datum fmgr_sql(PG_FUNCTION_ARGS); +extern bool check_sql_fn_retval(Oid rettype, char fn_typtype, + List *queryTreeList, + JunkFilter **junkFilter); + #endif /* FUNCTIONS_H */ |