diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2020-01-04 11:56:58 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2020-01-04 13:12:41 +0100 |
| commit | 3fd40b628c7db4c4bcf03b548f9a55f85e327e25 (patch) | |
| tree | 5db105f66b7f6b3fd753e8d43abc0455d7e25dbe /src/include/commands | |
| parent | d2e5e20e57111cca9e14f6e5a99a186d4c66a5b7 (diff) | |
| download | postgresql-3fd40b628c7db4c4bcf03b548f9a55f85e327e25.tar.gz | |
Make better use of ParseState in ProcessUtility
Pass ParseState into the functions called from
standard_ProcessUtility() instead passing the query string and query
environment separately. No functionality change, but it makes the
notation consistent. We had already started moving things into
that direction piece by piece, and this completes it.
Reviewed-by: Pavel Stehule <pavel.stehule@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/6e7aa4a1-be6a-1a75-b1f9-83a678e5184a@2ndquadrant.com
Diffstat (limited to 'src/include/commands')
| -rw-r--r-- | src/include/commands/createas.h | 2 | ||||
| -rw-r--r-- | src/include/commands/explain.h | 4 | ||||
| -rw-r--r-- | src/include/commands/portalcmds.h | 5 | ||||
| -rw-r--r-- | src/include/commands/prepare.h | 7 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/include/commands/createas.h b/src/include/commands/createas.h index 72c97702e4..7743851a38 100644 --- a/src/include/commands/createas.h +++ b/src/include/commands/createas.h @@ -21,7 +21,7 @@ #include "utils/queryenvironment.h" -extern ObjectAddress ExecCreateTableAs(CreateTableAsStmt *stmt, const char *queryString, +extern ObjectAddress ExecCreateTableAs(ParseState *pstate, CreateTableAsStmt *stmt, ParamListInfo params, QueryEnvironment *queryEnv, char *completionTag); extern int GetIntoRelEFlags(IntoClause *intoClause); diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index c727da5fe1..45027a7c47 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -64,8 +64,8 @@ typedef const char *(*explain_get_index_name_hook_type) (Oid indexId); extern PGDLLIMPORT explain_get_index_name_hook_type explain_get_index_name_hook; -extern void ExplainQuery(ParseState *pstate, ExplainStmt *stmt, const char *queryString, - ParamListInfo params, QueryEnvironment *queryEnv, DestReceiver *dest); +extern void ExplainQuery(ParseState *pstate, ExplainStmt *stmt, + ParamListInfo params, DestReceiver *dest); extern ExplainState *NewExplainState(void); diff --git a/src/include/commands/portalcmds.h b/src/include/commands/portalcmds.h index 8fef0302b5..4ecc1a2ecd 100644 --- a/src/include/commands/portalcmds.h +++ b/src/include/commands/portalcmds.h @@ -15,11 +15,12 @@ #define PORTALCMDS_H #include "nodes/parsenodes.h" +#include "parser/parse_node.h" #include "utils/portal.h" -extern void PerformCursorOpen(DeclareCursorStmt *cstmt, ParamListInfo params, - const char *queryString, bool isTopLevel); +extern void PerformCursorOpen(ParseState *pstate, DeclareCursorStmt *cstmt, ParamListInfo params, + bool isTopLevel); extern void PerformPortalFetch(FetchStmt *stmt, DestReceiver *dest, char *completionTag); diff --git a/src/include/commands/prepare.h b/src/include/commands/prepare.h index 9d09fb2b12..a0509e1f33 100644 --- a/src/include/commands/prepare.h +++ b/src/include/commands/prepare.h @@ -35,10 +35,11 @@ typedef struct /* Utility statements PREPARE, EXECUTE, DEALLOCATE, EXPLAIN EXECUTE */ -extern void PrepareQuery(PrepareStmt *stmt, const char *queryString, +extern void PrepareQuery(ParseState *pstate, PrepareStmt *stmt, int stmt_location, int stmt_len); -extern void ExecuteQuery(ExecuteStmt *stmt, IntoClause *intoClause, - const char *queryString, ParamListInfo params, +extern void ExecuteQuery(ParseState *pstate, + ExecuteStmt *stmt, IntoClause *intoClause, + ParamListInfo params, DestReceiver *dest, char *completionTag); extern void DeallocateQuery(DeallocateStmt *stmt); extern void ExplainExecuteQuery(ExecuteStmt *execstmt, IntoClause *into, |