NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit5d1abe6

committed

Fix UtilityContainsQuery() to handle CREATE TABLE AS EXECUTE correctly.

The code seems to have been written to handle the pre-parse-analysisrepresentation, where an ExecuteStmt would appear directly underCreateTableAsStmt. But in reality the function is only run onalready-parse-analyzed statements, so there will be a Query node inbetween. We'd not noticed the bug because the function is generallynot used at all except in extended query protocol.Per report from Robert Haas and Rushabh Lathia.

1 parent4e32f8c commit5d1abe6Copy full SHA for 5d1abe6

File tree

1 file changed

-9

lines changed

src/backend/tcop
- utility.c

1 file changed

-9

lines changed

`‎src/backend/tcop/utility.c‎`

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1508,16 +1508,11 @@ UtilityContainsQuery(Node *parsetree)`
`1508`	`1508`	`returnqry;`
`1509`	`1509`
`1510`	`1510`	`caseT_CreateTableAsStmt:`
`1511`		`-/* might or might not contain a Query ... */`
`1512`	`1511`	`qry= (Query) ((CreateTableAsStmt)parsetree)->query;`
`1513`		`-if (IsA(qry,Query))`
`1514`		`-{`
`1515`		`-/* Recursion currently can't be necessary here */`
`1516`		`-Assert(qry->commandType!=CMD_UTILITY);`
`1517`		`-returnqry;`
`1518`		`-}`
`1519`		`-Assert(IsA(qry,ExecuteStmt));`
`1520`		`-returnNULL;`
	`1512`	`+Assert(IsA(qry,Query));`
	`1513`	`+if (qry->commandType==CMD_UTILITY)`
	`1514`	`+returnUtilityContainsQuery(qry->utilityStmt);`
	`1515`	`+returnqry;`
`1521`	`1516`
`1522`	`1517`	`default:`
`1523`	`1518`	`returnNULL;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5d1abe6

File tree

1 file changed

1 file changed

`‎src/backend/tcop/utility.c‎`

0 commit comments