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/backend/tcop/utility.c | |
| 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/backend/tcop/utility.c')
| -rw-r--r-- | src/backend/tcop/utility.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 4474658ddf..b2c58bf862 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -396,6 +396,7 @@ standard_ProcessUtility(PlannedStmt *pstmt, pstate = make_parsestate(NULL); pstate->p_sourcetext = queryString; + pstate->p_queryEnv = queryEnv; switch (nodeTag(parsetree)) { @@ -500,8 +501,8 @@ standard_ProcessUtility(PlannedStmt *pstmt, * Portal (cursor) manipulation */ case T_DeclareCursorStmt: - PerformCursorOpen((DeclareCursorStmt *) parsetree, params, - queryString, isTopLevel); + PerformCursorOpen(pstate, (DeclareCursorStmt *) parsetree, params, + isTopLevel); break; case T_ClosePortalStmt: @@ -558,13 +559,14 @@ standard_ProcessUtility(PlannedStmt *pstmt, case T_PrepareStmt: CheckRestrictedOperation("PREPARE"); - PrepareQuery((PrepareStmt *) parsetree, queryString, + PrepareQuery(pstate, (PrepareStmt *) parsetree, pstmt->stmt_location, pstmt->stmt_len); break; case T_ExecuteStmt: - ExecuteQuery((ExecuteStmt *) parsetree, NULL, - queryString, params, + ExecuteQuery(pstate, + (ExecuteStmt *) parsetree, NULL, + params, dest, completionTag); break; @@ -667,8 +669,7 @@ standard_ProcessUtility(PlannedStmt *pstmt, break; case T_ExplainStmt: - ExplainQuery(pstate, (ExplainStmt *) parsetree, queryString, params, - queryEnv, dest); + ExplainQuery(pstate, (ExplainStmt *) parsetree, params, dest); break; case T_AlterSystemStmt: @@ -1490,9 +1491,8 @@ ProcessUtilitySlow(ParseState *pstate, break; case T_CreateTableAsStmt: - address = ExecCreateTableAs((CreateTableAsStmt *) parsetree, - queryString, params, queryEnv, - completionTag); + address = ExecCreateTableAs(pstate, (CreateTableAsStmt *) parsetree, + params, queryEnv, completionTag); break; case T_RefreshMatViewStmt: |