Skip to content

Commit c075544

Browse files
manticore-projectsmanticore-projects
committed
Merge branch 'master' into Issue1438
# Conflicts: # src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
2 parents c984ff6 + 3ab04b0 commit c075544

8 files changed

Lines changed: 108 additions & 20 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@ To help JSqlParser's development you are encouraged to provide
5454

5555
Also I would like to know about needed examples or documentation stuff.
5656

57-
## Extensions in the latest SNAPSHOT version 4.3
58-
59-
* moved to JUnit 5 as a test framework
60-
* added **IGNORE NULLS** to window functions
57+
## Extensions in the latest SNAPSHOT version 4.4
6158

6259
Additionally, we have fixed many errors and improved the code quality and the test coverage.
6360

‎pom.xml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.github.jsqlparser</groupId>
44
<artifactId>jsqlparser</artifactId>
5-
<version>4.3-SNAPSHOT</version>
5+
<version>4.4-SNAPSHOT</version>
66
<name>JSQLParser library</name>
77
<inceptionYear>2004</inceptionYear>
88
<organization>
@@ -381,7 +381,7 @@
381381
<plugin>
382382
<groupId>org.apache.maven.plugins</groupId>
383383
<artifactId>maven-surefire-report-plugin</artifactId>
384-
<version>2.22.2</version>
384+
<version>3.0.0-M5</version>
385385
<configuration>
386386
<outputDirectory>${project.reporting.outputDirectory}/testresults</outputDirectory>
387387
</configuration>
@@ -447,9 +447,9 @@
447447

