|
@@ -68,15 +68,14 @@ public class JsqlParserCountOptimize implements ISqlParser {
|
|
@Override
|
|
@Override
|
|
public SqlInfo parser(MetaObject metaObject, String sql) {
|
|
public SqlInfo parser(MetaObject metaObject, String sql) {
|
|
if (logger.isDebugEnabled()) {
|
|
if (logger.isDebugEnabled()) {
|
|
- logger.debug(" JsqlParserCountOptimize sql=" + sql);
|
|
|
|
|
|
+ logger.debug("JsqlParserCountOptimize sql=" + sql);
|
|
}
|
|
}
|
|
SqlInfo sqlInfo = SqlInfo.newInstance();
|
|
SqlInfo sqlInfo = SqlInfo.newInstance();
|
|
try {
|
|
try {
|
|
Select selectStatement = (Select) CCJSqlParserUtil.parse(sql);
|
|
Select selectStatement = (Select) CCJSqlParserUtil.parse(sql);
|
|
PlainSelect plainSelect = (PlainSelect) selectStatement.getSelectBody();
|
|
PlainSelect plainSelect = (PlainSelect) selectStatement.getSelectBody();
|
|
Distinct distinct = plainSelect.getDistinct();
|
|
Distinct distinct = plainSelect.getDistinct();
|
|
- GroupByElement groupByElement = plainSelect.getGroupBy();
|
|
|
|
- List<Expression> groupBy = groupByElement.getGroupByExpressions();
|
|
|
|
|
|
+ List<Expression> groupBy = plainSelect.getGroupByColumnReferences();
|
|
List<OrderByElement> orderBy = plainSelect.getOrderByElements();
|
|
List<OrderByElement> orderBy = plainSelect.getOrderByElements();
|
|
|
|
|
|
// 添加包含groupBy 不去除orderBy
|
|
// 添加包含groupBy 不去除orderBy
|