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

bug fixed sql parser aggregate distinct output

Browse Source
This commit is contained in:
wenshao
2012-07-18 07:29:47 +08:00
parent 5a3237cd1f
commit 4b64b07e38
12 changed files with 82 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java
+9 -6
View File
@@ -27,16 +27,15 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable {
private static final long serialVersionUID = 1L;
protected String methodName;
protected int option;
protected Option option;
protected final List<SQLExpr> arguments = new ArrayList<SQLExpr>();
public SQLAggregateExpr(String methodName){
this.methodName = methodName;
this.option = 1;
}
public SQLAggregateExpr(String methodName, int option){
public SQLAggregateExpr(String methodName, Option option){
this.methodName = methodName;
this.option = option;
}
@@ -49,11 +48,11 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable {
this.methodName = methodName;
}
public int getOption() {
public Option getOption() {
return this.option;
}
public void setOption(int option) {
public void setOption(Option option) {
this.option = option;
}
@@ -86,7 +85,7 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable {
int result = 1;
result = prime * result + ((arguments == null) ? 0 : arguments.hashCode());
result = prime * result + ((methodName == null) ? 0 : methodName.hashCode());
result = prime * result + option;
result = prime * result + ((option == null) ? 0 : option.hashCode());
return result;
}
@@ -121,4 +120,8 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable {
}
return true;
}
public static enum Option {
DISTINCT, ALL
}
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAggregateExpr.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class OracleAggregateExpr extends SQLAggregateExpr implements Serializabl
super(methodName);
}
public OracleAggregateExpr(String methodName, int option){
public OracleAggregateExpr(String methodName, Option option){
super(methodName, option);
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java
+7 -4
View File
@@ -22,6 +22,7 @@ import com.alibaba.druid.sql.ast.SQLDataTypeImpl;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLOrderingSpecification;
import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
@@ -524,9 +525,11 @@ public class OracleExprParser extends SQLExprParser {
return null;
}
protected OracleAggregateExpr parseAggregateExpr(String method_name) {
protected OracleAggregateExpr parseAggregateExpr(String methodName) {
boolean unique = false;
methodName = methodName.toUpperCase();
if (lexer.token() == Token.UNIQUE) {
lexer.nextToken();
unique = true;
@@ -534,13 +537,13 @@ public class OracleExprParser extends SQLExprParser {
OracleAggregateExpr aggregateExpr;
if (lexer.token() == (Token.ALL)) {
aggregateExpr = new OracleAggregateExpr(method_name, 1);
aggregateExpr = new OracleAggregateExpr(methodName, SQLAggregateExpr.Option.ALL);
lexer.nextToken();
} else if (lexer.token() == (Token.DISTINCT)) {
aggregateExpr = new OracleAggregateExpr(method_name, 0);
aggregateExpr = new OracleAggregateExpr(methodName, SQLAggregateExpr.Option.DISTINCT);
lexer.nextToken();
} else {
aggregateExpr = new OracleAggregateExpr(method_name, 1);
aggregateExpr = new OracleAggregateExpr(methodName);
}
aggregateExpr.setUnique(unique);
exprList(aggregateExpr.getArguments());
src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java
+6
View File
@@ -211,6 +211,12 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
public boolean visit(OracleAggregateExpr expr) {
print(expr.getMethodName());
print("(");
if (expr.getOption() != null) {
print(expr.getOption().toString());
print(' ');
}
if (expr.isUnique()) {
print("UNIQUE ");
}
src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/PGAggregateExpr.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class PGAggregateExpr extends SQLAggregateExpr implements PGSQLObject {
private static final long serialVersionUID = 1L;
public PGAggregateExpr(String methodName, int option) {
public PGAggregateExpr(String methodName, Option option) {
super(methodName, option);
}
src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java
+6 -4
View File
@@ -19,16 +19,18 @@ public class PGExprParser extends SQLExprParser{
super(lexer);
}
protected SQLAggregateExpr parseAggregateExpr(String method_name) throws ParserException {
protected SQLAggregateExpr parseAggregateExpr(String methodName) throws ParserException {
methodName = methodName.toUpperCase();
PGAggregateExpr aggregateExpr;
if (lexer.token() == Token.ALL) {
aggregateExpr = new PGAggregateExpr(method_name, 1);
aggregateExpr = new PGAggregateExpr(methodName, SQLAggregateExpr.Option.ALL);
lexer.nextToken();
} else if (lexer.token() == Token.DISTINCT) {
aggregateExpr = new PGAggregateExpr(method_name, 0);
aggregateExpr = new PGAggregateExpr(methodName, SQLAggregateExpr.Option.DISTINCT);
lexer.nextToken();
} else {
aggregateExpr = new PGAggregateExpr(method_name, 1);
aggregateExpr = new PGAggregateExpr(methodName);
}
exprList(aggregateExpr.getArguments());
src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java
+9
View File
@@ -433,12 +433,21 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor
@Override
public boolean visit(PGAggregateExpr x) {
print(x.getMethodName());
print("(");
if (x.getOption() != null) {
print(x.getOption().toString());
print(' ');
}
printAndAccept(x.getArguments(), ", ");
print(")");
if (x.getOver() != null) {
x.getOver().accept(this);
}
return false;
}
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+6 -4
View File
@@ -675,16 +675,18 @@ public class SQLExprParser extends SQLParser {
return false;
}
protected SQLAggregateExpr parseAggregateExpr(String method_name) throws ParserException {
protected SQLAggregateExpr parseAggregateExpr(String methodName) throws ParserException {
methodName = methodName.toUpperCase();
SQLAggregateExpr aggregateExpr;
if (lexer.token() == Token.ALL) {
aggregateExpr = new SQLAggregateExpr(method_name, 1);
aggregateExpr = new SQLAggregateExpr(methodName, SQLAggregateExpr.Option.ALL);
lexer.nextToken();
} else if (lexer.token() == Token.DISTINCT) {
aggregateExpr = new SQLAggregateExpr(method_name, 0);
aggregateExpr = new SQLAggregateExpr(methodName, SQLAggregateExpr.Option.DISTINCT);
lexer.nextToken();
} else {
aggregateExpr = new SQLAggregateExpr(method_name, 1);
aggregateExpr = new SQLAggregateExpr(methodName);
}
exprList(aggregateExpr.getArguments());
src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
+6
View File
@@ -426,6 +426,12 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter {
public boolean visit(SQLAggregateExpr x) {
print(x.getMethodName());
print("(");
if (x.getOption() != null) {
print(x.getOption().toString());
print(' ');
}
printAndAccept(x.getArguments(), ", ");
print(")");
return false;
src/main/java/com/alibaba/druid/stat/JdbcStatManagerFactoryBean.java
+2 -2
View File
@@ -17,10 +17,10 @@ package com.alibaba.druid.stat;
import org.springframework.beans.factory.FactoryBean;
public class JdbcStatManagerFactoryBean implements FactoryBean {
public class JdbcStatManagerFactoryBean implements FactoryBean<JdbcStatManager> {
@Override
public Object getObject() throws Exception {
public JdbcStatManager getObject() throws Exception {
return JdbcStatManager.getInstance();
}
src/main/java/com/alibaba/druid/support/spring/MBeanServerFactoryBean.java
+1 -1
View File
@@ -6,7 +6,7 @@ import javax.management.MBeanServer;
import org.springframework.beans.factory.FactoryBean;
public class MBeanServerFactoryBean implements FactoryBean {
public class MBeanServerFactoryBean implements FactoryBean<MBeanServer> {
public MBeanServer getObject() throws Exception {
return ManagementFactory.getPlatformMBeanServer();