mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-27 08:39:28 +08:00
Fix UtilityContainsQuery() to handle CREATE TABLE AS EXECUTE correctly.
The code seems to have been written to handle the pre-parse-analysis representation, where an ExecuteStmt would appear directly under CreateTableAsStmt. But in reality the function is only run on already-parse-analyzed statements, so there will be a Query node in between. We'd not noticed the bug because the function is generally not used at all except in extended query protocol. Per report from Robert Haas and Rushabh Lathia.
This commit is contained in:
parent
4e32f8cd14
commit
5d1abe64e6
@ -1508,16 +1508,11 @@ UtilityContainsQuery(Node *parsetree)
|
||||
return qry;
|
||||
|
||||
case T_CreateTableAsStmt:
|
||||
/* might or might not contain a Query ... */
|
||||
qry = (Query *) ((CreateTableAsStmt *) parsetree)->query;
|
||||
if (IsA(qry, Query))
|
||||
{
|
||||
/* Recursion currently can't be necessary here */
|
||||
Assert(qry->commandType != CMD_UTILITY);
|
||||
return qry;
|
||||
}
|
||||
Assert(IsA(qry, ExecuteStmt));
|
||||
return NULL;
|
||||
Assert(IsA(qry, Query));
|
||||
if (qry->commandType == CMD_UTILITY)
|
||||
return UtilityContainsQuery(qry->utilityStmt);
|
||||
return qry;
|
||||
|
||||
default:
|
||||
return NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user