Support DuckDB 2.0 triggers with transition tables and a statement body

DuckDB writes CREATE TRIGGER ... REFERENCING OLD TABLE AS o NEW TABLE AS
n FOR EACH STATEMENT <statement>, i.e. the standard header with a SQL
statement instead of EXECUTE FUNCTION. The standard-form parser now
accepts a statement body, and such triggers are recognised and rendered
as standard rather than MySQL-style triggers.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EqinwHBKuAtPEmtXr3b5P2

Author: hayssams

src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateTrigger.java

@@ -241,7 +241,9 @@ public void visit(Consumer<Table> tables, Consumer<Expression> expressions) {
     }
 
     public void appendTo(StringBuilder sql, Consumer<Expression> visitor) {
-        if (routine == null) {
+        // MySQL's shorter form has neither a routine nor any of the standard clauses
+        if (routine == null && transitionRelations.isEmpty() && !constraint
+                && orientation != Orientation.STATEMENT) {
             sql.append(mysqlSql());
             return;
         }
@@ -252,8 +254,13 @@ public void appendTo(StringBuilder sql, Consumer<Expression> visitor) {
             visitor.accept(whenExpression);
             sql.append(')');
         }
-        sql.append(" EXECUTE ").append(executeKeyword).append(' ');
-        visitor.accept(routine);
+        if (routine != null) {
+            sql.append(" EXECUTE ").append(executeKeyword).append(' ');
+            visitor.accept(routine);
+        } else {
+            // DuckDB 2.0 runs a statement rather than a function
+            sql.append(' ').append(body);
+        }
     }
 
     private void appendPostgreSqlHeader(StringBuilder sql, Consumer<Expression> visitor) {

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -1515,6 +1515,8 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
             Token token = getToken(i);
             if (token.kind == EOF || ";".equals(token.image) || token.kind == K_BEGIN) { return false; }
             if (token.kind == K_EXECUTE && (getToken(i + 1).kind == K_FUNCTION || getToken(i + 1).kind == K_PROCEDURE)) { return true; }
+            // DuckDB 2.0 uses the standard header with a statement body instead of EXECUTE
+            if ("REFERENCING".equalsIgnoreCase(token.image) || token.kind == K_STATEMENT) { return true; }
         }
     }
 
