Skip to content

Commit 588093a

Browse files
minleejaeminleejae
committed
Render DML source clauses through shared visitor paths
1 parent 0ecf096 commit 588093a

6 files changed

Lines changed: 287 additions & 82 deletions

File tree

‎src/main/java/net/sf/jsqlparser/util/deparser/DeleteDeParser.java‎

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
import net.sf.jsqlparser.expression.ExpressionVisitorAdapter;
1414
import net.sf.jsqlparser.schema.Table;
1515
import net.sf.jsqlparser.statement.delete.Delete;
16-
import net.sf.jsqlparser.statement.select.Join;
17-
import net.sf.jsqlparser.statement.select.WithItem;
18-
19-
import java.util.Iterator;
2016

2117
import static java.util.stream.Collectors.joining;
2218

@@ -25,31 +21,30 @@ public class DeleteDeParser extends AbstractDeParser<Delete> {
2521
private ExpressionVisitor<StringBuilder> expressionVisitor =
2622
new ExpressionVisitorAdapter<StringBuilder>();
2723

24+
private SelectDeParser selectDeParser;
25+
2826
public DeleteDeParser() {
2927
super(new StringBuilder());
3028
}
3129

3230
public DeleteDeParser(ExpressionVisitor<StringBuilder> expressionVisitor,
3331
StringBuilder buffer) {
32+
this(expressionVisitor, null, buffer);
33+
}
34+
35+
public DeleteDeParser(ExpressionVisitor<StringBuilder> expressionVisitor,
36+
SelectDeParser selectDeParser, StringBuilder buffer) {
3437
super(buffer);
3538
this.expressionVisitor = expressionVisitor;
39+
this.selectDeParser = selectDeParser;
3640
}
3741

3842
@Override
3943
@SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity"})
4044
public void deParse(Delete delete) {
41-
if (delete.getWithItemsList() != null && !delete.getWithItemsList().isEmpty()) {
42-
builder.append("WITH ");
43-
for (Iterator<WithItem<?>> iter = delete.getWithItemsList().iterator(); iter
44-
.hasNext();) {
45-
WithItem<?> withItem = iter.next();
46-
builder.append(withItem);
47-
if (iter.hasNext()) {
48-
builder.append(",");
49-
}
50-
builder.append(" ");
51-
}
52-
}
45+
DmlDeParserSupport sources =
46+
new DmlDeParserSupport(expressionVisitor, selectDeParser, builder);
47+
sources.deparseWithItems(delete.getWithItemsList(), null);
5348
builder.append("DELETE");
5449
if (delete.getOracleHint() != null) {
5550
builder.append(delete.getOracleHint()).append(" ");
@@ -78,20 +73,8 @@ public void deParse(Delete delete) {
7873
}
7974
builder.append(" ").append(delete.getTable().toString());
8075

81-
if (delete.getUsingFromItemList() != null && !delete.getUsingFromItemList().isEmpty()) {
82-
builder.append(" USING").append(
83-
delete.getUsingFromItemList().stream().map(Object::toString)
84-
.collect(joining(", ", " ", "")));
85-
}
86-
if (delete.getJoins() != null) {
87-
for (Join join : delete.getJoins()) {
88-
if (join.isSimple()) {
89-
builder.append(", ").append(join);
90-
} else {
91-
builder.append(" ").append(join);
92-
}
93-
}
94-
}
76+
sources.deparseUsing(delete.getUsingFromItemList());
77+
sources.deparseJoins(delete.getJoins());
9578

9679
deparseWhereClause(delete);
9780

‎src/main/java/net/sf/jsqlparser/util/deparser/DmlDeParserSupport.java‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
/*-
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2019 JSQLParser
6+
* %%
7+
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
8+
* #L%
9+
*/
10+
package net.sf.jsqlparser.util.deparser;
11+
12+
import java.util.List;
13+
import net.sf.jsqlparser.expression.ExpressionVisitor;
14+
import net.sf.jsqlparser.statement.StatementVisitorAdapter;
15+
import net.sf.jsqlparser.statement.delete.ParenthesedDelete;
16+
import net.sf.jsqlparser.statement.insert.ParenthesedInsert;
17+
import net.sf.jsqlparser.statement.update.ParenthesedUpdate;
18+
import net.sf.jsqlparser.statement.select.*;
19+
20+
/** Shared source rendering for DML and the statements nested in WITH items. */
21+
final class DmlDeParserSupport {
22+
private final ExpressionVisitor<StringBuilder> expressions;
23+
private final SelectDeParser selects;
24+
private final StringBuilder builder;
25+
26+
DmlDeParserSupport(ExpressionVisitor<StringBuilder> expressions, SelectDeParser selects,
27+
StringBuilder builder) {
28+
this.expressions = expressions;
29+
this.builder = builder;
30+
SelectDeParser selected = selects;
31+
if (selected == null && expressions instanceof ExpressionDeParser) {
32+
SelectVisitor<StringBuilder> visitor =
33+
((ExpressionDeParser) expressions).getSelectVisitor();
34+
if (visitor instanceof SelectDeParser) {
35+
selected = (SelectDeParser) visitor;
36+
}
37+
}
38+
this.selects = selected == null ? new SelectDeParser(expressions, builder) : selected;
39+
this.selects.setBuilder(builder);
40+
this.selects.setExpressionVisitor(expressions);
41+
}
42+
43+
<S> void deparseWithItems(List<WithItem<?>> items, S context) {
44+
if (items != null && !items.isEmpty()) {
45+
builder.append("WITH ");
46+
for (int i = 0; i < items.size(); i++) {
47+
if (i > 0) {
48+
builder.append(", ");
49+
}
50+
selects.visit(items.get(i), context);
51+
}
52+
builder.append(' ');
53+
}
54+
}
55+
56+
void deparseJoins(List<Join> joins) {
57+
if (joins != null) {
58+
for (Join join : joins) {
59+
selects.deparseJoin(join);
60+
}
61+
}
62+
}
63+
64+
void deparseFrom(FromItem item, List<Join> joins) {
65+
if (item != null) {
66+
builder.append(" FROM ");
67+
item.accept(selects, null);
68+
deparseJoins(joins);
69+
}
70+
}
71+
72+
void deparseUsing(List<FromItem> items) {
73+
if (items != null && !items.isEmpty()) {
74+
builder.append(" USING ");
75+
for (int i = 0; i < items.size(); i++) {
76+
if (i > 0) {
77+
builder.append(", ");
78+
}
79+
items.get(i).accept(selects, null);
80+
}
81+
}
82+
}
83+
84+
<S> StringBuilder deparseWithItem(WithItem<?> item, S context) {
85+
if (item.getWithFunctionDeclaration() != null) {
86+
return builder.append(item.getWithFunctionDeclaration());
87+
}
88+
if (item.isRecursive()) {
89+
builder.append("RECURSIVE ");
90+
}
91+
builder.append(item.getAlias().getName());
92+
if (item.getWithItemList() != null) {
93+
builder.append(' ')
94+
.append(PlainSelect.getStringList(item.getWithItemList(), true, true));
95+
}
96+
builder.append(" AS ");
97+
if (item.isMaterialized()) {
98+
builder.append(item.isUsingNot() ? "NOT MATERIALIZED " : "MATERIALIZED ");
99+
}
100+
item.getParenthesedStatement().accept(new StatementVisitorAdapter<StringBuilder>() {
101+
@Override
102+
public <T> StringBuilder visit(Select select, T nestedContext) {
103+
return select.accept((SelectVisitor<StringBuilder>) selects, nestedContext);
104+
}
105+
106+
@Override
107+
public <T> StringBuilder visit(ParenthesedInsert insert, T nestedContext) {
108+
deparseWithItems(insert.getWithItemsList(), nestedContext);
109+
builder.append('(');
110+
new InsertDeParser(expressions, selects, builder).deParse(insert.getInsert());
111+
return builder.append(')');
112+
}
113+
114+
@Override
115+
public <T> StringBuilder visit(ParenthesedUpdate update, T nestedContext) {
116+
deparseWithItems(update.getWithItemsList(), nestedContext);
117+
builder.append('(');
118+
new UpdateDeParser(expressions, selects, builder).deParse(update.getUpdate());
119+
return builder.append(')');
120+
}
121+
122+
@Override
123+
public <T> StringBuilder visit(ParenthesedDelete delete, T nestedContext) {
124+
deparseWithItems(delete.getWithItemsList(), nestedContext);
125+
builder.append('(');
126+
new DeleteDeParser(expressions, selects, builder).deParse(delete.getDelete());
127+
return builder.append(')');
128+
}
129+
}, context);
130+
return item.appendRecursiveClausesTo(builder,
131+
expression -> expression.accept(expressions, context));
132+
}
133+
}

‎src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -872,30 +872,8 @@ public <S> StringBuilder visit(SetOperationList list, S context) {
872872

873873
@Override
874874
public <S> StringBuilder visit(WithItem<?> withItem, S context) {
875-
if (withItem.getWithFunctionDeclaration() == null) {
876-
if (withItem.isRecursive()) {
877-
builder.append("RECURSIVE ");
878-
}
879-
builder.append(withItem.getAlias().getName());
880-
if (withItem.getWithItemList() != null) {
881-
builder.append(" ")
882-
.append(PlainSelect.getStringList(withItem.getWithItemList(), true, true));
883-
}
884-
builder.append(" AS ");
885-
if (withItem.isMaterialized()) {
886-
builder.append(withItem.isUsingNot()
887-
? "NOT MATERIALIZED "
888-
: "MATERIALIZED ");
889-
}
890-
StatementDeParser statementDeParser =
891-
new StatementDeParser((ExpressionDeParser) expressionVisitor, this, builder);
892-
statementDeParser.deParse(withItem.getParenthesedStatement());
893-
withItem.appendRecursiveClausesTo(builder,
894-
expression -> expression.accept(expressionVisitor, context));
895-
} else {
896-
builder.append(withItem.getWithFunctionDeclaration().toString());
897-
}
898-
return builder;
875+
return new DmlDeParserSupport(expressionVisitor, this, builder)
876+
.deparseWithItem(withItem, context);
899877
}
900878

901879
@Override

‎src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@ public <S> StringBuilder visit(AlterView alterView, S context) {
202202

203203
@Override
204204
public <S> StringBuilder visit(Delete delete, S context) {
205-
DeleteDeParser deleteDeParser = new DeleteDeParser(expressionDeParser, builder);
205+
DeleteDeParser deleteDeParser =
206+
new DeleteDeParser(expressionDeParser, selectDeParser, builder);
206207
deleteDeParser.deParse(delete);
207208
return builder;
208209
}
@@ -301,7 +302,8 @@ public <S> StringBuilder visit(Truncate truncate, S context) {
301302

302303
@Override
303304
public <S> StringBuilder visit(Update update, S context) {
304-
UpdateDeParser updateDeParser = new UpdateDeParser(expressionDeParser, builder);
305+
UpdateDeParser updateDeParser =
306+
new UpdateDeParser(expressionDeParser, selectDeParser, builder);
305307
updateDeParser.deParse(update);
306308

307309
return builder;

‎src/main/java/net/sf/jsqlparser/util/deparser/UpdateDeParser.java‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,45 +11,40 @@
1111

1212
import net.sf.jsqlparser.expression.ExpressionVisitor;
1313
import net.sf.jsqlparser.expression.ExpressionVisitorAdapter;
14-
import net.sf.jsqlparser.statement.select.Join;
1514
import net.sf.jsqlparser.statement.select.OrderByElement;
1615
import net.sf.jsqlparser.statement.select.OrderByVisitor;
17-
import net.sf.jsqlparser.statement.select.WithItem;
1816
import net.sf.jsqlparser.statement.update.Update;
1917

20-
import java.util.Iterator;
21-
2218
public class UpdateDeParser extends AbstractDeParser<Update>
2319
implements OrderByVisitor<StringBuilder> {
2420

2521
private ExpressionVisitor<StringBuilder> expressionVisitor = new ExpressionVisitorAdapter<>();
2622

23+
private SelectDeParser selectDeParser;
24+
2725
public UpdateDeParser() {
2826
super(new StringBuilder());
2927
}
3028

3129
public UpdateDeParser(ExpressionVisitor<StringBuilder> expressionVisitor,
3230
StringBuilder buffer) {
31+
this(expressionVisitor, null, buffer);
32+
}
33+
34+
public UpdateDeParser(ExpressionVisitor<StringBuilder> expressionVisitor,
35+
SelectDeParser selectDeParser, StringBuilder buffer) {
3336
super(buffer);
3437
this.expressionVisitor = expressionVisitor;
38+
this.selectDeParser = selectDeParser;
3539
}
3640

3741
@Override
3842
@SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity",
3943
"PMD.ExcessiveMethodLength"})
4044
public void deParse(Update update) {
41-
if (update.getWithItemsList() != null && !update.getWithItemsList().isEmpty()) {
42-
builder.append("WITH ");
43-
for (Iterator<WithItem<?>> iter = update.getWithItemsList().iterator(); iter
44-
.hasNext();) {
45-
WithItem<?> withItem = iter.next();
46-
builder.append(withItem);
47-
if (iter.hasNext()) {
48-
builder.append(",");
49-
}
50-
builder.append(" ");
51-
}
52-
}
45+
DmlDeParserSupport sources =
46+
new DmlDeParserSupport(expressionVisitor, selectDeParser, builder);
47+
sources.deparseWithItems(update.getWithItemsList(), null);
5348
builder.append("UPDATE ");
5449
if (update.getOracleHint() != null) {
5550
builder.append(update.getOracleHint()).append(" ");
@@ -62,16 +57,10 @@ public void deParse(Update update) {
6257
}
6358
builder.append(update.getTable());
6459
if (update.getStartJoins() != null) {
65-
for (Join join : update.getStartJoins()) {
66-
if (join.isSimple()) {
67-
builder.append(", ").append(join);
68-
} else {
69-
builder.append(" ").append(join);
70-
}
71-
}
60+
sources.deparseJoins(update.getStartJoins());
7261
}
7362
if (update.isFromBeforeSet()) {
74-
update.appendFromTo(builder);
63+
sources.deparseFrom(update.getFromItem(), update.getJoins());
7564
}
7665
builder.append(" SET ");
7766

@@ -82,7 +71,7 @@ public void deParse(Update update) {
8271
}
8372

8473
if (!update.isFromBeforeSet()) {
85-
update.appendFromTo(builder);
74+
sources.deparseFrom(update.getFromItem(), update.getJoins());
8675
}
8776

8877
deparseWhereClause(update);
@@ -117,7 +106,6 @@ protected void deparseUpdateSetsClause(Update update) {
117106
deparseUpdateSets(update.getUpdateSets(), builder, expressionVisitor);
118107
}
119108

120-
121109
public ExpressionVisitor<StringBuilder> getExpressionVisitor() {
122110
return expressionVisitor;
123111
}

0 commit comments

Comments
 (0)