Skip to content

Commit bdc8193

Browse files
committed
a little cleanup
1 parent 7a737e7 commit bdc8193

File tree

2 files changed

+51
-50
lines changed

2 files changed

+51
-50
lines changed

src/main/java/net/sf/jsqlparser/expression/operators/relational/SupportsOldOracleJoinSyntax.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323

2424
public interface SupportsOldOracleJoinSyntax {
2525

26-
static final int NO_ORACLE_JOIN = 0;
27-
static final int ORACLE_JOIN_RIGHT = 1;
28-
static final int ORACLE_JOIN_LEFT = 2;
26+
final int NO_ORACLE_JOIN = 0;
27+
final int ORACLE_JOIN_RIGHT = 1;
28+
final int ORACLE_JOIN_LEFT = 2;
2929

3030
int getOldOracleJoinSyntax();
3131

3232
void setOldOracleJoinSyntax(int oldOracleJoinSyntax);
33-
34-
static final int NO_ORACLE_PRIOR = 0;
35-
static final int ORACLE_PRIOR_START = 1;
36-
static final int ORACLE_PRIOR_END = 2;
37-
33+
34+
final int NO_ORACLE_PRIOR = 0;
35+
final int ORACLE_PRIOR_START = 1;
36+
final int ORACLE_PRIOR_END = 2;
37+
3838
int getOraclePriorPosition();
39-
39+
4040
void setOraclePriorPosition(int priorPosition);
4141
}

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

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
public class SelectDeParser implements SelectVisitor, OrderByVisitor, SelectItemVisitor, FromItemVisitor, PivotVisitor {
3838

3939
private StringBuilder buffer;
40-
private ExpressionVisitor expressionVisitor;
40+
private ExpressionVisitor expressionVisitor;
4141

4242
public SelectDeParser() {
4343
}
@@ -90,15 +90,15 @@ public void visit(PlainSelect plainSelect) {
9090
}
9191

9292
if (plainSelect.getJoins() != null) {
93-
for (Join join : plainSelect.getJoins()) {
94-
deparseJoin(join);
95-
}
93+
for (Join join : plainSelect.getJoins()) {
94+
deparseJoin(join);
95+
}
9696
}
9797

9898
if (plainSelect.getOracleHierarchical() != null) {
9999
plainSelect.getOracleHierarchical().accept(expressionVisitor);
100100
}
101-
101+
102102
if (plainSelect.getWhere() != null) {
103103
buffer.append(" WHERE ");
104104
plainSelect.getWhere().accept(expressionVisitor);
@@ -175,55 +175,56 @@ public void visit(SubSelect subSelect) {
175175
@Override
176176
public void visit(Table tableName) {
177177
buffer.append(tableName.getWholeTableName());
178-
Pivot pivot = tableName.getPivot();
179-
if (pivot != null) {
180-
pivot.accept(this);
181-
}
178+
Pivot pivot = tableName.getPivot();
179+
if (pivot != null) {
180+
pivot.accept(this);
181+
}
182182
String alias = tableName.getAlias();
183183
if (alias != null && !alias.isEmpty()) {
184184
buffer.append(" AS ").append(alias);
185185
}
186186
}
187187

188-
@Override
189-
public void visit(Pivot pivot) {
190-
List<Column> forColumns = pivot.getForColumns();
191-
buffer.append(" PIVOT (")
192-
.append(PlainSelect.getStringList(pivot.getFunctionItems()))
193-
.append(" FOR ")
194-
.append(PlainSelect.getStringList(forColumns, true, forColumns != null && forColumns.size() > 1))
195-
.append(" IN ")
196-
.append(PlainSelect.getStringList(pivot.getInItems(), true, true))
197-
.append(")");
198-
}
199-
200-
@Override
201-
public void visit(PivotXml pivot) {
202-
List<Column> forColumns = pivot.getForColumns();
203-
buffer.append(" PIVOT XML (")
204-
.append(PlainSelect.getStringList(pivot.getFunctionItems()))
205-
.append(" FOR ")
206-
.append(PlainSelect.getStringList(forColumns, true, forColumns != null && forColumns.size() > 1))
207-
.append(" IN (");
208-
if (pivot.isInAny()) {
209-
buffer.append("ANY");
210-
} else if (pivot.getInSelect() != null) {
211-
buffer.append(pivot.getInSelect());
212-
} else {
213-
buffer.append(PlainSelect.getStringList(pivot.getInItems()));
214-
}
215-
buffer.append("))");
216-
}
188+
@Override
189+
public void visit(Pivot pivot) {
190+
List<Column> forColumns = pivot.getForColumns();
191+
buffer.append(" PIVOT (")
192+
.append(PlainSelect.getStringList(pivot.getFunctionItems()))
193+
.append(" FOR ")
194+
.append(PlainSelect.getStringList(forColumns, true, forColumns != null && forColumns.size() > 1))
195+
.append(" IN ")
196+
.append(PlainSelect.getStringList(pivot.getInItems(), true, true))
197+
.append(")");
198+
}
199+
200+
@Override
201+
public void visit(PivotXml pivot) {
202+
List<Column> forColumns = pivot.getForColumns();
203+
buffer.append(" PIVOT XML (")
204+
.append(PlainSelect.getStringList(pivot.getFunctionItems()))
205+
.append(" FOR ")
206+
.append(PlainSelect.getStringList(forColumns, true, forColumns != null && forColumns.size() > 1))
207+
.append(" IN (");
208+
if (pivot.isInAny()) {
209+
buffer.append("ANY");
210+
} else if (pivot.getInSelect() != null) {
211+
buffer.append(pivot.getInSelect());
212+
} else {
213+
buffer.append(PlainSelect.getStringList(pivot.getInItems()));
214+
}
215+
buffer.append("))");
216+
}
217217

218218
public void deparseOrderBy(List<OrderByElement> orderByElements) {
219219
deparseOrderBy(false, orderByElements);
220220
}
221-
221+
222222
public void deparseOrderBy(boolean oracleSiblings, List<OrderByElement> orderByElements) {
223-
if (oracleSiblings)
223+
if (oracleSiblings) {
224224
buffer.append(" ORDER SIBLINGS BY ");
225-
else
225+
} else {
226226
buffer.append(" ORDER BY ");
227+
}
227228
for (Iterator<OrderByElement> iter = orderByElements.iterator(); iter.hasNext();) {
228229
OrderByElement orderByElement = iter.next();
229230
orderByElement.accept(this);

0 commit comments

Comments
 (0)