Skip to content

Commit a29c3ac

Browse files
wumpzwumpz
committed
Merge origin/master
2 parents 1991507 + f51d697 commit a29c3ac

File tree

3 files changed

+107
-103
lines changed

3 files changed

+107
-103
lines changed

‎src/main/java/net/sf/jsqlparser/statement/select/Select.java

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -29,45 +29,45 @@
2929

3030
public class Select implements Statement {
3131

32-
private SelectBody selectBody;
33-
private List<WithItem> withItemsList;
32+
private SelectBody selectBody;
33+
private List<WithItem> withItemsList;
3434

35-
@Override
36-
public void accept(StatementVisitor statementVisitor) {
37-
statementVisitor.visit(this);
38-
}
35+
@Override
36+
public void accept(StatementVisitor statementVisitor) {
37+
statementVisitor.visit(this);
38+
}
3939

40-
public SelectBody getSelectBody() {
41-
return selectBody;
42-
}
40+
public SelectBody getSelectBody() {
41+
return selectBody;
42+
}
4343

44-
public void setSelectBody(SelectBody body) {
45-
selectBody = body;
46-
}
44+
public void setSelectBody(SelectBody body) {
45+
selectBody = body;
46+
}
4747

48-
@Override
49-
public String toString() {
50-
StringBuilder retval = new StringBuilder();
51-
if (withItemsList != null && !withItemsList.isEmpty()) {
52-
retval.append("WITH ");
53-
for (Iterator<WithItem> iter = withItemsList.iterator(); iter.hasNext();) {
54-
WithItem withItem = (WithItem) iter.next();
55-
retval.append(withItem);
56-
if (iter.hasNext()) {
57-
retval.append(",");
58-
}
59-
retval.append(" ");
60-
}
61-
}
62-
retval.append(selectBody);
63-
return retval.toString();
64-
}
48+
@Override
49+
public String toString() {
50+
StringBuilder retval = new StringBuilder();
51+
if (withItemsList != null && !withItemsList.isEmpty()) {
52+
retval.append("WITH ");
53+
for (Iterator<WithItem> iter = withItemsList.iterator(); iter.hasNext();) {
54+
WithItem withItem = iter.next();
55+
retval.append(withItem);
56+
if (iter.hasNext()) {
57+
retval.append(",");
58+
}
59+
retval.append(" ");
60+
}
61+
}
62+
retval.append(selectBody);
63+
return retval.toString();
64+
}
6565

66-
public List<WithItem> getWithItemsList() {
67-
return withItemsList;
68-
}
66+
public List<WithItem> getWithItemsList() {
67+
return withItemsList;
68+
}
6969

70-
public void setWithItemsList(List<WithItem> withItemsList) {
71-
this.withItemsList = withItemsList;
72-
}
70+
public void setWithItemsList(List<WithItem> withItemsList) {
71+
this.withItemsList = withItemsList;
72+
}
7373
}

‎src/main/java/net/sf/jsqlparser/statement/select/SubSelect.java

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -34,47 +34,47 @@
3434
*/
3535
public class SubSelect implements FromItem, Expression, ItemsList {
3636

37-
private SelectBody selectBody;
38-
private Alias alias;
37+
private SelectBody selectBody;
38+
private Alias alias;
3939
private boolean useBrackets = true;
4040
private List<WithItem> withItemsList;
4141

4242
private Pivot pivot;
4343

44-
@Override
45-
public void accept(FromItemVisitor fromItemVisitor) {
46-
fromItemVisitor.visit(this);
47-
}
44+
@Override
45+
public void accept(FromItemVisitor fromItemVisitor) {
46+
fromItemVisitor.visit(this);
47+
}
4848

49-
public SelectBody getSelectBody() {
50-
return selectBody;
51-
}
49+
public SelectBody getSelectBody() {
50+
return selectBody;
51+
}
5252

53-
public void setSelectBody(SelectBody body) {
54-
selectBody = body;
55-
}
53+
public void setSelectBody(SelectBody body) {
54+
selectBody = body;
55+
}
5656

57-
@Override
58-
public void accept(ExpressionVisitor expressionVisitor) {
59-
expressionVisitor.visit(this);
60-
}
57+
@Override
58+
public void accept(ExpressionVisitor expressionVisitor) {
59+
expressionVisitor.visit(this);
60+
}
6161

62-
@Override
63-
public Alias getAlias() {
64-
return alias;
65-
}
62+
@Override
63+
public Alias getAlias() {
64+
return alias;
65+
}
6666

67-
@Override
68-
public void setAlias(Alias alias) {
69-
this.alias = alias;
70-
}
67+
@Override
68+
public void setAlias(Alias alias) {
69+
this.alias = alias;
70+
}
7171

72-
@Override
72+
@Override
7373
public Pivot getPivot() {
7474
return pivot;
7575
}
7676

77-
@Override
77+
@Override
7878
public void setPivot(Pivot pivot) {
7979
this.pivot = pivot;
8080
}
@@ -88,41 +88,45 @@ public void setUseBrackets(boolean useBrackets) {
8888
}
8989

9090
public List<WithItem> getWithItemsList() {
91-
return withItemsList;
92-
}
91+
return withItemsList;
92+
}
9393