448448
<!-- JJDoc report generating the BNF documentation -->
449449
<plugin>
450-
<groupId>org.codehaus.mojo</groupId>
450+
<groupId>org.javacc.plugin</groupId>
451451
<artifactId>javacc-maven-plugin</artifactId>
452-
<version>2.6</version>
452+
<version>3.0.3</version>
453453
<configuration>
454454
<!--
455455
/**
@@ -536,17 +536,6 @@
536536
</build>
537537
</profile>
538538

539-
<!--
540-
<profile>
541-
<id>doclint-java8-disable</id>
542-
<activation>
543-
<jdk>[1.8,)</jdk>
544-
</activation>
545-
<properties>
546-
<javadoc.opts>-Xdoclint:none</javadoc.opts>
547-
</properties>
548-
</profile>
549-
-->
550539
<profile>
551540
<id>check.sources</id>
552541
<activation>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public class PlainSelect extends ASTNodeAccessImpl implements SelectBody {
5454
private KSQLWindow ksqlWindow = null;
5555
private boolean noWait = false;
5656
private boolean emitChanges = false;
57+
private WithIsolation withIsolation;
5758

5859
public boolean isUseBrackets() {
5960
return useBrackets;
@@ -330,6 +331,15 @@ public boolean isEmitChanges() {
330331
return emitChanges;
331332
}
332333

334+
335+
public WithIsolation getWithIsolation() {
336+
return withIsolation;
337+
}
338+
339+
public void setWithIsolation(WithIsolation withIsolation) {
340+
this.withIsolation = withIsolation;
341+
}
342+
333343
@Override
334344
@SuppressWarnings({"PMD.CyclomaticComplexity" , "PMD.ExcessiveMethodLength", "PMD.NPathComplexity"})
335345
public String toString() {
@@ -421,6 +431,10 @@ public String toString() {
421431
if (fetch != null) {
422432
sql.append(fetch);
423433
}
434+
435+
if (withIsolation != null) {
436+
sql.append(withIsolation);
437+
}
424438
if (isForUpdate()) {
425439
sql.append(" FOR UPDATE");
426440

@@ -455,6 +469,9 @@ public String toString() {
455469
if (fetch != null) {
456470
sql.append(fetch);
457471
}
472+
if (withIsolation != null) {
473+
sql.append(withIsolation);
474+
}
458475
}
459476
if (forXmlPath != null) {
460477
sql.append(" FOR XML PATH(").append(forXmlPath).append(")");

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class SetOperationList implements SelectBody {
2424
private Limit limit;
2525
private Offset offset;
2626
private Fetch fetch;
27+
private WithIsolation withIsolation;
2728

2829
@Override
2930
public void accept(SelectVisitor selectVisitor) {
@@ -96,7 +97,16 @@ public void setFetch(Fetch fetch) {
9697
this.fetch = fetch;
9798
}
9899

100+
public Fetch getWithIsolation() {
101+
return fetch;
102+
}
103+
104+
public void setWithIsolation(WithIsolation withIsolation) {
105+
this.withIsolation = withIsolation;
106+
}
107+
99108
@Override
109+
@SuppressWarnings({"PMD.CyclomaticComplexity"})
100110
public String toString() {
101111
StringBuilder buffer = new StringBuilder();
102112

@@ -123,6 +133,9 @@ public String toString() {
123133
if (fetch != null) {
124134
buffer.append(fetch.toString());
125135
}
136+
if (withIsolation != null) {
137+
buffer.append(withIsolation.toString());
138+
}
126139
return buffer.toString();
127140
}
128141

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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.statement.select;
11+
12+
13+
public class WithIsolation {
14+
15+
private String isolation = "UR";
16+
17+
public String getIsolation() {
18+
return this.isolation;
19+
}
20+
public void setIsolation(String s) {
21+
this.isolation = s;
22+
}
23+
24+
@Override
25+
public String toString() {
26+
return " WITH " + this.isolation;
27+
}
28+
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,9 @@ public void visit(PlainSelect plainSelect) {
199199
if (plainSelect.getFetch() != null) {
200200
deparseFetch(plainSelect.getFetch());
201201
}
202+
if (plainSelect.getWithIsolation() != null) {
203+
buffer.append(plainSelect.getWithIsolation().toString());
204+
}
202205
if (plainSelect.isForUpdate()) {
203206
buffer.append(" FOR UPDATE");
204207
if (plainSelect.getForUpdateTable() != null) {
@@ -480,6 +483,9 @@ public void visit(SetOperationList list) {
480483
if (list.getFetch() != null) {
481484
deparseFetch(list.getFetch());
482485
}
486+
if (list.getWithIsolation() != null) {
487+
buffer.append(list.getWithIsolation().toString());
488+
}
483489
}
484490

485491
@Override

‎src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
213213
| <K_EXTENDED:"EXTENDED">
214214
| <K_EXTRACT:"EXTRACT">
215215
| <K_FETCH:"FETCH">
216+
| <K_ISOLATION:("UR" | "RS" | "RR" | "CS")>
216217
| <K_FILTER: "FILTER">
217218
| <K_FIRST: "FIRST">
218219
| <K_FALSE: "FALSE">
@@ -1809,6 +1810,7 @@ PlainSelect PlainSelect() #PlainSelect:
18091810
Limit limit = null;
18101811
Offset offset = null;
18111812
Fetch fetch = null;
1813+
WithIsolation withIsolation = null;
18121814
OptimizeFor optimize = null;
18131815
Top top = null;
18141816
Skip skip = null;
@@ -1876,7 +1878,7 @@ PlainSelect PlainSelect() #PlainSelect:
18761878
[LOOKAHEAD(<K_OFFSET>) offset = Offset() { plainSelect.setOffset(offset); } ]
18771879
[LOOKAHEAD(<K_LIMIT>, { limit==null }) limit = LimitWithOffset() { plainSelect.setLimit(limit); } ]
18781880
[LOOKAHEAD(<K_FETCH>) fetch = Fetch() { plainSelect.setFetch(fetch); } ]
1879-
1881+
[LOOKAHEAD(<K_WITH> <K_ISOLATION>) withIsolation = WithIsolation() { plainSelect.setWithIsolation(withIsolation); } ]
18801882
[LOOKAHEAD(2) <K_FOR> <K_UPDATE> { plainSelect.setForUpdate(true); }
18811883
[ <K_OF> updateTable = Table() { plainSelect.setForUpdateTable(updateTable); } ]
18821884
[ LOOKAHEAD(<K_WAIT>) wait = Wait() { plainSelect.setWait(wait); } ]
@@ -1902,6 +1904,7 @@ SelectBody SetOperationList() #SetOperationList: {
19021904
Limit limit = null;
19031905
Offset offset = null;
19041906
Fetch fetch = null;
1907+
WithIsolation withIsolation = null;
19051908
SelectBody select = null;
19061909
List<SelectBody> selects = new ArrayList<SelectBody>();
19071910
List<SetOperation> operations = new ArrayList<SetOperation>();
@@ -1926,6 +1929,7 @@ SelectBody SetOperationList() #SetOperationList: {
19261929
[LOOKAHEAD(<K_LIMIT>) limit=LimitWithOffset() {list.setLimit(limit);} ]
19271930
[LOOKAHEAD(<K_OFFSET>) offset = Offset() { list.setOffset(offset);} ]
19281931
[LOOKAHEAD(<K_FETCH>) fetch = Fetch() { list.setFetch(fetch);} ]
1932+
[LOOKAHEAD(<K_WITH> <K_ISOLATION>) withIsolation = WithIsolation() { list.setWithIsolation(withIsolation);} ]
19291933

19301934
{
19311935
if (selects.size()==1 && selects.get(0) instanceof PlainSelect && orderByElements==null) {
@@ -1957,6 +1961,7 @@ SelectBody SetOperationListWithoutIntialSelect(FromItem fromItem) #SetOperationL
19571961
Limit limit = null;
19581962
Offset offset = null;
19591963
Fetch fetch = null;
1964+
WithIsolation withIsolation = null;
19601965
SelectBody select;
19611966
List<SelectBody> selects = new ArrayList<SelectBody>();
19621967
List<SetOperation> operations = new ArrayList<SetOperation>();
@@ -2836,6 +2841,24 @@ Fetch Fetch():
28362841
}
28372842
}
28382843

2844+
WithIsolation WithIsolation():
2845+
{
2846+
WithIsolation withIsolation = new WithIsolation();
2847+
Token token = null;
2848+
JdbcParameter jdbc;
2849+
}
2850+
{
2851+
(
2852+
//with (ur | cs | rs | rr)
2853+
<K_WITH>
2854+
token=<K_ISOLATION> { withIsolation.setIsolation(token.image); }
2855+
2856+
)
2857+
{
2858+
return withIsolation;
2859+
}
2860+
}
2861+
28392862
OptimizeFor OptimizeFor():
28402863
{
28412864
Token token;

‎src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5118,4 +5118,19 @@ public void execute() throws Throwable {
51185118
// we should not have any Objects left in the weak reference map
51195119
verifier.assertGarbageCollected();
51205120
}
5121+
5122+
@Test
5123+
public void testWithIsolation() throws JSQLParserException {
5124+
String statement = "SELECT * FROM mytable WHERE mytable.col = 9 WITH ur";
5125+
Select select = (Select) parserManager.parse(new StringReader(statement));
5126+
String isolation = ((PlainSelect) select.getSelectBody()).getWithIsolation().getIsolation();
5127+
assertEquals("ur", isolation);
5128+
assertSqlCanBeParsedAndDeparsed(statement);
5129+
5130+
statement = "SELECT * FROM mytable WHERE mytable.col = 9 WITH Cs";
5131+
select = (Select) parserManager.parse(new StringReader(statement));
5132+
isolation = ((PlainSelect) select.getSelectBody()).getWithIsolation().getIsolation();
5133+
assertEquals("Cs", isolation);
5134+
assertSqlCanBeParsedAndDeparsed(statement);
5135+
}
51215136
}

0 commit comments

Comments
 (0)