diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/pg_stat_statements/pg_stat_statements.c | 14 | ||||
| -rw-r--r-- | contrib/sepgsql/hooks.c | 7 |
2 files changed, 12 insertions, 9 deletions
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index 3d1b99f502d..7eec86fb289 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -292,7 +292,7 @@ static void pgss_ExecutorRun(QueryDesc *queryDesc, uint64 count); static void pgss_ExecutorFinish(QueryDesc *queryDesc); static void pgss_ExecutorEnd(QueryDesc *queryDesc); -static void pgss_ProcessUtility(Node *parsetree, const char *queryString, +static void pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString, ProcessUtilityContext context, ParamListInfo params, DestReceiver *dest, char *completionTag); static uint32 pgss_hash_fn(const void *key, Size keysize); @@ -942,10 +942,12 @@ pgss_ExecutorEnd(QueryDesc *queryDesc) * ProcessUtility hook */ static void -pgss_ProcessUtility(Node *parsetree, const char *queryString, +pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString, ProcessUtilityContext context, ParamListInfo params, DestReceiver *dest, char *completionTag) { + Node *parsetree = pstmt->utilityStmt; + /* * If it's an EXECUTE statement, we don't track it and don't increment the * nesting level. This allows the cycles to be charged to the underlying @@ -979,11 +981,11 @@ pgss_ProcessUtility(Node *parsetree, const char *queryString, PG_TRY(); { if (prev_ProcessUtility) - prev_ProcessUtility(parsetree, queryString, + prev_ProcessUtility(pstmt, queryString, context, params, dest, completionTag); else - standard_ProcessUtility(parsetree, queryString, + standard_ProcessUtility(pstmt, queryString, context, params, dest, completionTag); nested_level--; @@ -1044,11 +1046,11 @@ pgss_ProcessUtility(Node *parsetree, const char *queryString, else { if (prev_ProcessUtility) - prev_ProcessUtility(parsetree, queryString, + prev_ProcessUtility(pstmt, queryString, context, params, dest, completionTag); else - standard_ProcessUtility(parsetree, queryString, + standard_ProcessUtility(pstmt, queryString, context, params, dest, completionTag); } diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c index 15f40d83f11..93cc8debaa7 100644 --- a/contrib/sepgsql/hooks.c +++ b/contrib/sepgsql/hooks.c @@ -297,13 +297,14 @@ sepgsql_exec_check_perms(List *rangeTabls, bool abort) * break whole of the things if nefarious user would use. */ static void -sepgsql_utility_command(Node *parsetree, +sepgsql_utility_command(PlannedStmt *pstmt, const char *queryString, ProcessUtilityContext context, ParamListInfo params, DestReceiver *dest, char *completionTag) { + Node *parsetree = pstmt->utilityStmt; sepgsql_context_info_t saved_context_info = sepgsql_context_info; ListCell *cell; @@ -362,11 +363,11 @@ sepgsql_utility_command(Node *parsetree, } if (next_ProcessUtility_hook) - (*next_ProcessUtility_hook) (parsetree, queryString, + (*next_ProcessUtility_hook) (pstmt, queryString, context, params, dest, completionTag); else - standard_ProcessUtility(parsetree, queryString, + standard_ProcessUtility(pstmt, queryString, context, params, dest, completionTag); } |