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

代码格式化

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@76 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-05-14 09:49:00 +00:00
parent aad6bad813
commit 3e3d52f080
68 changed files with 1697 additions and 2929 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java
+6 -8
View File
@@ -16,14 +16,12 @@
package com.alibaba.druid.sql.ast.expr;
public enum SQLBinaryOperator {
Add("+", 70), Subtract("-", 70), Multiply("*", 60), Divide("/", 60), Concat("||", 140), BitwiseAnd("&", 90),
BitwiseNot("!", 130), BitwiseOr("|", 100), BitwiseXor("^", 50), BooleanAnd("AND", 140), BooleanOr("OR", 160),
BooleanXor("XOR", 150), Equality("=", 170), Assignment(":=", 169), GreaterThan(">", 110), GreaterThanOrEqual(">=",
110),
Is("IS", 110), LessThan("<", 110), LessThanOrEqual("<=", 110), LessThanOrEqualOrGreaterThan("<=>", 110),
LessThanOrGreater("<>", 110), LeftShift("<<", 80), Like("LIKE", 110), RightShift(">>", 80), Modulus("%", 60),
NotEqual("!=", 110), NotLessThan("!<", 110), NotGreaterThan("!>", 110), Union("UNION", 0),
NotLike("NOT LIKE", 110), IsNot("IS NOT", 110), Escape("ESCAPE", 110), RegExp("REGEXP", 110),
Add("+", 70), Subtract("-", 70), Multiply("*", 60), Divide("/", 60), Concat("||", 140), BitwiseAnd("&", 90), BitwiseNot("!", 130), BitwiseOr("|", 100),
BitwiseXor("^", 50), BooleanAnd("AND", 140), BooleanOr("OR", 160), BooleanXor("XOR", 150), Equality("=", 170), Assignment(":=", 169),
GreaterThan(">", 110), GreaterThanOrEqual(">=", 110), Is("IS", 110), LessThan("<", 110), LessThanOrEqual("<=", 110), LessThanOrEqualOrGreaterThan("<=>",
110),
LessThanOrGreater("<>", 110), LeftShift("<<", 80), Like("LIKE", 110), RightShift(">>", 80), Modulus("%", 60), NotEqual("!=", 110), NotLessThan("!<", 110),
NotGreaterThan("!>", 110), Union("UNION", 0), NotLike("NOT LIKE", 110), IsNot("IS NOT", 110), Escape("ESCAPE", 110), RegExp("REGEXP", 110),
NotRegExp("NOT REGEXP", 110), COLLATE("COLLATE", 20);
public static int getPriority(SQLBinaryOperator operator) {
src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumericLiteralExpr.java
+1 -1
View File
@@ -22,6 +22,6 @@ public abstract class SQLNumericLiteralExpr extends SQLLiteralExpr {
public SQLNumericLiteralExpr(){
}
public abstract Number getNumber();
}
src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java
+1 -2
View File
@@ -91,8 +91,7 @@ public class SQLJoinTableSource extends SQLTableSource {
}
public static enum JoinType {
COMMA, JOIN, INNER_JOIN, CROSS_JOIN, NATURAL_JOIN, NATURAL_INNER_JOIN, LEFT_OUTER_JOIN, RIGHT_OUTER_JOIN,
FULL_OUTER_JOIN;
COMMA, JOIN, INNER_JOIN, CROSS_JOIN, NATURAL_JOIN, NATURAL_INNER_JOIN, LEFT_OUTER_JOIN, RIGHT_OUTER_JOIN, FULL_OUTER_JOIN;
public static String toString(JoinType joinType) {
if (JOIN.equals(joinType)) return "JOIN";
src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlMatchAgainstExpr.java
+1 -2
View File
@@ -59,8 +59,7 @@ public class MySqlMatchAgainstExpr extends SQLExprImpl implements MySqlExpr {
public static enum SearchModifier {
IN_BOOLEAN_MODE("IN BOOLEAN MODE"), IN_NATURAL_LANGUAGE_MODE("IN NATURAL LANGUAGE MODE"),
IN_NATURAL_LANGUAGE_MODE_WITH_QUERY_EXPANSION("IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION"),
WITH_QUERY_EXPANSION("WITH QUERY EXPANSION"), ;
IN_NATURAL_LANGUAGE_MODE_WITH_QUERY_EXPANSION("IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION"), WITH_QUERY_EXPANSION("WITH QUERY EXPANSION"), ;
public final String name;
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
+1 -2
View File
@@ -169,8 +169,7 @@ public class MySqlExprParser extends SQLExprParser {
String collate = lexer.stringVal();
lexer.nextToken();
SQLBinaryOpExpr binaryExpr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.COLLATE,
new SQLIdentifierExpr(collate));
SQLBinaryOpExpr binaryExpr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.COLLATE, new SQLIdentifierExpr(collate));
expr = binaryExpr;
src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
+1 -2
View File
@@ -129,8 +129,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
print(select.getOutFileCharset());
}
if (select.getOutFileColumnsTerminatedBy() != null || select.getOutFileColumnsEnclosedBy() != null
|| select.getOutFileColumnsEscaped() != null) {
if (select.getOutFileColumnsTerminatedBy() != null || select.getOutFileColumnsEnclosedBy() != null || select.getOutFileColumnsEscaped() != null) {
print(" COLUMNS");
if (select.getOutFileColumnsTerminatedBy() != null) {
print(" TERMINATED BY ");
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTimestampExpr.java
+1 -2
View File
@@ -55,8 +55,7 @@ public class OracleTimestampExpr extends OracleDatetimeLiteralExpr {
buf.append("-");
buf.append(this.dayOfMonth);
if ((this.hour != 0) || (this.minute != 0) || (this.second != 0) || (this.milliSecond != 0)
|| (this.timeZone != null)) {
if ((this.hour != 0) || (this.minute != 0) || (this.second != 0) || (this.milliSecond != 0) || (this.timeZone != null)) {
buf.append(' ');
buf.append(this.hour);
buf.append(":");
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/visitor/OracleOutputVisitor.java
+1 -2
View File
@@ -893,8 +893,7 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
print("-");
print(x.getDayOfMonth());
if ((x.getHour() != 0) || (x.getMinute() != 0) || (x.getSecond() != 0) || (x.getMilliSecond() != 0)
|| (x.getTimeZone() != null)) {
if ((x.getHour() != 0) || (x.getMinute() != 0) || (x.getSecond() != 0) || (x.getMilliSecond() != 0) || (x.getTimeZone() != null)) {
print(' ');
print(x.getHour());
print(":");
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java
+4 -5
View File
@@ -32,11 +32,10 @@ public class OracleExprParser extends SQLExprParser {
public boolean allowStringAdditive = false;
private static final String[] _aggregateFunctions = { "AVG", "CORR", "COVAR_POP", "COVAR_SAMP", "COUNT",
"CUME_DIST", "DENSE_RANK", "FIRST", "FIRST_VALUE", "LAG", "LAST", "LAST_VALUE", "LEAD", "MAX", "MIN",
"NTILE", "PERCENT_RANK", "PERCENTILE_CONT", "PERCENTILE_DISC", "RANK", "RATIO_TO_REPORT", "REGR_SLOPE",
"REGR_INTERCEPT", "REGR_COUNT", "REGR_R2", "REGR_AVGX", "REGR_AVGY", "REGR_SXX", "REGR_SYY", "REGR_SXY",
"ROW_NUMBER", "STDDEV", "STDDEV_POP", "STDDEV_SAMP", "SUM", "VAR_POP", "VAR_SAMP", "VARIANCE" };
private static final String[] _aggregateFunctions = { "AVG", "CORR", "COVAR_POP", "COVAR_SAMP", "COUNT", "CUME_DIST", "DENSE_RANK", "FIRST", "FIRST_VALUE",
"LAG", "LAST", "LAST_VALUE", "LEAD", "MAX", "MIN", "NTILE", "PERCENT_RANK", "PERCENTILE_CONT", "PERCENTILE_DISC", "RANK", "RATIO_TO_REPORT",
"REGR_SLOPE", "REGR_INTERCEPT", "REGR_COUNT", "REGR_R2", "REGR_AVGX", "REGR_AVGY", "REGR_SXX", "REGR_SYY", "REGR_SXY", "ROW_NUMBER", "STDDEV",
"STDDEV_POP", "STDDEV_SAMP", "SUM", "VAR_POP", "VAR_SAMP", "VARIANCE" };
public OracleExprParser(Lexer lexer){
super(lexer);
src/main/java/com/alibaba/druid/sql/parser/Token.java
+12 -19
View File
@@ -16,29 +16,23 @@
package com.alibaba.druid.sql.parser;
public enum Token {
FOR("FOR"), INDEX("INDEX"), PRIMARY("PRIMARY"), KEY("KEY"), DEFAULT("DEFAULT"), CONSTRAINT("CONSTRAINT"),
CHECK("CHECK"), VIEW("VIEW"), CREATE("CREATE"), ALTER("ALTER"), DROP("DROP"), TABLE("TABLE"), UPDATE("UPDATE"),
SET("SET"), SELECT("SELECT"), FROM("FROM"), WHERE("WHERE"), ORDER("ORDER"), BY("BY"), GROUP("GROUP"),
HAVING("HAVING"), INSERT("INSERT"), INTO("INTO"), NULL("NULL"), NOT("NOT"), AS("AS"), DELETE("DELETE"),
DISTINCT("DISTINCT"), UNIQUE("UNIQUE"), FOREIGN("FOREIGN"), REFERENCE("REFERENCE"), REFERENCES("REFERENCES"),
ALL("ALL"), UNION("UNION"), INTERSECT("INTERSECT"), MINUS("MINUS"), INNER("INNER"), LEFT("LEFT"), RIGHT("RIGHT"),
FULL("FULL"), OUTER("OUTER"), JOIN("JOIN"), ON("ON"), SCHEMA("SCHEMA"), CAST("CAST"),
FOR("FOR"), INDEX("INDEX"), PRIMARY("PRIMARY"), KEY("KEY"), DEFAULT("DEFAULT"), CONSTRAINT("CONSTRAINT"), CHECK("CHECK"), VIEW("VIEW"), CREATE("CREATE"),
ALTER("ALTER"), DROP("DROP"), TABLE("TABLE"), UPDATE("UPDATE"), SET("SET"), SELECT("SELECT"), FROM("FROM"), WHERE("WHERE"), ORDER("ORDER"), BY("BY"),
GROUP("GROUP"), HAVING("HAVING"), INSERT("INSERT"), INTO("INTO"), NULL("NULL"), NOT("NOT"), AS("AS"), DELETE("DELETE"), DISTINCT("DISTINCT"),
UNIQUE("UNIQUE"), FOREIGN("FOREIGN"), REFERENCE("REFERENCE"), REFERENCES("REFERENCES"), ALL("ALL"), UNION("UNION"), INTERSECT("INTERSECT"), MINUS("MINUS"),
INNER("INNER"), LEFT("LEFT"), RIGHT("RIGHT"), FULL("FULL"), OUTER("OUTER"), JOIN("JOIN"), ON("ON"), SCHEMA("SCHEMA"), CAST("CAST"),
AND("AND"), OR("OR"), XOR("XOR"), CASE("CASE"), WHEN("WHEN"), THEN("THEN"), ELSE("ELSE"), END("END"),
EXISTS("EXISTS"), IN("IN"),
AND("AND"), OR("OR"), XOR("XOR"), CASE("CASE"), WHEN("WHEN"), THEN("THEN"), ELSE("ELSE"), END("END"), EXISTS("EXISTS"), IN("IN"),
NEW("NEW"), ASC("ASC"), DESC("DESC"), IS("IS"), LIKE("LIKE"), ESCAPE("ESCAPE"), BETWEEN("BETWEEN"),
VALUES("VALUES"), INTERVAL("INTERVAL"),
NEW("NEW"), ASC("ASC"), DESC("DESC"), IS("IS"), LIKE("LIKE"), ESCAPE("ESCAPE"), BETWEEN("BETWEEN"), VALUES("VALUES"), INTERVAL("INTERVAL"),
LOCK("LOCK"), SOME("SOME"), ANY("ANY"),
EOF,
ERROR,
EOF, ERROR,
IDENTIFIER,
HINT,
// QS_TODO add support in Lexer
SYS_VAR,
USR_VAR,
SYS_VAR, USR_VAR,
/** number composed purely of digit */
LITERAL_NUM_PURE_DIGIT,
/** number composed of digit mixed with <code>.</code> or <code>e</code> */
@@ -51,10 +45,9 @@ public enum Token {
// QS_TODO remove alias token
LITERAL_ALIAS,
LPAREN("("), RPAREN(")"), LBRACE("{"), RBRACE("}"), LBRACKET("["), RBRACKET("]"), SEMI(";"), COMMA(","), DOT("."),
EQ("="), GT(">"), LT("<"), BANG("!"), TILDE("~"), QUES("?"), COLON(":"), COLONEQ(":="), EQEQ("=="), LTEQ("<="),
LTEQGT("<=>"), LTGT("<>"), GTEQ(">="), BANGEQ("!="), BANGGT("!>"), BANGLT("!<"), AMPAMP("&&"), BARBAR("||"),
PLUS("+"), SUB("-"), STAR("*"), SLASH("/"), AMP("&"), BAR("|"), CARET("^"), PERCENT("%"), LTLT("<<"), GTGT(">>"),
LPAREN("("), RPAREN(")"), LBRACE("{"), RBRACE("}"), LBRACKET("["), RBRACKET("]"), SEMI(";"), COMMA(","), DOT("."), EQ("="), GT(">"), LT("<"), BANG("!"),
TILDE("~"), QUES("?"), COLON(":"), COLONEQ(":="), EQEQ("=="), LTEQ("<="), LTEQGT("<=>"), LTGT("<>"), GTEQ(">="), BANGEQ("!="), BANGGT("!>"), BANGLT("!<"),
AMPAMP("&&"), BARBAR("||"), PLUS("+"), SUB("-"), STAR("*"), SLASH("/"), AMP("&"), BAR("|"), CARET("^"), PERCENT("%"), LTLT("<<"), GTGT(">>"),
MONKEYS_AT("@");
public final String name;