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

sql parser refactor

Browse Source
This commit is contained in:
wenshao
2012-07-18 07:42:37 +08:00
parent 4b64b07e38
commit 236561d6c3
5 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java
+1 -1
View File
@@ -122,6 +122,6 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable {
}
public static enum Option {
DISTINCT, ALL
DISTINCT, ALL, UNIQUE
}
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAggregateExpr.java
+2 -3
View File
@@ -24,17 +24,16 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class OracleAggregateExpr extends SQLAggregateExpr implements Serializable, OracleExpr {
private boolean unique = false;
private static final long serialVersionUID = 1L;
private OracleAnalytic over;
private boolean ignoreNulls = false;
public boolean isUnique() {
return unique;
return Option.UNIQUE.equals(this.getOption());
}
public void setUnique(boolean unique) {
this.unique = unique;
this.setOption(Option.UNIQUE);
}
public boolean isIgnoreNulls() {
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java
+4 -9
View File
@@ -526,17 +526,13 @@ public class OracleExprParser extends SQLExprParser {
}
protected OracleAggregateExpr parseAggregateExpr(String methodName) {
boolean unique = false;
methodName = methodName.toUpperCase();
if (lexer.token() == Token.UNIQUE) {
lexer.nextToken();
unique = true;
}
OracleAggregateExpr aggregateExpr;
if (lexer.token() == (Token.ALL)) {
if (lexer.token() == Token.UNIQUE) {
aggregateExpr = new OracleAggregateExpr(methodName, SQLAggregateExpr.Option.UNIQUE);
lexer.nextToken();
} else if (lexer.token() == (Token.ALL)) {
aggregateExpr = new OracleAggregateExpr(methodName, SQLAggregateExpr.Option.ALL);
lexer.nextToken();
} else if (lexer.token() == (Token.DISTINCT)) {
@@ -545,7 +541,6 @@ public class OracleExprParser extends SQLExprParser {
} else {
aggregateExpr = new OracleAggregateExpr(methodName);
}
aggregateExpr.setUnique(unique);
exprList(aggregateExpr.getArguments());
if (lexer.stringVal().equalsIgnoreCase("IGNORE")) {
src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java
-3
View File
@@ -217,9 +217,6 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
print(' ');
}
if (expr.isUnique()) {
print("UNIQUE ");
}
printAndAccept(expr.getArguments(), ", ");
print(")");