Reject SQL functions containing utility statements

The check was not effective for the same reason as 5a54abb7acd, that is
not accounting for XL wrapping the original command into RawStmt. Fix
that by checking parsetree->stmt, and also add an assert checking we
actually got a RawStmt in the first place.

diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 3ba00c34cae8983366fea4c78c8f592d1a325249..088111f0d5aa74b7a96ccd93dcd0ec640cf970dd 100644 (file)
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -937,9 +937,11 @@ fmgr_sql_validator(PG_FUNCTION_ARGS)
                                RawStmt    *parsetree = lfirst_node(RawStmt, lc);
                                List       *querytree_sublist;
 
+                               Assert(IsA(parsetree, RawStmt));
+
 #ifdef PGXC
                                /* Block CTAS in SQL functions */
-                               if (IsA(parsetree, CreateTableAsStmt))
+                               if (IsA(parsetree->stmt, CreateTableAsStmt))
                                        ereport(ERROR,
                                                        (errcode(ERRCODE_SYNTAX_ERROR),
                                                        errmsg("In XC, SQL functions cannot contain utility statements")));