Skip to content

Commit

Permalink
corrected source files regarding checkstyle errors
Browse files Browse the repository at this point in the history
  • Loading branch information
wumpz committed Mar 28, 2017
1 parent c7a8601 commit 0d6faeb
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@
<module name="ConstantName" />
<module name="EmptyStatement" />
<module name="NeedBraces" />
<module name="UnnecessaryParentheses" />
</module>
</module>
</checkstyleRules>
Expand Down
22 changes: 11 additions & 11 deletions src/test/java/net/sf/jsqlparser/test/select/SelectTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -413,32 +413,32 @@ public void testLimit4() throws JSQLParserException {
select = (Select) parserManager.parse(new StringReader(statement));
offset = ((PlainSelect) select.getSelectBody()).getLimit().getOffset();
rowCount = ((PlainSelect) select.getSelectBody()).getLimit().getRowCount();
assertEquals("name2", (((JdbcNamedParameter) rowCount).getName()));
assertEquals("name2", ((JdbcNamedParameter) rowCount).getName());
assertEquals("name1", ((JdbcNamedParameter) offset).getName());
assertFalse(((PlainSelect) select.getSelectBody()).getLimit().isLimitAll());

statement = "SELECT * FROM mytable WHERE mytable.col = 9 LIMIT ?1, :name1";
select = (Select) parserManager.parse(new StringReader(statement));
offset = ((PlainSelect) select.getSelectBody()).getLimit().getOffset();
rowCount = ((PlainSelect) select.getSelectBody()).getLimit().getRowCount();
assertEquals(1, (int) (((JdbcParameter) offset).getIndex()));
assertEquals("name1", (((JdbcNamedParameter) rowCount).getName()));
assertEquals(1, (int) ((JdbcParameter) offset).getIndex());
assertEquals("name1", ((JdbcNamedParameter) rowCount).getName());
assertFalse(((PlainSelect) select.getSelectBody()).getLimit().isLimitAll());

statement = "SELECT * FROM mytable WHERE mytable.col = 9 LIMIT :name1, ?1";
select = (Select) parserManager.parse(new StringReader(statement));
offset = ((PlainSelect) select.getSelectBody()).getLimit().getOffset();
rowCount = ((PlainSelect) select.getSelectBody()).getLimit().getRowCount();
assertEquals(1, (int) (((JdbcParameter) rowCount).getIndex()));
assertEquals("name1", (((JdbcNamedParameter) offset).getName()));
assertEquals(1, (int) ((JdbcParameter) rowCount).getIndex());
assertEquals("name1", ((JdbcNamedParameter) offset).getName());
assertFalse(((PlainSelect) select.getSelectBody()).getLimit().isLimitAll());

statement = "SELECT * FROM mytable WHERE mytable.col = 9 LIMIT :param_name";
select = (Select) parserManager.parse(new StringReader(statement));
offset = ((PlainSelect) select.getSelectBody()).getLimit().getOffset();
rowCount = ((PlainSelect) select.getSelectBody()).getLimit().getRowCount();
assertNull(offset);
assertEquals("param_name", (((JdbcNamedParameter) rowCount).getName()));
assertEquals("param_name", ((JdbcNamedParameter) rowCount).getName());
assertFalse(((PlainSelect) select.getSelectBody()).getLimit().isLimitAll());
}

Expand Down Expand Up @@ -753,8 +753,8 @@ public void testUnion() throws JSQLParserException {
getName());
assertEquals("mytable2", ((Table) ((PlainSelect) setList.getSelects().get(2)).getFromItem()).
getName());
assertEquals(3, (((LongValue) (((PlainSelect) setList.getSelects().get(2)).getLimit().
getOffset())).getValue()));
assertEquals(3, ((LongValue) ((PlainSelect) setList.getSelects().get(2)).getLimit().
getOffset()).getValue());

// use brakets for toString
// use standard limit syntax
Expand All @@ -777,9 +777,9 @@ public void testUnion2() throws JSQLParserException {
getName());
assertEquals("mytable2", ((Table) ((PlainSelect) setList.getSelects().get(2)).getFromItem()).
getName());
assertEquals(3, (((LongValue) (((PlainSelect) setList.getSelects().get(2)).getLimit().
getRowCount())).getValue()));
assertNull((((PlainSelect) setList.getSelects().get(2)).getLimit().getOffset()));
assertEquals(3, ((LongValue) ((PlainSelect) setList.getSelects().get(2)).getLimit().
getRowCount()).getValue());
assertNull(((PlainSelect) setList.getSelects().get(2)).getLimit().getOffset());
assertEquals(4, ((PlainSelect) setList.getSelects().get(2)).getOffset().getOffset());

// use brakets for toString
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ public static String getLine(BufferedReader in) throws Exception {
while (true) {
line = in.readLine();
if (line != null) {
if (((line.length() < 2) || (line.length() >= 2) && !(line.charAt(0) == '/' && line.
charAt(1) == '/'))) {
if ((line.length() < 2) || (line.length() >= 2) && !(line.charAt(0) == '/' && line.
charAt(1) == '/')) {
break;
}
} else {
Expand Down

0 comments on commit 0d6faeb

Please sign in to comment.