BREAKING! Split EXECUTE and EXECUTE IMMEDIATE to separate _stmt types

Author: nene

src/cst/PreparedStatements.ts

@@ -1,19 +1,25 @@
 import { Alias } from "./Alias";
 import { BaseNode, Keyword } from "./Base";
-import { Expr, Identifier, ListExpr } from "./Expr";
+import { EntityName, Expr, Identifier, ListExpr } from "./Expr";
 
 export type AllPreparedStatementNodes =
   | AllPreparedStatements
   | ExecuteIntoClause
   | ExecuteUsingClause;
 
-export type AllPreparedStatements = ExecuteStmt;
+export type AllPreparedStatements = ExecuteStmt | ExecuteImmediateStmt;
 
 // EXECUTE
 export interface ExecuteStmt extends BaseNode {
   type: "execute_stmt";
   executeKw: Keyword<"EXECUTE">;
-  immediateKw?: Keyword<"IMMEDIATE">;
+  name: EntityName;
+}
+
+export interface ExecuteImmediateStmt extends BaseNode {
+  type: "execute_immediate_stmt";
+  executeKw: Keyword<"EXECUTE">;
+  immediateKw: Keyword<"IMMEDIATE">;
   expr: Expr;
   into?: ExecuteIntoClause;
   using?: ExecuteUsingClause;

src/parser.pegjs

@@ -93,7 +93,7 @@ statement_mysql
 
 statement_bigquery
   = proc_statement
-  / execute_stmt
+  / execute_immediate_stmt
   / bigquery_statement
 
 statement_postgres
@@ -5524,11 +5524,20 @@ raise_message
  * ------------------------------------------------------------------------------------ *
  */
 execute_stmt
-  = kw:(EXECUTE __) immedKw:(immediate_kw __)? expr:expr
+  = kw:(EXECUTE __) name:entity_name {
+      return loc({
+        type: "execute_stmt",
+        executeKw: read(kw),
+        name,
+      });
+    }
+
+execute_immediate_stmt
+  = kw:(EXECUTE __) immedKw:(IMMEDIATE __) expr:expr
     into:(__ execute_into_clause)?
     using:(__ execute_using_clause)? {
       return loc({
-        type: "execute_stmt",
+        type: "execute_immediate_stmt",
         executeKw: read(kw),
         immediateKw: read(immedKw),
         expr,
@@ -5537,9 +5546,6 @@ execute_stmt
       });
     }
 
-immediate_kw
-  = x:IMMEDIATE &bigquery { return x; }
-
 execute_into_clause
   = kw:(INTO __) variables:list$ident {
     return loc({

src/showNode/prepared_statements.ts

@@ -6,7 +6,8 @@ export const preparedStatementsMap: FullTransformMap<
   string,
   AllPreparedStatementNodes
 > = {
-  execute_stmt: (node) =>
+  execute_stmt: (node) => show([node.executeKw, node.name]),
+  execute_immediate_stmt: (node) =>
     show([node.executeKw, node.immediateKw, node.expr, node.into, node.using]),
   execute_into_clause: (node) => show([node.intoKw, node.variables]),
   execute_using_clause: (node) => show([node.usingKw, node.values]),