@@ -17092,6 +17094,7 @@ CreateTrigger PostgreSqlTrigger(boolean replace):
 {
     CreateTrigger result = new CreateTrigger(); String name; Table table; CreateTrigger.Timing timing;
     TriggerEvent event; TransitionRelation transition; Expression expression; Token token; boolean negative = false;
+    Statement body = null;
     Function routine = new Function(); ExpressionList<Expression> arguments = new ExpressionList<Expression>();
 }
 {
@@ -17104,7 +17107,8 @@ CreateTrigger PostgreSqlTrigger(boolean replace):
     event=PostgreSqlTriggerEvent() { result.getEvents().add(event); }
     ( <K_OR> event=PostgreSqlTriggerEvent() { result.getEvents().add(event); } )*
     <K_ON> table=Table() { result.setTable(table); }
-    [ <K_FROM> table=Table() { result.setReferencedTable(table); } ]
+    // greedy: FROM here names the referenced table, it never starts the trigger body
+    [ LOOKAHEAD(2) <K_FROM> table=Table() { result.setReferencedTable(table); } ]
     [ [ <K_NOT> { negative = true; } ] <K_DEFERRABLE> { result.getConstraintAttributes().setDeferrable(!negative); } ]
     [ LOOKAHEAD({ isAccessKeywordAhead("INITIALLY") })
       AccessKeyword("INITIALLY") ( token=<S_IDENTIFIER> )
@@ -17117,12 +17121,18 @@ CreateTrigger PostgreSqlTrigger(boolean replace):
       ( <K_ROW> { result.setOrientation(CreateTrigger.Orientation.ROW); }
         | <K_STATEMENT> { result.setOrientation(CreateTrigger.Orientation.STATEMENT); } ) ]
     [ <K_WHEN> "(" expression=Expression() ")" { result.setWhenExpression(expression); } ]
-    <K_EXECUTE> ( <K_FUNCTION> | <K_PROCEDURE> { result.setExecuteKeyword(CreateTrigger.ExecuteKeyword.PROCEDURE); } )
-    name=AccessQualifiedName() { routine.setName(name); }
-    "(" [ expression=PostgreSqlTriggerArgument() { arguments.add(expression); }
-          ( "," expression=PostgreSqlTriggerArgument() { arguments.add(expression); } )* ] ")"
+    (
+        LOOKAHEAD(2)
+        <K_EXECUTE> ( <K_FUNCTION> | <K_PROCEDURE> { result.setExecuteKeyword(CreateTrigger.ExecuteKeyword.PROCEDURE); } )
+        name=AccessQualifiedName() { routine.setName(name); }
+        "(" [ expression=PostgreSqlTriggerArgument() { arguments.add(expression); }
+              ( "," expression=PostgreSqlTriggerArgument() { arguments.add(expression); } )* ] ")"
+        { routine.setParameters(arguments); result.setRoutine(routine); }
+        |
+        // DuckDB 2.0 runs a statement rather than a function
+        body=SingleStatement() { result.setBody(body); }
+    )
     {
-        routine.setParameters(arguments); result.setRoutine(routine);
         requireAccessSyntax(!result.isConstraint() || !replace && result.getTiming() == CreateTrigger.Timing.AFTER
             && result.getOrientation() == CreateTrigger.Orientation.ROW, "A constraint trigger requires AFTER FOR EACH ROW without OR REPLACE");
         requireAccessSyntax(result.isConstraint() || result.getReferencedTable() == null

src/test/java/net/sf/jsqlparser/statement/select/DuckDBTest.java

@@ -25,6 +25,7 @@
 import net.sf.jsqlparser.statement.CopyStatement;
 import net.sf.jsqlparser.statement.create.macro.CreateMacro;
 import net.sf.jsqlparser.statement.create.extension.CreateExtensionRepository;
+import net.sf.jsqlparser.statement.create.trigger.CreateTrigger;
 import net.sf.jsqlparser.test.TestUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -527,4 +528,33 @@ void testCreatePostgresExtensionStillParses() throws JSQLParserException {
         String sqlStr = "CREATE EXTENSION IF NOT EXISTS hstore WITH SCHEMA public CASCADE";
         TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
     }
+
+    @Test
+    void testCreateTriggerWithTransitionTablesAndStatementBody() throws JSQLParserException {
+        String sqlStr = "CREATE TRIGGER trg_audit AFTER UPDATE ON target "
+                + "REFERENCING OLD TABLE AS o NEW TABLE AS n FOR EACH STATEMENT "
+                + "INSERT INTO audit SELECT n.id, o.val, n.val FROM o JOIN n ON o.id = n.id";
+        CreateTrigger createTrigger =
+                (CreateTrigger) TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+
+        Assertions.assertEquals(2, createTrigger.getTransitionRelations().size());
+        Assertions.assertEquals(CreateTrigger.Orientation.STATEMENT,
+                createTrigger.getOrientation());
+        Assertions.assertNotNull(createTrigger.getBody());
+    }
+
+    @Test
+    void testCreateTriggerBeforeDeleteWithStatementBody() throws JSQLParserException {
+        String sqlStr = "CREATE TRIGGER trg BEFORE DELETE ON t REFERENCING OLD TABLE AS o "
+                + "FOR EACH STATEMENT DELETE FROM audit WHERE id IN (SELECT id FROM o)";
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
+
+    @Test
+    void testPostgreSqlTriggerStillParses() throws JSQLParserException {
+        String sqlStr = "CREATE TRIGGER trg AFTER UPDATE ON target "
+                + "REFERENCING OLD TABLE AS o NEW TABLE AS n FOR EACH STATEMENT "
+                + "EXECUTE FUNCTION f()";
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
 }