Skip to content

Commit aa304d6

Browse files
wumpzwumpz
committed
Merge origin/master
Conflicts: src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
2 parents 1deeab8 + 2cae62d commit aa304d6

File tree

13 files changed

+312
-51
lines changed

13 files changed

+312
-51
lines changed

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

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
/*-
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2021 JSQLParser
6+
* %%
7+
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
8+
* #L%
9+
*/
10+
/*
11+
* Copyright (C) 2021 JSQLParser.
12+
*
13+
* This library is free software; you can redistribute it and/or modify it under the terms of the
14+
* GNU Lesser General Public License as published by the Free Software Foundation; either version
15+
* 2.1 of the License, or (at your option) any later version.
16+
*
17+
* This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
18+
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
19+
* Lesser General Public License for more details.
20+
*
21+
* You should have received a copy of the GNU Lesser General Public License along with this library;
22+
* if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
23+
* 02110-1301 USA
24+
*/
25+
26+
package net.sf.jsqlparser.statement;
27+
28+
/**
29+
*
30+
* @author are
31+
*/
32+
public class RollbackStatement implements Statement {
33+
private boolean usingWorkKeyword=false;
34+
private boolean usingSavepointKeyword=false;
35+
private String savepointName=null;
36+
private String forceDistributedTransactionIdentifier=null;
37+
38+
public boolean isUsingWorkKeyword() {
39+
return usingWorkKeyword;
40+
}
41+
42+
public RollbackStatement withUsingWorkKeyword(boolean usingWorkKeyword) {
43+
this.usingWorkKeyword = usingWorkKeyword;
44+
return this;
45+
}
46+
47+
public void setUsingWorkKeyword(boolean usingWorkKeyword) {
48+
this.usingWorkKeyword = usingWorkKeyword;
49+
}
50+
51+
public boolean isUsingSavepointKeyword() {
52+
return usingSavepointKeyword;
53+
}
54+
55+
public RollbackStatement withUsingSavepointKeyword(boolean usingSavepointKeyword) {
56+
this.usingSavepointKeyword = usingSavepointKeyword;
57+
return this;
58+
}
59+
60+
public void setUsingSavepointKeyword(boolean usingSavepointKeyword) {
61+
this.usingSavepointKeyword = usingSavepointKeyword;
62+
}
63+
64+
public String getSavepointName() {
65+
return savepointName;
66+
}
67+
68+
public RollbackStatement withSavepointName(String savepointName) {
69+
this.savepointName = savepointName;
70+
return this;
71+
}
72+
73+
public void setSavepointName(String savepointName) {
74+
this.savepointName = savepointName;
75+
}
76+
77+
public String getForceDistributedTransactionIdentifier() {
78+
return forceDistributedTransactionIdentifier;
79+
}
80+
81+
public RollbackStatement withForceDistributedTransactionIdentifier(String forceDistributedTransactionIdentifier) {
82+
this.forceDistributedTransactionIdentifier = forceDistributedTransactionIdentifier;
83+
return this;
84+
}
85+
86+
public void setForceDistributedTransactionIdentifier(String forceDistributedTransactionIdentifier) {
87+
this.forceDistributedTransactionIdentifier = forceDistributedTransactionIdentifier;
88+
}
89+
90+
@Override
91+
public String toString() {
92+
return "ROLLBACK "
93+
+ ( usingWorkKeyword
94+
? "WORK "
95+
: "" )
96+
+ (savepointName!=null && savepointName.trim().length()!=0
97+
? "TO " + (usingSavepointKeyword
98+
? "SAVEPOINT "
99+
: "") + savepointName
100+
: forceDistributedTransactionIdentifier!=null && forceDistributedTransactionIdentifier.trim().length()!=0
101+
? "FORCE " + forceDistributedTransactionIdentifier
102+
: ""
103+
104+
);
105+
}
106+
107+
@Override
108+
public void accept(StatementVisitor statementVisitor) {
109+
statementVisitor.visit(this);
110+
}
111+
112+
}

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
/*-
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2021 JSQLParser
6+
* %%
7+
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
8+
* #L%
9+
*/
10+
/*
11+
* Copyright (C) 2021 JSQLParser.
12+
*
13+
* This library is free software; you can redistribute it and/or modify it under the terms of the
14+
* GNU Lesser General Public License as published by the Free Software Foundation; either version
15+
* 2.1 of the License, or (at your option) any later version.
16+
*
17+
* This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
18+
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
19+
* Lesser General Public License for more details.
20+
*
21+
* You should have received a copy of the GNU Lesser General Public License along with this library;
22+
* if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
23+
* 02110-1301 USA
24+
*/
25+
26+
package net.sf.jsqlparser.statement;
27+
28+
import java.util.Objects;
29+
30+
/**
31+
*
32+
* @author are
33+
*/
34+
public class SavepointStatement implements Statement {
35+
private String savepointName;
36+
37+
public String getSavepointName() {
38+
return savepointName;
39+
}
40+
41+
public void setSavepointName(String savepointName) {
42+
this.savepointName = Objects.requireNonNull(savepointName, "The Savepoint Name must not be NULL.");
43+
}
44+
45+
public SavepointStatement(String savepointName) {
46+
this.savepointName = Objects.requireNonNull(savepointName, "The Savepoint Name must not be NULL.");
47+
}
48+
49+
@Override
50+
public String toString() {
51+
return "SAVEPOINT " + savepointName;
52+
}
53+
54+
@Override
55+
public void accept(StatementVisitor statementVisitor) {
56+
statementVisitor.visit(this);
57+
}
58+
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
import net.sf.jsqlparser.statement.values.ValuesStatement;
3636

3737
public interface StatementVisitor {
38+
39+
void visit(SavepointStatement savepointStatement);
40+
41+
void visit(RollbackStatement rollbackStatement);
3842

3943
void visit(Comment comment);
4044

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,17 @@ public void visit(CreateFunctionalStatement createFunctionalStatement) {
197197
public void visit(CreateSynonym createSynonym) {
198198
}
199199

200+
@Override
201+
public void visit(SavepointStatement savepointStatement) {
202+
//@todo: do something usefull here
203+
}
204+
205+
@Override
206+
public void visit(RollbackStatement rollbackStatement) {
207+
//@todo: do something usefull here
208+
}
200209
@Override
201210
public void visit(AlterSession alterSession) {
202-
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
211+
//@todo: do something usefull here
203212
}
204213
}

‎src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,17 @@ public void visit(TimezoneExpression aThis) {
994994
aThis.getLeftExpression().accept(this);
995995
}
996996

997+
@Override
998+
public void visit(SavepointStatement savepointStatement) {
999+
}
1000+
1001+
@Override
1002+
public void visit(RollbackStatement rollbackStatement) {
1003+
1004+
}
1005+
9971006
@Override
9981007
public void visit(AlterSession alterSession) {
1008+
9991009
}
10001010
}

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

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ public class ExpressionDeParser extends AbstractDeParser<Expression>
112112

113113
private static final String NOT = "NOT ";
114114
private SelectVisitor selectVisitor;
115-
private boolean useBracketsInExprList = true;
116115
private OrderByDeParser orderByDeParser = new OrderByDeParser();
117116

118117
public ExpressionDeParser() {
@@ -487,20 +486,13 @@ public void visit(Function function) {
487486
} else if (function.getParameters() == null && function.getNamedParameters() == null) {
488487
buffer.append("()");
489488
} else {
490-
boolean oldUseBracketsInExprList = useBracketsInExprList;
491-
useBracketsInExprList = !function.isDistinct() &&
492-
!function.isAllColumns() &&
493-
function.getOrderByElements() == null;
494-
if (!useBracketsInExprList) {
495-
buffer.append("(");
496-
}
489+
buffer.append("(");
497490
if (function.isDistinct()) {
498491
buffer.append("DISTINCT ");
499492
} else if (function.isAllColumns()) {
500493
buffer.append("ALL ");
501494
} else if (function.isUnique()) {
502-
useBracketsInExprList = false;
503-
buffer.append("(UNIQUE ");
495+
buffer.append("UNIQUE ");
504496
}
505497
if (function.getNamedParameters() != null) {
506498
visit(function.getNamedParameters());
@@ -522,11 +514,7 @@ public void visit(Function function) {
522514
orderByDeParser.deParseElement(orderByElement);
523515
}
524516
}
525-
if (!useBracketsInExprList) {
526-
buffer.append(")");
527-
}
528-
useBracketsInExprList = oldUseBracketsInExprList;
529-
517+
buffer.append(")");
530518
}
531519

532520
if (function.getAttribute() != null) {
@@ -545,7 +533,7 @@ public void visit(Function function) {
545533

546534
@Override
547535
public void visit(ExpressionList expressionList) {
548-
if (useBracketsInExprList) {
536+
if (expressionList.isUsingBrackets()) {
549537
buffer.append("(");
550538
}
551539
for (Iterator<Expression> iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
@@ -555,16 +543,13 @@ public void visit(ExpressionList expressionList) {
555543
buffer.append(", ");
556544
}
557545
}
558-
if (useBracketsInExprList) {
546+
if (expressionList.isUsingBrackets()) {
559547
buffer.append(")");
560548
}
561549
}
562550

563551
@Override
564552
public void visit(NamedExpressionList namedExpressionList) {
565-
if (useBracketsInExprList) {
566-
buffer.append("(");
567-
}
568553
List<String> names = namedExpressionList.getNames();
569554
List<Expression> expressions = namedExpressionList.getExpressions();
570555
for (int i = 0; i < names.size(); i++) {
@@ -578,9 +563,6 @@ public void visit(NamedExpressionList namedExpressionList) {
578563
}
579564
expressions.get(i).accept(this);
580565
}
581-
if (useBracketsInExprList) {
582-
buffer.append(")");
583-
}
584566
}
585567

586568
public SelectVisitor getSelectVisitor() {

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import net.sf.jsqlparser.statement.DeclareStatement;
1919
import net.sf.jsqlparser.statement.DescribeStatement;
2020
import net.sf.jsqlparser.statement.ExplainStatement;
21+
import net.sf.jsqlparser.statement.RollbackStatement;
22+
import net.sf.jsqlparser.statement.SavepointStatement;
2123
import net.sf.jsqlparser.statement.ResetStatement;
2224
import net.sf.jsqlparser.statement.SetStatement;
2325
import net.sf.jsqlparser.statement.ShowColumnsStatement;
@@ -216,6 +218,16 @@ public void visit(Merge merge) {
216218
buffer.append(merge.toString());
217219
}
218220

221+
@Override
222+
public void visit(SavepointStatement savepointStatement) {
223+
buffer.append(savepointStatement.toString());
224+
}
225+
226+
@Override
227+
public void visit(RollbackStatement rollbackStatement) {
228+
buffer.append(rollbackStatement.toString());
229+
}
230+
219231
@Override
220232
public void visit(Commit commit) {
221233
buffer.append(commit.toString());

‎src/main/java/net/sf/jsqlparser/util/validation/validator/StatementValidator.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import net.sf.jsqlparser.statement.DeclareStatement;
1717
import net.sf.jsqlparser.statement.DescribeStatement;
1818
import net.sf.jsqlparser.statement.ExplainStatement;
19+
import net.sf.jsqlparser.statement.RollbackStatement;
20+
import net.sf.jsqlparser.statement.SavepointStatement;
1921
import net.sf.jsqlparser.statement.ResetStatement;
2022
import net.sf.jsqlparser.statement.SetStatement;
2123
import net.sf.jsqlparser.statement.ShowColumnsStatement;
@@ -262,8 +264,17 @@ public void visit(CreateSynonym createSynonym) {
262264
}
263265

264266
@Override
267+
public void visit(SavepointStatement savepointStatement) {
268+
//@todo: write something usefull here
269+
}
270+
271+
@Override
272+
public void visit(RollbackStatement rollbackStatement) {
273+
//@todo: write something usefull here
274+
}
275+
265276
public void visit(AlterSession alterSession) {
266-
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
277+
//@todo: write something usefull here
267278
}
268279

269280
}

0 commit comments

Comments
 (0)