Skip to content

Commit 90ac3a7

Browse files
minleejaeminleejae
authored
feat: parse PostgreSQL event triggers, REINDEX, SECURITY LABEL and schema elements (#2818)
Add typed CreateEventTrigger, AlterEventTrigger, Reindex and SecurityLabel statements. Event triggers reuse the CREATE TRIGGER routine invocation and the shared trigger and rule enable states; SECURITY LABEL addresses routines through RoutineReference. REINDEX becomes a non-reserved keyword. CREATE SCHEMA parses PostgreSQL schema elements (CREATE TABLE, VIEW, INDEX, SEQUENCE, TRIGGER and GRANT), keeps their names as written and renders them, together with the PATH clause, in toString() and StatementDeParser. Signed-off-by: minleejae <mmj9808@gmail.com>
1 parent 55c13bf commit 90ac3a7

22 files changed

Lines changed: 2000 additions & 24 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ and missing syntax gets added on demand — [open an issue](https://github.com/J
152152
| **PostgreSQL RLS** | `CREATE POLICY` · `ALTER TABLE … ENABLE`/`DISABLE`/`FORCE`/`NO FORCE ROW LEVEL SECURITY` |
153153
| **Routine changes** | `ALTER FUNCTION` · `ALTER PROCEDURE` · `ALTER ROUTINE` · PostgreSQL `ALTER TRIGGER` |
154154
| **MySQL metadata statements** | `SHOW [FULL] COLUMNS`/`FIELDS` · `SHOW TABLE STATUS` · `SHOW CREATE TABLE`/`VIEW`/`PROCEDURE`/`FUNCTION`/`TRIGGER`/`EVENT`/`DATABASE`/`USER` |
155+
| **PostgreSQL administration** | `CREATE`/`ALTER EVENT TRIGGER` · `REINDEX` · `SECURITY LABEL` |
155156
| **Informix constraints** | `ALTER TABLE … ADD CONSTRAINT` with trailing constraint names for primary, unique, foreign and check constraints; enable with `parser.withDialect(Dialect.INFORMIX)` |
156157
| **Salesforce SOQL** | `INCLUDES` · `EXCLUDES` |
157158

‎src/main/java/net/sf/jsqlparser/parser/feature/Feature.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import net.sf.jsqlparser.statement.TableMaintenanceStatement;
3030
import net.sf.jsqlparser.statement.UseStatement;
3131
import net.sf.jsqlparser.statement.alter.Alter;
32+
import net.sf.jsqlparser.statement.alter.AlterEventTrigger;
3233
import net.sf.jsqlparser.statement.alter.sequence.AlterSequence;
3334
import net.sf.jsqlparser.statement.analyze.Analyze;
3435
import net.sf.jsqlparser.statement.comment.Comment;
@@ -40,6 +41,7 @@
4041
import net.sf.jsqlparser.statement.create.sequence.CreateSequence;
4142
import net.sf.jsqlparser.statement.create.synonym.CreateSynonym;
4243
import net.sf.jsqlparser.statement.create.table.CreateTable;
44+
import net.sf.jsqlparser.statement.create.trigger.CreateEventTrigger;
4345
import net.sf.jsqlparser.statement.create.view.AlterView;
4446
import net.sf.jsqlparser.statement.create.view.CreateView;
4547
import net.sf.jsqlparser.statement.delete.Delete;
@@ -48,6 +50,7 @@
4850
import net.sf.jsqlparser.statement.grant.Grant;
4951
import net.sf.jsqlparser.statement.merge.Merge;
5052
import net.sf.jsqlparser.statement.refresh.RefreshMaterializedViewStatement;
53+
import net.sf.jsqlparser.statement.reindex.Reindex;
5154
import net.sf.jsqlparser.statement.role.ReassignOwned;
5255
import net.sf.jsqlparser.statement.select.Fetch;
5356
import net.sf.jsqlparser.statement.select.First;
@@ -61,6 +64,7 @@
6164
import net.sf.jsqlparser.statement.select.TableFunction;
6265
import net.sf.jsqlparser.statement.select.Top;
6366
import net.sf.jsqlparser.statement.select.UnPivot;
67+
import net.sf.jsqlparser.statement.securitylabel.SecurityLabel;
6468
import net.sf.jsqlparser.statement.show.*;
6569
import net.sf.jsqlparser.statement.truncate.Truncate;
6670
import net.sf.jsqlparser.statement.update.Update;
@@ -633,6 +637,26 @@ public enum Feature {
633637
* SQL "CREATE TRIGGER" statement is allowed
634638
*/
635639
createTrigger,
640+
/**
641+
* PostgreSQL "CREATE EVENT TRIGGER" and "ALTER EVENT TRIGGER" statements are allowed
642+
*
643+
* @see CreateEventTrigger
644+
* @see AlterEventTrigger
645+
*/
646+
createEventTrigger, alterEventTrigger,
647+
/**
648+
* PostgreSQL "REINDEX" statement is allowed; "REINDEX … CONCURRENTLY" additionally requires
649+
* {@link #reindexConcurrently}
650+
*
651+
* @see Reindex
652+
*/
653+
reindex, reindexConcurrently,
654+
/**
655+
* PostgreSQL "SECURITY LABEL" statement is allowed
656+
*
657+
* @see SecurityLabel
658+
*/
659+
securityLabel,
636660
/**
637661
* SQL "COMMIT" statement is allowed
638662
*

‎src/main/java/net/sf/jsqlparser/statement/StatementFeatureVisitor.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import net.sf.jsqlparser.statement.alter.AlterSession;
3939
import net.sf.jsqlparser.statement.alter.AlterStatistics;
4040
import net.sf.jsqlparser.statement.alter.AlterSubscription;
41+
import net.sf.jsqlparser.statement.alter.AlterEventTrigger;
4142
import net.sf.jsqlparser.statement.alter.AlterSystemStatement;
4243
import net.sf.jsqlparser.statement.alter.AlterTablespace;
4344
import net.sf.jsqlparser.statement.alter.AlterTablespaceMove;
@@ -74,6 +75,7 @@
7475
import net.sf.jsqlparser.statement.create.table.CreateTable;
7576
import net.sf.jsqlparser.statement.create.tablespace.CreateTablespace;
7677
import net.sf.jsqlparser.statement.create.textsearch.CreateTextSearchConfiguration;
78+
import net.sf.jsqlparser.statement.create.trigger.CreateEventTrigger;
7779
import net.sf.jsqlparser.statement.create.trigger.CreateTrigger;
7880
import net.sf.jsqlparser.statement.create.type.CreateType;
7981
import net.sf.jsqlparser.statement.create.user.CreateUser;
@@ -99,6 +101,8 @@
99101
import net.sf.jsqlparser.statement.oracle.OracleBlock;
100102
import net.sf.jsqlparser.statement.oracle.OracleNullStatement;
101103
import net.sf.jsqlparser.statement.refresh.RefreshMaterializedViewStatement;
104+
import net.sf.jsqlparser.statement.reindex.Reindex;
105+
import net.sf.jsqlparser.statement.securitylabel.SecurityLabel;
102106
import net.sf.jsqlparser.statement.role.AlterRole;
103107
import net.sf.jsqlparser.statement.role.CreateRole;
104108
import net.sf.jsqlparser.statement.role.ReassignOwned;
@@ -1094,6 +1098,29 @@ public <S> Void visit(CreateTrigger statement, S context) {
10941098
return schemaOnly();
10951099
}
10961100

1101+
@Override
1102+
public <S> Void visit(CreateEventTrigger statement, S context) {
1103+
return schemaOnly();
1104+
}
1105+
1106+
@Override
1107+
public <S> Void visit(AlterEventTrigger statement, S context) {
1108+
return schemaOnly();
1109+
}
1110+
1111+
@Override
1112+
public <S> Void visit(Reindex statement, S context) {
1113+
analysis.claimTopLevel();
1114+
// rebuilds index storage from the indexed rows
1115+
analysis.certain(StmtFeature.MODIFIES_SCHEMA, StmtFeature.READS_DATA);
1116+
return null;
1117+
}
1118+
1119+
@Override
1120+
public <S> Void visit(SecurityLabel statement, S context) {
1121+
return schemaOnly();
1122+
}
1123+
10971124
@Override
10981125
public <S> Void visit(CreateType statement, S context) {
10991126
analysis.claimTopLevel();

‎src/main/java/net/sf/jsqlparser/statement/StatementVisitor.java‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656

5757
import net.sf.jsqlparser.statement.alter.Alter;
5858
import net.sf.jsqlparser.statement.alter.AlterSession;
59+
import net.sf.jsqlparser.statement.alter.AlterEventTrigger;
5960
import net.sf.jsqlparser.statement.alter.AlterSystemStatement;
6061
import net.sf.jsqlparser.statement.alter.RenameTableStatement;
6162
import net.sf.jsqlparser.statement.alter.AlterUser;
@@ -73,6 +74,7 @@
7374
import net.sf.jsqlparser.statement.create.synonym.CreateSynonym;
7475
import net.sf.jsqlparser.statement.create.table.CreateTable;
7576
import net.sf.jsqlparser.statement.create.tablespace.CreateTablespace;
77+
import net.sf.jsqlparser.statement.create.trigger.CreateEventTrigger;
7678
import net.sf.jsqlparser.statement.create.trigger.CreateTrigger;
7779
import net.sf.jsqlparser.statement.create.user.CreateUser;
7880
import net.sf.jsqlparser.statement.create.view.AlterView;
@@ -90,6 +92,8 @@
9092
import net.sf.jsqlparser.statement.lock.LockStatement;
9193
import net.sf.jsqlparser.statement.merge.Merge;
9294
import net.sf.jsqlparser.statement.refresh.RefreshMaterializedViewStatement;
95+
import net.sf.jsqlparser.statement.reindex.Reindex;
96+
import net.sf.jsqlparser.statement.securitylabel.SecurityLabel;
9397
import net.sf.jsqlparser.statement.select.Select;
9498
import net.sf.jsqlparser.statement.show.ShowCreateStatement;
9599
import net.sf.jsqlparser.statement.show.ShowIndexStatement;
@@ -280,6 +284,38 @@ default void visit(CreateTrigger createTrigger) {
280284
this.visit(createTrigger, null);
281285
}
282286

287+
default <S> T visit(CreateEventTrigger statement, S context) {
288+
return null;
289+
}
290+
291+
default void visit(CreateEventTrigger statement) {
292+
this.visit(statement, null);
293+
}
294+
295+
default <S> T visit(AlterEventTrigger statement, S context) {
296+
return null;
297+
}
298+
299+
default void visit(AlterEventTrigger statement) {
300+
this.visit(statement, null);
301+
}
302+
303+
default <S> T visit(Reindex statement, S context) {
304+
return null;
305+
}
306+
307+
default void visit(Reindex statement) {
308+
this.visit(statement, null);
309+
}
310+
311+
default <S> T visit(SecurityLabel statement, S context) {
312+
return null;
313+
}
314+
315+
default void visit(SecurityLabel statement) {
316+
this.visit(statement, null);
317+
}
318+
283319
<S> T visit(CreateView createView, S context);
284320

285321
default void visit(CreateView createView) {

‎src/main/java/net/sf/jsqlparser/statement/StatementVisitorAdapter.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
import net.sf.jsqlparser.statement.alter.Alter;
5959
import net.sf.jsqlparser.statement.alter.AlterExpression;
6060
import net.sf.jsqlparser.statement.alter.AlterSession;
61+
import net.sf.jsqlparser.statement.alter.AlterEventTrigger;
6162
import net.sf.jsqlparser.statement.alter.AlterSystemStatement;
6263
import net.sf.jsqlparser.statement.alter.RenameTableStatement;
6364
import net.sf.jsqlparser.statement.alter.AlterUser;
@@ -75,6 +76,7 @@
7576
import net.sf.jsqlparser.statement.create.synonym.CreateSynonym;
7677
import net.sf.jsqlparser.statement.create.table.CreateTable;
7778
import net.sf.jsqlparser.statement.create.tablespace.CreateTablespace;
79+
import net.sf.jsqlparser.statement.create.trigger.CreateEventTrigger;
7880
import net.sf.jsqlparser.statement.create.trigger.CreateTrigger;
7981
import net.sf.jsqlparser.statement.create.user.CreateUser;
8082
import net.sf.jsqlparser.statement.create.view.AlterView;
@@ -95,6 +97,8 @@
9597
import net.sf.jsqlparser.statement.merge.MergeOperationVisitor;
9698
import net.sf.jsqlparser.statement.merge.MergeOperationVisitorAdapter;
9799
import net.sf.jsqlparser.statement.refresh.RefreshMaterializedViewStatement;
100+
import net.sf.jsqlparser.statement.reindex.Reindex;
101+
import net.sf.jsqlparser.statement.securitylabel.SecurityLabel;
98102
import net.sf.jsqlparser.statement.select.FromItemVisitor;
99103
import net.sf.jsqlparser.statement.select.FromItemVisitorAdapter;
100104
import net.sf.jsqlparser.statement.select.PivotVisitor;
@@ -397,6 +401,7 @@ public <S> T visit(CreateIndex createIndex, S context) {
397401

398402
@Override
399403
public <S> T visit(CreateSchema createSchema, S context) {
404+
createSchema.getStatements().forEach(element -> element.accept(this, context));
400405
return null;
401406
}
402407

@@ -461,6 +466,32 @@ public <S> T visit(CreateTrigger createTrigger, S context) {
461466
return null;
462467
}
463468

469+
@Override
470+
public <S> T visit(CreateEventTrigger statement, S context) {
471+
statement.visitExpressions(expression -> expression.accept(expressionVisitor, context));
472+
return null;
473+
}
474+
475+
@Override
476+
public <S> T visit(AlterEventTrigger statement, S context) {
477+
return null;
478+
}
479+
480+
@Override
481+
public <S> T visit(Reindex statement, S context) {
482+
if (statement.getTable() != null) {
483+
statement.getTable().accept(fromItemVisitor, context);
484+
}
485+
return null;
486+
}
487+
488+
@Override
489+
public <S> T visit(SecurityLabel statement, S context) {
490+
statement.visitRelations(table -> table.accept(fromItemVisitor, context));
491+
expressionVisitor.visitExpression(statement.getLabel(), context);
492+
return null;
493+
}
494+
464495
@Override
465496
public <S> T visit(CreateView createView, S context) {
466497
createView.getView().accept(fromItemVisitor, context);

‎src/main/java/net/sf/jsqlparser/statement/alter/AlterEventTrigger.java‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
/*-
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2026 JSQLParser
6+
* %%
7+
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
8+
* #L%
9+
*/
10+
package net.sf.jsqlparser.statement.alter;
11+
12+
import net.sf.jsqlparser.statement.Statement;
13+
import net.sf.jsqlparser.statement.StatementVisitor;
14+
15+
/**
16+
* A PostgreSQL {@code ALTER EVENT TRIGGER} statement. The enable states are shared with the trigger
17+
* and rule actions of {@link RelationAlterAction}. Each non-null setter selects its action and
18+
* discards the values of the other actions.
19+
*/
20+
public class AlterEventTrigger implements Statement {
21+
public enum Action {
22+
STATE, OWNER, RENAME
23+
}
24+
25+
private String name;
26+
private Action action;
27+
private RelationAlterAction.EnableState enableState;
28+
private String owner;
29+
private String newName;
30+
31+
@Override
32+
public <T, S> T accept(StatementVisitor<T> statementVisitor, S context) {
33+
return statementVisitor.visit(this, context);
34+
}
35+
36+
public String getName() {
37+
return name;
38+
}
39+
40+
public void setName(String name) {
41+
this.name = name;
42+
}
43+
44+
public Action getAction() {
45+
return action;
46+
}
47+
48+
/** {@code ENABLE}, {@code ENABLE REPLICA}, {@code ENABLE ALWAYS} or {@code DISABLE}. */
49+
public RelationAlterAction.EnableState getEnableState() {
50+
return enableState;
51+
}
52+
53+
public void setEnableState(RelationAlterAction.EnableState enableState) {
54+
if (enableState != null) {
55+
select(Action.STATE);
56+
}
57+
this.enableState = enableState;
58+
}
59+
60+
public String getOwner() {
61+
return owner;
62+
}
63+
64+
public void setOwner(String owner) {
65+
if (owner != null) {
66+
select(Action.OWNER);
67+
}
68+
this.owner = owner;
69+
}
70+
71+
public String getNewName() {
72+
return newName;
73+
}
74+
75+
public void setNewName(String newName) {
76+
if (newName != null) {
77+
select(Action.RENAME);
78+
}
79+
this.newName = newName;
80+
}
81+
82+
private void select(Action action) {
83+
this.action = action;
84+
enableState = null;
85+
owner = null;
86+
newName = null;
87+
}
88+
89+
public StringBuilder appendTo(StringBuilder sql) {
90+
sql.append("ALTER EVENT TRIGGER ").append(name);
91+
switch (action) {
92+
case STATE:
93+
sql.append(' ').append(enableState.name().replace('_', ' '));
94+
break;
95+
case OWNER:
96+
sql.append(" OWNER TO ").append(owner);
97+
break;
98+
case RENAME:
99+
sql.append(" RENAME TO ").append(newName);
100+
break;
101+
default:
102+
throw new IllegalStateException("Unknown event trigger action: " + action);
103+
}
104+
return sql;
105+
}
106+
107+
@Override
108+
public String toString() {
109+
return appendTo(new StringBuilder()).toString();
110+
}
111+
112+
public AlterEventTrigger withName(String name) {
113+
setName(name);
114+
return this;
115+
}
116+
117+
public AlterEventTrigger withEnableState(RelationAlterAction.EnableState enableState) {
118+
setEnableState(enableState);
119+
return this;
120+
}
121+
122+
public AlterEventTrigger withOwner(String owner) {
123+
setOwner(owner);
124+
return this;
125+
}
126+
127+
public AlterEventTrigger withNewName(String newName) {
128+
setNewName(newName);
129+
return this;
130+
}
131+
}

0 commit comments

Comments
 (0)