94-
public void setWithItemsList(List<WithItem> withItemsList) {
95-
this.withItemsList = withItemsList;
96-
}
94+
public void setWithItemsList(List<WithItem> withItemsList) {
95+
this.withItemsList = withItemsList;
96+
}
9797

98-
@Override
99-
public void accept(ItemsListVisitor itemsListVisitor) {
100-
itemsListVisitor.visit(this);
101-
}
98+
@Override
99+
public void accept(ItemsListVisitor itemsListVisitor) {
100+
itemsListVisitor.visit(this);
101+
}
102102

103-
@Override
104-
public String toString() {
103+
@Override
104+
public String toString() {
105105
StringBuilder retval = new StringBuilder();
106106
if (useBrackets)
107107
retval.append("(");
108108
if (withItemsList != null && !withItemsList.isEmpty()) {
109-
retval.append("WITH ");
110-
for (Iterator<WithItem> iter = withItemsList.iterator(); iter.hasNext();) {
111-
WithItem withItem = (WithItem) iter.next();
112-
retval.append(withItem);
113-
if (iter.hasNext()) {
114-
retval.append(",");
115-
}
116-
retval.append(" ");
117-
}
118-
}
109+
retval.append("WITH ");
110+
for (Iterator<WithItem> iter = withItemsList.iterator(); iter.hasNext();) {
111+
WithItem withItem = iter.next();
112+
retval.append(withItem);
113+
if (iter.hasNext()) {
114+
retval.append(",");
115+
}
116+
retval.append(" ");
117+
}
118+
}
119119
retval.append(selectBody);
120120
if (useBrackets)
121121
retval.append(")");
122122

123-
if (pivot != null) retval.append(" ").append(pivot);
124-
if (alias != null) retval.append(alias.toString());
123+
if (pivot != null) {
124+
retval.append(" ").append(pivot);
125+
}
126+
if (alias != null) {
127+
retval.append(alias.toString());
128+
}
125129

126130
return retval.toString();
127-
}
131+
}
128132
}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,29 @@ public class DropDeParser {
3232

3333
private StringBuilder buffer;
3434

35-
public DropDeParser(StringBuilder buffer) {
36-
this.buffer = buffer;
37-
}
35+
public DropDeParser(StringBuilder buffer) {
36+
this.buffer = buffer;
37+
}
3838

39-
public void deParse(Drop drop) {
40-
buffer.append("DROP ");
39+
public void deParse(Drop drop) {
40+
buffer.append("DROP ");
4141
buffer.append(drop.getType());
4242
if (drop.isIfExists())
4343
buffer.append(" IF EXISTS");
4444

45-
buffer.append(" ").append(drop.getName());
45+
buffer.append(" ").append(drop.getName());
4646

47-
if (drop.getParameters() != null && drop.getParameters().size() > 0) {
48-
buffer.append(" ").append(PlainSelect.getStringList(drop.getParameters()));
49-
}
50-
}
51-
52-
public StringBuilder getBuffer() {
53-
return buffer;
54-
}
55-
56-
public void setBuffer(StringBuilder buffer) {
57-
this.buffer = buffer;
58-
}
47+
if (drop.getParameters() != null && !drop.getParameters().isEmpty()) {
48+
buffer.append(" ").append(PlainSelect.getStringList(drop.getParameters()));
49+
}
50+
}
51+
52+
public StringBuilder getBuffer() {
53+
return buffer;
54+
}
55+
56+
public void setBuffer(StringBuilder buffer) {
57+
this.buffer = buffer;
58+
}
5959

6060
}

0 commit comments

Comments
 (0)