diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/tcop/utility.h | 8 | ||||
| -rw-r--r-- | src/include/utils/portal.h | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h index 6674dec129e..985cfb507b7 100644 --- a/src/include/tcop/utility.h +++ b/src/include/tcop/utility.h @@ -7,14 +7,14 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tcop/utility.h,v 1.28 2006/08/12 20:05:56 tgl Exp $ + * $PostgreSQL: pgsql/src/include/tcop/utility.h,v 1.29 2006/09/07 22:52:01 tgl Exp $ * *------------------------------------------------------------------------- */ #ifndef UTILITY_H #define UTILITY_H -#include "executor/execdesc.h" +#include "tcop/tcopprot.h" extern void ProcessUtility(Node *parsetree, ParamListInfo params, @@ -28,6 +28,10 @@ extern const char *CreateCommandTag(Node *parsetree); extern const char *CreateQueryTag(Query *parsetree); +extern LogStmtLevel GetCommandLogLevel(Node *parsetree); + +extern LogStmtLevel GetQueryLogLevel(Query *parsetree); + extern bool QueryReturnsTuples(Query *parsetree); extern bool QueryIsReadOnly(Query *parsetree); diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 4a546bdda96..a377b0ca21a 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -39,7 +39,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.69 2006/09/03 03:19:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.70 2006/09/07 22:52:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -110,7 +110,7 @@ typedef struct PortalData { /* Bookkeeping data */ const char *name; /* portal's name */ - const char *prepStmtName; /* protocol prepare name */ + const char *prepStmtName; /* source prepared statement (NULL if none) */ MemoryContext heap; /* subsidiary memory for portal */ ResourceOwner resowner; /* resources owned by portal */ void (*cleanup) (Portal portal); /* cleanup hook */ @@ -122,20 +122,20 @@ typedef struct PortalData */ /* The query or queries the portal will execute */ - const char *sourceText; /* text of query, if known, might be NULL */ - const char *bindText; /* text of bind parameters, might be NULL */ + const char *sourceText; /* text of query, if known (may be NULL) */ const char *commandTag; /* command tag for original query */ List *parseTrees; /* parse tree(s) */ List *planTrees; /* plan tree(s) */ - MemoryContext queryContext; /* where the above trees live */ + MemoryContext queryContext; /* where the parse trees live */ /* * Note: queryContext effectively identifies which prepared statement the * portal depends on, if any. The queryContext is *not* owned by the * portal and is not to be deleted by portal destruction. (But for a * cursor it is the same as "heap", and that context is deleted by portal - * destruction.) + * destruction.) The plan trees may be in either queryContext or heap. */ + ParamListInfo portalParams; /* params to pass to query */ /* Features/options */ @@ -216,7 +216,6 @@ extern Portal GetPortalByName(const char *name); extern void PortalDefineQuery(Portal portal, const char *prepStmtName, const char *sourceText, - const char *bindText, const char *commandTag, List *parseTrees, List *planTrees, |