refactor sql parser group by

This commit is contained in:
高铁
2016-01-09 13:56:09 +08:00
parent 739645fbf1
commit b4155d7be2
26 changed files with 220 additions and 329 deletions
@@ -50,6 +50,7 @@ import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLCurrentOfCursorExpr;
import com.alibaba.druid.sql.ast.expr.SQLDefaultExpr;
import com.alibaba.druid.sql.ast.expr.SQLExistsExpr;
import com.alibaba.druid.sql.ast.expr.SQLGroupingSetExpr;
import com.alibaba.druid.sql.ast.expr.SQLHexExpr;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
@@ -743,6 +744,11 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
print0(ucase ? "HAVING " : "having ");
x.getHaving().accept(this);
}
if (x.isRollUp()) {
print0(ucase ? " WITH ROLLUP" : " with rollup");
}
return false;
}
@@ -2434,6 +2440,15 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
return false;
}
@Override
public boolean visit(SQLGroupingSetExpr x) {
print0(ucase ? "GROUPING SETS" : "grouping sets");
print0(" (");
printAndAccept(x.getParameters(), ", ");
print(')');
return false;
}
public boolean isUppCase() {
return ucase;
}
@@ -35,6 +35,7 @@ import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLCurrentOfCursorExpr;
import com.alibaba.druid.sql.ast.expr.SQLDefaultExpr;
import com.alibaba.druid.sql.ast.expr.SQLExistsExpr;
import com.alibaba.druid.sql.ast.expr.SQLGroupingSetExpr;
import com.alibaba.druid.sql.ast.expr.SQLHexExpr;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
@@ -638,5 +639,8 @@ public interface SQLASTVisitor {
void endVisit(SQLCloseStatement x);
boolean visit(SQLCloseStatement x);
boolean visit(SQLGroupingSetExpr x);
void endVisit(SQLGroupingSetExpr x);
}
@@ -36,6 +36,7 @@ import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLCurrentOfCursorExpr;
import com.alibaba.druid.sql.ast.expr.SQLDefaultExpr;
import com.alibaba.druid.sql.ast.expr.SQLExistsExpr;
import com.alibaba.druid.sql.ast.expr.SQLGroupingSetExpr;
import com.alibaba.druid.sql.ast.expr.SQLHexExpr;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
@@ -1268,5 +1269,15 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor {
public boolean visit(SQLCloseStatement x) {
return true;
}
@Override
public boolean visit(SQLGroupingSetExpr x) {
return true;
}
@Override
public void endVisit(SQLGroupingSetExpr x) {
}
}