Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

fixed sonar rule violations

Browse Source
This commit is contained in:
wenshao
2012-08-29 08:41:29 +08:00
parent 69103eeffc
commit fe50086568
15 changed files with 157 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java
+3 -1
View File
@@ -50,7 +50,9 @@ public class SQLSelect extends SQLObjectImpl {
this.query.output(buf);
buf.append(" ");
if (this.orderBy != null) this.orderBy.output(buf);
if (this.orderBy != null) {
this.orderBy.output(buf);
}
}
protected void accept0(SQLASTVisitor visitor) {
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java
+3 -1
View File
@@ -228,7 +228,9 @@ public class MySqlSelectParser extends SQLSelectParser {
SQLSelectGroupByClause groupBy = new SQLSelectGroupByClause();
while (true) {
groupBy.getItems().add(this.exprParser.expr());
if (!(lexer.token() == (Token.COMMA))) break;
if (!(lexer.token() == (Token.COMMA))) {
break;
}
lexer.nextToken();
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleSelect.java
+3 -1
View File
@@ -60,7 +60,9 @@ public class OracleSelect extends SQLSelect {
this.query.output(buf);
buf.append(" ");
if (this.orderBy != null) this.orderBy.output(buf);
if (this.orderBy != null) {
this.orderBy.output(buf);
}
}
protected void accept0(SQLASTVisitor visitor) {
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java
+12 -4
View File
@@ -619,10 +619,18 @@ public class OracleExprParser extends SQLExprParser {
String currentTokenUpperValue = lexer.stringVal();
lexer.nextToken();
if (currentTokenUpperValue.equals("YEAR")) return OracleIntervalType.YEAR;
if (currentTokenUpperValue.equals("MONTH")) return OracleIntervalType.MONTH;
if (currentTokenUpperValue.equals("HOUR")) return OracleIntervalType.HOUR;
if (currentTokenUpperValue.equals("MINUTE")) return OracleIntervalType.MINUTE;
if (currentTokenUpperValue.equals("YEAR")) {
return OracleIntervalType.YEAR;
}
if (currentTokenUpperValue.equals("MONTH")) {
return OracleIntervalType.MONTH;
}
if (currentTokenUpperValue.equals("HOUR")) {
return OracleIntervalType.HOUR;
}
if (currentTokenUpperValue.equals("MINUTE")) {
return OracleIntervalType.MINUTE;
}
if (currentTokenUpperValue.equals("SECOND")) {
return OracleIntervalType.SECOND;
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java
+9 -3
View File
@@ -965,7 +965,9 @@ public class OracleSelectParser extends SQLSelectParser {
item.setAlias(as());
pivot.getItems().add(item);
if (!(lexer.token() == (Token.COMMA))) break;
if (!(lexer.token() == (Token.COMMA))) {
break;
}
lexer.nextToken();
}
@@ -977,7 +979,9 @@ public class OracleSelectParser extends SQLSelectParser {
pivot.getPivotFor().add(new SQLIdentifierExpr(lexer.stringVal()));
lexer.nextToken();
if (!(lexer.token() == (Token.COMMA))) break;
if (!(lexer.token() == (Token.COMMA))) {
break;
}
lexer.nextToken();
}
@@ -1047,7 +1051,9 @@ public class OracleSelectParser extends SQLSelectParser {
unPivot.getPivotFor().add(new SQLIdentifierExpr(lexer.stringVal()));
lexer.nextToken();
if (!(lexer.token() == (Token.COMMA))) break;
if (!(lexer.token() == (Token.COMMA))) {
break;
}
lexer.nextToken();
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleUpdateParser.java
+3 -1
View File
@@ -67,7 +67,9 @@ public class OracleUpdateParser extends SQLStatementParser {
}
private void parseErrorLoging(OracleUpdateStatement update) throws ParserException {
if (identifierEquals("LOG")) throw new ParserException("TODO");
if (identifierEquals("LOG")) {
throw new ParserException("TODO");
}
}
private void parseReturn(OracleUpdateStatement update) throws ParserException {