Skip to content

Commit a976867

Browse files
wumpzwumpz
committed
refactoring
1 parent c399549 commit a976867

9 files changed

Lines changed: 34 additions & 34 deletions

File tree

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
*/
3333
public class SetOperationList implements SelectBody {
3434

35-
private List<PlainSelect> plainSelects;
35+
private List<SelectBody> selects;
3636
private List<SetOperation> operations;
3737
private List<OrderByElement> orderByElements;
3838
private Limit limit;
@@ -48,8 +48,8 @@ public List<OrderByElement> getOrderByElements() {
4848
return orderByElements;
4949
}
5050

51-
public List<PlainSelect> getPlainSelects() {
52-
return plainSelects;
51+
public List<SelectBody> getSelects() {
52+
return selects;
5353
}
5454

5555
public List<SetOperation> getOperations() {
@@ -60,8 +60,8 @@ public void setOrderByElements(List<OrderByElement> orderByElements) {
6060
this.orderByElements = orderByElements;
6161
}
6262

63-
public void setOpsAndSelects(List<PlainSelect> select, List<SetOperation> ops) {
64-
plainSelects = select;
63+
public void setOpsAndSelects(List<SelectBody> select, List<SetOperation> ops) {
64+
selects = select;
6565
operations = ops;
6666

6767
if (select.size() - 1 != ops.size()) {
@@ -97,11 +97,11 @@ public void setFetch(Fetch fetch) {
9797
public String toString() {
9898
StringBuilder buffer = new StringBuilder();
9999

100-
for (int i = 0; i < plainSelects.size(); i++) {
100+
for (int i = 0; i < selects.size(); i++) {
101101
if (i != 0) {
102102
buffer.append(" ").append(operations.get(i - 1).toString()).append(" ");
103103
}
104-
buffer.append("(").append(plainSelects.get(i).toString()).append(")");
104+
buffer.append("(").append(selects.get(i).toString()).append(")");
105105
}
106106

107107
if (orderByElements != null) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void visit(PlainSelect plainSelect) {
5858

5959
@Override
6060
public void visit(SetOperationList setOpList) {
61-
for (PlainSelect select : setOpList.getPlainSelects()) {
61+
for (SelectBody select : setOpList.getSelects()) {
6262
select.accept(this);
6363
}
6464
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void visit(PlainSelect plainSelect) {
8383

8484
@Override
8585
public void visit(SetOperationList setOpList) {
86-
for (PlainSelect select : setOpList.getPlainSelects()) {
86+
for (SelectBody select : setOpList.getSelects()) {
8787
select.accept(this);
8888
}
8989
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,8 @@ public void visit(AnalyticExpression analytic) {
423423

424424
@Override
425425
public void visit(SetOperationList list) {
426-
for (PlainSelect plainSelect : list.getPlainSelects()) {
427-
visit(plainSelect);
426+
for (SelectBody plainSelect : list.getSelects()) {
427+
plainSelect.accept(this);
428428
}
429429
}
430430

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,13 +395,13 @@ public void deparseJoin(Join join) {
395395

396396
@Override
397397
public void visit(SetOperationList list) {
398-
for (int i = 0; i < list.getPlainSelects().size(); i++) {
398+
for (int i = 0; i < list.getSelects().size(); i++) {
399399
if (i != 0) {
400400
buffer.append(' ').append(list.getOperations().get(i - 1)).append(' ');
401401
}
402402
buffer.append("(");
403-
PlainSelect plainSelect = list.getPlainSelects().get(i);
404-
plainSelect.accept(this);
403+
SelectBody select = list.getSelects().get(i);
404+
select.accept(this);
405405
buffer.append(")");
406406
}
407407
if (list.getOrderByElements() != null) {

‎src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -649,23 +649,23 @@ SetOperationList SetOperationList():
649649
Limit limit = null;
650650
Offset offset = null;
651651
Fetch fetch = null;
652-
PlainSelect select = null;
653-
List<PlainSelect> selects = new ArrayList<PlainSelect>();
652+
SelectBody select = null;
653+
List<SelectBody> selects = new ArrayList<SelectBody>();
654654
List<SetOperation> operations = new ArrayList<SetOperation>();
655655
}
656656
{
657657
(
658658

659659
(
660-
(("(" select=PlainSelect() ")") | (select=PlainSelect() )) {selects.add(select);}
660+
(("(" select=SelectBody() ")") | select=PlainSelect() ) {selects.add(select);}
661661
(
662662
((<K_UNION> { UnionOp union = new UnionOp();operations.add(union); } [ <K_ALL> { union.setAll(true); } | <K_DISTINCT> { union.setDistinct(true); } ])
663663
| <K_INTERSECT> { operations.add(new IntersectOp()); }
664664
| <K_MINUS> { operations.add(new MinusOp()); }
665665
| <K_EXCEPT> { operations.add(new ExceptOp()); }
666666
)
667667

668-
(("(" select=PlainSelect() ")") | (select=PlainSelect() )) {selects.add(select);}
668+
(("(" select=SelectBody() ")") | select=PlainSelect() ) {selects.add(select);}
669669
)+
670670
)
671671

@@ -1756,9 +1756,9 @@ Expression PrimaryExpression():
17561756

17571757
| LOOKAHEAD(["+" | "-"] Column()) [sign="+" | sign="-"] retval=Column()
17581758

1759-
| LOOKAHEAD(3) [sign="+" | sign="-"] "(" retval=BitwiseAndOr() ")" {retval = new Parenthesis(retval); }
1759+
| LOOKAHEAD([sign="+" | sign="-"] "(" SubSelect() ")") [sign="+" | sign="-"] "(" retval=SubSelect() ")"
17601760

1761-
| [sign="+" | sign="-"] "(" retval=SubSelect() ")"
1761+
| LOOKAHEAD(3) [sign="+" | sign="-"] "(" retval=BitwiseAndOr() ")" {retval = new Parenthesis(retval); }
17621762

17631763
| token=<S_CHAR_LITERAL> { retval = new StringValue(token.image); }
17641764

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -456,11 +456,11 @@ public void testUnion() throws JSQLParserException {
456456

457457
Select select = (Select) parserManager.parse(new StringReader(statement));
458458
SetOperationList setList = (SetOperationList) select.getSelectBody();
459-
assertEquals(3, setList.getPlainSelects().size());
460-
assertEquals("mytable", ((Table) setList.getPlainSelects().get(0).getFromItem()).getName());
461-
assertEquals("mytable3", ((Table) setList.getPlainSelects().get(1).getFromItem()).getName());
462-
assertEquals("mytable2", ((Table) setList.getPlainSelects().get(2).getFromItem()).getName());
463-
assertEquals(3, setList.getPlainSelects().get(2).getLimit().getOffset());
459+
assertEquals(3, setList.getSelects().size());
460+
assertEquals("mytable", ((Table) ((PlainSelect)setList.getSelects().get(0)).getFromItem()).getName());
461+
assertEquals("mytable3", ((Table) ((PlainSelect)setList.getSelects().get(1)).getFromItem()).getName());
462+
assertEquals("mytable2", ((Table) ((PlainSelect)setList.getSelects().get(2)).getFromItem()).getName());
463+
assertEquals(3, ((PlainSelect)setList.getSelects().get(2)).getLimit().getOffset());
464464

465465
// use brakets for toString
466466
// use standard limit syntax

‎src/test/java/net/sf/jsqlparser/test/select/SpecialOracleTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void testAllSqlsParseDeparse() throws IOException {
6868
}
6969

7070
LOG.log(Level.INFO, "tested {0} files. got {1} correct parse results", new Object[]{count, success});
71-
assertTrue(success>=113);
71+
assertTrue(success>=116);
7272
}
7373

7474
@Test

‎src/test/resources/net/sf/jsqlparser/test/oracle-tests/union06.sql‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
( select "x"."r_no",
1+
(( select "x"."r_no",
22
"x"."i_id",
33
"x"."ind",
44
"x"."item",
55
'0' "o"
66
from "x"
7-
where ("x"."r_no" = :a)
7+
where ("x"."r_no" = :a))
88
minus
9-
select "y"."r_no",
9+
(select "y"."r_no",
1010
"y"."i_id",
1111
"y"."ind",
1212
"y"."item",
1313
'0' "o"
1414
from "y"
15-
where ("y"."r_no" = :a)
15+
where ("y"."r_no" = :a))
1616
)
1717
union
18-
( select "y"."r_no",
18+
( ( select "y"."r_no",
1919
"y"."i_id",
2020
"y"."ind",
2121
"y"."item",
2222
'1' "o"
2323
from "y"
24-
where ("y"."r_no" = :a)
24+
where ("y"."r_no" = :a))
2525
minus
26-
select "x"."r_no",
26+
(select "x"."r_no",
2727
"x"."i_id",
2828
"x"."ind",
2929
"x"."item",
3030
'1' "o"
3131
from "x"
32-
where ("x"."r_no" = :a)
32+
where ("x"."r_no" = :a))
3333
)
3434
order by 4,3,1
3535

0 commit comments

Comments
 (0)