BREAKING! Use TriggerEventExpr instead of plain TriggerEvent

nene · Feb 12, 2024 · d5ca16d · d5ca16d
1 parent 9e0d309
commit d5ca16d
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/src/cst/Expr.ts b/src/cst/Expr.ts
@@ -1,7 +1,7 @@
 import { AllColumns, BaseNode, Empty, Keyword } from "./Base";
 import { DataType } from "./DataType";
 import { Literal, StringLiteral } from "./Literal";
-import { Node, Program } from "./Node";
+import { Node, Program, TriggerEventExpr } from "./Node";
 import {
   LimitClause,
   OrderByClause,
@@ -41,6 +41,7 @@ export type Expr =
   | ListExpr
   | ParenExpr
   | BinaryExpr
+  | BinaryExpr<TriggerEventExpr, Keyword<"OR">, TriggerEventExpr>
   | PrefixOpExpr
   | PostfixOpExpr
   | FuncCall

diff --git a/src/cst/Trigger.ts b/src/cst/Trigger.ts
@@ -1,6 +1,13 @@
 import { BaseNode, Keyword } from "./Base";
 import { RelationKind } from "./CreateTable";
-import { Expr, Identifier, ListExpr, EntityName, ParenExpr } from "./Expr";
+import {
+  Expr,
+  Identifier,
+  ListExpr,
+  EntityName,
+  ParenExpr,
+  BinaryExpr,
+} from "./Expr";
 import { BlockStmt } from "./ProceduralLanguage";
 
 export type AllTriggerNodes =
@@ -27,12 +34,16 @@ export interface CreateTriggerStmt extends BaseNode {
   ifNotExistsKw?: [Keyword<"IF">, Keyword<"NOT">, Keyword<"EXISTS">];
   name: EntityName;
   timeKw?: Keyword<"BEFORE" | "AFTER"> | [Keyword<"INSTEAD">, Keyword<"OF">];
-  event: TriggerEvent;
+  event: TriggerEventExpr;
   target: TriggerTarget;
   clauses: TriggerClause[];
   body: BlockStmt | ExecuteClause;
 }
 
+export type TriggerEventExpr =
+  | BinaryExpr<TriggerEventExpr, Keyword<"OR">, TriggerEventExpr>
+  | TriggerEvent;
+
 export interface TriggerEvent extends BaseNode {
   type: "trigger_event";
   eventKw: Keyword<"INSERT" | "DELETE" | "UPDATE" | "TRUNCATE">;

diff --git a/src/parser.pegjs b/src/parser.pegjs
@@ -3283,7 +3283,7 @@ create_trigger_stmt
     ifKw:(if_not_exists __)?
     name:(entity_name __)
     timeKw:(BEFORE __ / AFTER __ / INSTEAD __ OF __)?
-    event:(trigger_event __)
+    event:(trigger_event_expr __)
     target:(trigger_target __)
     clauses:(trigger_clause __)*
     body:trigger_body
@@ -3312,6 +3312,11 @@ trigger_kind
     return loc({ type: "relation_kind", kindKw: kw });
   }
 
+trigger_event_expr
+  = head:trigger_event tail:(__ OR __ trigger_event)* {
+    return createBinaryExprChain(head, tail);
+  }
+
 trigger_event
   = eventKw:(UPDATE __) ofKw:(OF __) cols:list$column {
       return loc({

diff --git a/test/ddl/trigger.test.ts b/test/ddl/trigger.test.ts
@@ -104,6 +104,14 @@ describe("trigger", () => {
         testWc(`CREATE CONSTRAINT TRIGGER my_trig AFTER INSERT ON my_tbl ${body}`);
       });
 
+      it("supports multiple events", () => {
+        testWc(`
+          CREATE TRIGGER my_trig AFTER INSERT OR UPDATE OF col1, col2 OR DELETE
+          ON my_tbl
+          ${body}
+        `);
+      });
+
       it("supports WHEN clause", () => {
         testWc(`CREATE TRIGGER my_trig AFTER INSERT ON my_tbl WHEN (x > 10) ${body}`);
       });

diff --git a/test/test_utils.ts b/test/test_utils.ts
@@ -6,6 +6,7 @@ import {
   SelectClause,
   Statement,
   SubSelect,
+  TriggerEvent,
   Whitespace,
 } from "../src/cst/Node";
 import {
@@ -152,7 +153,7 @@ export function showCompoundPrecedence(sql: string): string {
   return show(addPrecedenceParens(stmt));
 }
 
-function addPrecedenceParens<T extends Expr | SubSelect>(
+function addPrecedenceParens<T extends Expr | SubSelect | TriggerEvent>(
   expr: T
 ): ParenExpr<T> | T {
   const space: Whitespace[] = [{ type: "space", text: " " }];