Slightly correct context check for event triggers

petere · petere · commit f82d4d666ff5 · 2018-10-10T22:41:12.000+02:00
The previous check for a "complete query" omitted the new PROCESS_UTILITY_QUERY_NONATOMIC value. This didn't actually make a difference in practice, because only CALL and SET from PL/pgSQL run in this state, but it's more correct to include it anyway. Discussion: https://www.postgresql.org/message-id/4566041d-2567-74d2-d135-19ff6a20fe51%402ndquadrant.com
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
@@ -943,7 +943,7 @@ ProcessUtilitySlow(ParseState *pstate,
 {
 	Node	   *parsetree = pstmt->utilityStmt;
 	bool		isTopLevel = (context == PROCESS_UTILITY_TOPLEVEL);
-	bool		isCompleteQuery = (context <= PROCESS_UTILITY_QUERY);
+	bool		isCompleteQuery = (context != PROCESS_UTILITY_SUBCOMMAND);
 	bool		needCleanup;
 	bool		commandCollected = false;
 	ObjectAddress address;

Original file line number	Diff line number	Diff line change
`@@ -943,7 +943,7 @@ ProcessUtilitySlow(ParseState *pstate,`
`943`	`943`	`{`
`944`	`944`	`Node *parsetree = pstmt->utilityStmt;`
`945`	`945`	`bool isTopLevel = (context == PROCESS_UTILITY_TOPLEVEL);`
`946`		`- bool isCompleteQuery = (context <= PROCESS_UTILITY_QUERY);`
	`946`	`+ bool isCompleteQuery = (context != PROCESS_UTILITY_SUBCOMMAND);`
`947`	`947`	`bool needCleanup;`
`948`	`948`	`bool commandCollected = false;`
`949`	`949`	`ObjectAddress address;`