code format

This commit is contained in:
wenshao
2011-11-16 14:07:08 +08:00
parent 146bcd728c
commit bb57f86db1
157 changed files with 888 additions and 912 deletions
@@ -88,6 +88,5 @@ public class MySqlBinaryExpr extends SQLLiteralExpr implements MySqlExpr {
}
return true;
}
}
@@ -82,6 +82,5 @@ public class MySqlBooleanExpr extends SQLLiteralExpr implements MySqlExpr {
}
return true;
}
}
@@ -124,5 +124,5 @@ public class MySqlMatchAgainstExpr extends SQLExprImpl implements MySqlExpr {
}
return true;
}
}
@@ -76,7 +76,7 @@ public class MySqlParameterizedOutputVisitor extends MySqlOutputVisitor {
}
x = new SQLBinaryOpExpr(x.getLeft(), x.getOperator(), merge((SQLBinaryOpExpr) x.getRight()));
}
break;
}
@@ -3,7 +3,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
public interface OracleSQLObject extends SQLObject {
void accept0(OracleASTVisitor visitor);
}
@@ -59,5 +59,4 @@ public class GroupingSetExpr extends SQLExprImpl {
return true;
}
}
@@ -3,7 +3,6 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject;
public interface OracleExpr extends SQLExpr, OracleSQLObject {
}
@@ -100,5 +100,5 @@ public class OracleExtractExpr extends SQLExprImpl implements OracleExpr {
}
return true;
}
}
@@ -153,5 +153,5 @@ public class OracleIntervalExpr extends SQLLiteralExpr implements OracleExpr {
}
return true;
}
}
@@ -93,5 +93,5 @@ public class OracleTimestampExpr extends SQLLiteralExpr implements OracleExpr {
}
return true;
}
}
@@ -38,7 +38,7 @@ public class OracleDeleteStatement extends SQLDeleteStatement {
public List<OracleHint> getHints() {
return this.hints;
}
protected void accept0(SQLASTVisitor visitor) {
accept0((OracleASTVisitor) visitor);
}
@@ -54,6 +54,7 @@ import com.alibaba.druid.sql.parser.Token;
public class OracleExprParser extends SQLExprParser {
public boolean allowStringAdditive = false;
/**
@@ -93,9 +93,9 @@ public class OracleLexer extends Lexer {
map.put("EXTRACT", Token.EXTRACT);
map.put("DATE", Token.DATE);
map.put("TIMESTAMP", Token.TIMESTAMP);
map.put("CURSOR", Token.CURSOR);
map.put("DAY", Token.DAY);
map.put("YEAR", Token.YEAR);
map.put("MONTH", Token.MONTH);
@@ -372,7 +372,7 @@ public class OracleSelectParser extends SQLSelectParser {
ModelColumnClause modelColumnClause = new ModelColumnClause();
parseQueryPartitionClause(modelColumnClause);
mainModel.setModelColumnClause(modelColumnClause);
acceptIdentifier("DIMENSION");
accept(Token.BY);
accept(Token.LPAREN);
@@ -381,18 +381,18 @@ public class OracleSelectParser extends SQLSelectParser {
lexer.nextToken();
break;
}
ModelColumn column = new ModelColumn();
column.setExpr(expr());
column.setAlias(as());
modelColumnClause.getDimensionByColumns().add(column);
if (lexer.token() == Token.COMMA) {
lexer.nextToken();
continue;
}
}
acceptIdentifier("MEASURES");
accept(Token.LPAREN);
for (;;) {
@@ -400,28 +400,28 @@ public class OracleSelectParser extends SQLSelectParser {
lexer.nextToken();
break;
}
ModelColumn column = new ModelColumn();
column.setExpr(expr());
column.setAlias(as());
modelColumnClause.getMeasuresColumns().add(column);
if (lexer.token() == Token.COMMA) {
lexer.nextToken();
continue;
}
}
mainModel.setModelColumnClause(modelColumnClause);
parseCellReferenceOptions(mainModel.getCellReferenceOptions());
parseModelRulesClause(mainModel);
modelClause.setMainModel(mainModel);
}
private void parseModelRulesClause(MainModelClause mainModel) {
ModelRulesClause modelRulesClause = new ModelRulesClause();
ModelRulesClause modelRulesClause = new ModelRulesClause();
if (identifierEquals("RULES")) {
lexer.nextToken();
if (lexer.token() == Token.UPDATE) {
@@ -431,7 +431,7 @@ public class OracleSelectParser extends SQLSelectParser {
modelRulesClause.getOptions().add(ModelRuleOption.UPSERT);
lexer.nextToken();
}
if (identifierEquals("AUTOMATIC")) {
lexer.nextToken();
accept(Token.ORDER);
@@ -442,54 +442,54 @@ public class OracleSelectParser extends SQLSelectParser {
modelRulesClause.getOptions().add(ModelRuleOption.SEQUENTIAL_ORDER);
}
}
if (identifierEquals("ITERATE")) {
lexer.nextToken();
accept(Token.LPAREN);
modelRulesClause.setIterate(expr());
accept(Token.RPAREN);
if (identifierEquals("UNTIL")) {
lexer.nextToken();
accept(Token.LPAREN);
modelRulesClause.setUntil(expr());
accept(Token.RPAREN);
accept(Token.RPAREN);
}
}
accept(Token.LPAREN);
for (;;) {
if (lexer.token() == Token.RPAREN) {
lexer.nextToken();
break;
}
CellAssignmentItem item = new CellAssignmentItem();
if (lexer.token() == Token.UPDATE) {
item.setOption(ModelRuleOption.UPDATE);
} else if (identifierEquals("UPSERT")) {
item.setOption(ModelRuleOption.UPSERT);
}
item.setCellAssignment(parseCellAssignment());
item.setOrderBy(this.parseOrderBy());
accept(Token.EQ);
item.setExpr(expr());
modelRulesClause.getCellAssignmentItems().add(item);
}
mainModel.setModelRulesClause(modelRulesClause);
}
private CellAssignment parseCellAssignment() {
CellAssignment cellAssignment = new CellAssignment();
cellAssignment.setMeasureColumn(expr());
accept(Token.LBRACKET);
this.createExprParser().exprList(cellAssignment.getConditions());
accept(Token.RBRACKET);
return cellAssignment;
}
@@ -41,7 +41,7 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor {
return super.visit(x);
}
public boolean visit(SQLNullExpr x) {
print('?');
return false;
@@ -75,7 +75,7 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor {
}
x = new SQLBinaryOpExpr(x.getLeft(), x.getOperator(), merge((SQLBinaryOpExpr) x.getRight()));
}
break;
}
@@ -2,7 +2,6 @@ package com.alibaba.druid.sql.dialect.sqlserver.ast;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
public class SQLServerSelect extends SQLSelect {
/**
@@ -20,7 +20,7 @@ public class SQLServerSelectQueryBlock extends SQLSelectQueryBlock {
public void setTop(Top top) {
this.top = top;
}
@Override
protected void accept0(SQLASTVisitor visitor) {
accept0((SQLServerASTVisitor) visitor);
@@ -9,10 +9,10 @@ public class Top extends SQLServerObjectImpl {
*
*/
private static final long serialVersionUID = 1L;
private SQLExpr expr;
private boolean percent;
private boolean withTies;
private SQLExpr expr;
private boolean percent;
private boolean withTies;
public SQLExpr getExpr() {
return expr;
@@ -41,7 +41,7 @@ public class Top extends SQLServerObjectImpl {
@Override
public void accept0(SQLServerASTVisitor visitor) {
if (visitor.visit(this)) {
}
}
@@ -7,7 +7,6 @@ import com.alibaba.druid.sql.parser.Keywords;
import com.alibaba.druid.sql.parser.Lexer;
import com.alibaba.druid.sql.parser.Token;
public class SQLServerLexer extends Lexer {
public final static Keywords DEFAULT_SQL_SERVER_KEYWORDS;
@@ -34,7 +34,7 @@ public class SQLServerSelectParser extends SQLSelectParser {
return select;
}
protected SQLSelectQuery query() throws ParserException {
if (lexer.token() == Token.LPAREN) {
lexer.nextToken();
@@ -56,7 +56,7 @@ public class SQLServerSelectParser extends SQLSelectParser {
queryBlock.setDistionOption(SQLSetQuantifier.ALL);
lexer.nextToken();
}
if (lexer.token() == Token.TOP) {
Top top = new Top();
lexer.nextToken();
@@ -5,11 +5,12 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.Top;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public interface SQLServerASTVisitor extends SQLASTVisitor {
boolean visit(SQLServerSelectQueryBlock x);
void endVisit(SQLServerSelectQueryBlock x);
boolean visit(Top x);
void endVisit(Top x);
}
@@ -2,7 +2,6 @@ package com.alibaba.druid.sql.dialect.transact.ast;
import com.alibaba.druid.sql.ast.SQLObject;
public interface TransactSQLObject extends SQLObject {
}
@@ -1,6 +1,5 @@
package com.alibaba.druid.sql.dialect.transact.ast;
public class TransactSQLSelect {
}