diff --git a/pom.xml b/pom.xml index d40215f3de..0452ef1813 100644 --- a/pom.xml +++ b/pom.xml @@ -160,39 +160,6 @@ - - - - false - com.mycila.maven-license-plugin - maven-license-plugin - 1.10.b1 - -
${basedir}/doc/license.txt
- true - true - true - - - - - SLASHSTAR_STYLE - - - src/main/java/**/*.java - - UTF-8 -
- - - check-headers - verify - - check - - - -
org.apache.maven.plugins maven-jar-plugin diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java b/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java index d9c87ca96c..97ba1fe56d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java @@ -37,6 +37,11 @@ public final class SQLOrderBy extends SQLObjectImpl { addItem(item); } + public SQLOrderBy(SQLExpr expr, SQLOrderingSpecification type){ + SQLSelectOrderByItem item = new SQLSelectOrderByItem(expr, type); + addItem(item); + } + public void addItem(SQLSelectOrderByItem item) { if (item != null) { item.setParent(this); @@ -44,6 +49,10 @@ public final class SQLOrderBy extends SQLObjectImpl { this.items.add(item); } + public void addItem(SQLExpr item) { + addItem(new SQLSelectOrderByItem(item)); + } + public List getItems() { return this.items; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java index 00c67b74f1..498e3fdac5 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 Alibaba Group Holding Ltd. + * Copyright 1999-2017 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,32 +15,22 @@ */ package com.alibaba.druid.sql.ast.expr; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLDataType; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.ast.SQLKeep; -import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.SQLOrderBy; -import com.alibaba.druid.sql.ast.SQLOver; -import com.alibaba.druid.sql.ast.SQLReplaceable; +import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import com.alibaba.druid.util.FnvHash; -public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLReplaceable { +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class SQLAggregateExpr extends SQLMethodInvokeExpr implements Serializable, SQLReplaceable { private static final long serialVersionUID = 1L; - protected String methodName; - protected long methodNameHashCod64; - protected SQLAggregateOption option; - protected final List arguments = new ArrayList(); + protected SQLKeep keep; protected SQLExpr filter; protected SQLOver over; @@ -51,25 +41,21 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe public SQLAggregateExpr(String methodName){ this.methodName = methodName; } - public SQLAggregateExpr(String methodName, SQLAggregateOption option){ this.methodName = methodName; this.option = option; } - public String getMethodName() { - return this.methodName; - } - - public void setMethodName(String methodName) { + public SQLAggregateExpr(String methodName, SQLAggregateOption option, SQLExpr... arguments){ this.methodName = methodName; - } - - public long methodNameHashCod64() { - if (methodNameHashCod64 == 0) { - methodNameHashCod64 = FnvHash.hashCode64(methodName); + this.option = option; + if (arguments != null) { + for (SQLExpr argument : arguments) { + if (argument != null) { + addArgument(argument); + } + } } - return methodNameHashCod64; } public SQLOrderBy getWithinGroup() { @@ -92,26 +78,19 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe this.option = option; } - public List getArguments() { - return this.arguments; - } - - public void addArgument(SQLExpr argument) { - if (argument != null) { - argument.setParent(this); - } - this.arguments.add(argument); + public boolean isDistinct() { + return option == SQLAggregateOption.DISTINCT; } public SQLOver getOver() { return over; } - public void setOver(SQLOver over) { - if (over != null) { - over.setParent(this); + public void setOver(SQLOver x) { + if (x != null) { + x.setParent(this); } - this.over = over; + this.over = x; } public SQLName getOverRef() { @@ -124,7 +103,7 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe } this.overRef = x; } - + public SQLKeep getKeep() { return keep; } @@ -135,7 +114,7 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe } this.keep = keep; } - + public boolean isIgnoreNulls() { return this.ignoreNulls != null && this.ignoreNulls; } @@ -156,11 +135,35 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { - acceptChild(visitor, this.arguments); - acceptChild(visitor, this.keep); - acceptChild(visitor, this.over); - acceptChild(visitor, this.overRef); - acceptChild(visitor, this.withinGroup); + if (this.owner != null) { + this.owner.accept(visitor); + } + + for (SQLExpr arg : this.arguments) { + if (arg != null) { + arg.accept(visitor); + } + } + + if (this.keep != null) { + this.keep.accept(visitor); + } + + if (this.filter != null) { + this.filter.accept(visitor); + } + + if (this.over != null) { + this.over.accept(visitor); + } + + if (this.overRef != null) { + this.overRef.accept(visitor); + } + + if (this.withinGroup != null) { + this.withinGroup.accept(visitor); + } } visitor.endVisit(this); @@ -182,17 +185,27 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe return children; } + public SQLExpr getFilter() { + return filter; + } + + public void setFilter(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + + this.filter = x; + } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; + if (!super.equals(o)) return false; SQLAggregateExpr that = (SQLAggregateExpr) o; - if (methodNameHashCod64 != that.methodNameHashCod64) return false; - if (methodName != null ? !methodName.equals(that.methodName) : that.methodName != null) return false; if (option != that.option) return false; - if (arguments != null ? !arguments.equals(that.arguments) : that.arguments != null) return false; if (keep != null ? !keep.equals(that.keep) : that.keep != null) return false; if (filter != null ? !filter.equals(that.filter) : that.filter != null) return false; if (over != null ? !over.equals(that.over) : that.over != null) return false; @@ -203,10 +216,8 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe @Override public int hashCode() { - int result = methodName != null ? methodName.hashCode() : 0; - result = 31 * result + (int) (methodNameHashCod64 ^ (methodNameHashCod64 >>> 32)); + int result = super.hashCode(); result = 31 * result + (option != null ? option.hashCode() : 0); - result = 31 * result + (arguments != null ? arguments.hashCode() : 0); result = 31 * result + (keep != null ? keep.hashCode() : 0); result = 31 * result + (filter != null ? filter.hashCode() : 0); result = 31 * result + (over != null ? over.hashCode() : 0); @@ -229,10 +240,6 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe x.setKeep(keep.clone()); } - if (filter != null) { - x.setFilter(filter.clone()); - } - if (over != null) { x.setOver(over.clone()); } @@ -247,38 +254,34 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe x.ignoreNulls = ignoreNulls; - return x; - } - - public SQLExpr getFilter() { - return filter; - } - - public void setFilter(SQLExpr x) { - if (x != null) { - x.setParent(this); - } - this.filter = x; - } - - public SQLDataType computeDataType() { - long hash = methodNameHashCod64(); - - if (hash == FnvHash.Constants.COUNT - || hash == FnvHash.Constants.ROW_NUMBER) { - return SQLIntegerExpr.DEFAULT_DATA_TYPE; - } - - if (arguments.size() > 0) { - SQLDataType dataType = arguments.get(0).computeDataType(); - if (dataType != null) { - return dataType; + if (attributes != null) { + for (Map.Entry entry : attributes.entrySet()) { + String key = entry.getKey(); + Object value = entry.getValue(); + if (value instanceof SQLObject) { + value = ((SQLObject) value).clone(); + } + x.putAttribute(key, value); } } - if (hash == FnvHash.Constants.WM_CONCAT - || hash == FnvHash.Constants.GROUP_CONCAT) { - return SQLCharExpr.DEFAULT_DATA_TYPE; + return x; + } + + public SQLDataType computeDataType() { + if (resolvedReturnDataType != null) { + return resolvedReturnDataType; + } + + long hash = methodNameHashCode64(); + + if (arguments.size() > 0) { + SQLDataType dataType = arguments.get(0) + .computeDataType(); + if (dataType != null + && (dataType.nameHashCode64() != FnvHash.Constants.BOOLEAN)) { + return dataType; + } } return null; @@ -302,10 +305,9 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe return true; } - if (filter == expr) { - this.filter = target; + if (filter != null) { + filter = target; target.setParent(this); - return true; } return false; diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java index 556147ae31..4f781dccad 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java @@ -265,6 +265,21 @@ public class SQLBinaryOpExpr extends SQLExprImpl implements SQLReplaceable, Seri return groupList; } + public static List split(SQLExpr x, SQLBinaryOperator op) { + if (x instanceof SQLBinaryOpExprGroup) { + SQLBinaryOpExprGroup group = (SQLBinaryOpExprGroup) x; + if (group.getOperator() == op) { + return new ArrayList(group.getItems()); + } + } else if (x instanceof SQLBinaryOpExpr) { + return split((SQLBinaryOpExpr) x, op); + } + + List list = new ArrayList(1); + list.add(x); + return list; + } + public static void split(List outList, SQLExpr expr, SQLBinaryOperator op) { if (expr == null) { return; @@ -649,4 +664,47 @@ public class SQLBinaryOpExpr extends SQLExprImpl implements SQLReplaceable, Seri return binaryA.getLeft().toString().equals(binaryB.getLeft().toString()); } + + public static boolean isOr(SQLExpr x) { + return x instanceof SQLBinaryOpExpr + && ((SQLBinaryOpExpr) x).getOperator() == SQLBinaryOperator.BooleanOr; + } + + public static SQLExpr or(List list) { + if (list.size() == 0) { + return null; + } + SQLExpr first = list.get(0); + for (int i = 1; i < list.size(); i++) { + first = or(first, list.get(i)); + } + return first; + } + + public static SQLExpr or(SQLExpr a, SQLExpr b) { + if (a == null) { + return b; + } + + if (b == null) { + return a; + } + + if (a instanceof SQLBinaryOpExprGroup) { + SQLBinaryOpExprGroup group = (SQLBinaryOpExprGroup) a; + if (group.getOperator() == SQLBinaryOperator.BooleanOr) { + group.add(b); + return group; + } + } + + if (b instanceof SQLBinaryOpExpr) { + SQLBinaryOpExpr bb = (SQLBinaryOpExpr) b; + if (bb.operator == SQLBinaryOperator.BooleanOr) { + return or(or(a, bb.left), bb.right); + } + } + + return new SQLBinaryOpExpr(a, SQLBinaryOperator.BooleanOr, b); + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInListExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInListExpr.java index 75dd72a57b..efa6bfc693 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInListExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInListExpr.java @@ -87,6 +87,16 @@ public final class SQLInListExpr extends SQLExprImpl implements Serializable { this.targetList = targetList; } + public void addTarget(SQLExpr x) { + x.setParent(this); + targetList.add(x); + } + + public void addTarget(int index, SQLExpr x) { + x.setParent(this); + targetList.add(index, x); + } + protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, this.expr); diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java index fb263c7497..63ee2a31cd 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 Alibaba Group Holding Ltd. + * Copyright 1999-2017 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,77 +15,118 @@ */ package com.alibaba.druid.sql.ast.expr; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLDataType; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.SQLReplaceable; +import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import com.alibaba.druid.util.FnvHash; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, Serializable { - private static final long serialVersionUID = 1L; - private String name; - private SQLExpr owner; - private final List parameters = new ArrayList(); + private static final long serialVersionUID = 1L; - private SQLExpr from; - private SQLExpr using; - private SQLExpr _for; - - private String trimOption; - - private long nameHashCode64; + protected String methodName; + protected long methodNameHashCode64; + protected SQLExpr owner; + protected final List arguments = new ArrayList(); + private SQLExpr from; + private SQLExpr using; + private SQLExpr _for; + private String trimOption; + protected transient SQLDataType resolvedReturnDataType; public SQLMethodInvokeExpr(){ } public SQLMethodInvokeExpr(String methodName){ - this.name = methodName; + this.methodName = methodName; } - public SQLMethodInvokeExpr(String methodName, long nameHashCode64){ - this.name = methodName; - this.nameHashCode64 = nameHashCode64; + public SQLMethodInvokeExpr(String methodName, long methodNameHashCode64){ + this.methodName = methodName; + this.methodNameHashCode64 = methodNameHashCode64; } public SQLMethodInvokeExpr(String methodName, SQLExpr owner){ - this.name = methodName; + this.methodName = methodName; setOwner(owner); } public SQLMethodInvokeExpr(String methodName, SQLExpr owner, SQLExpr... params){ - this.name = methodName; + this.methodName = methodName; setOwner(owner); for (SQLExpr param : params) { - this.addParameter(param); + this.addArgument(param); + } + } + + public SQLMethodInvokeExpr(String methodName, SQLExpr owner, List params) { + this.methodName = methodName; + setOwner(owner); + for (SQLExpr param : params) { + this.addArgument(param); } } public long methodNameHashCode64() { - if (nameHashCode64 == 0 - && name != null) { - nameHashCode64 = FnvHash.hashCode64(name); + if (methodNameHashCode64 == 0 + && methodName != null) { + methodNameHashCode64 = FnvHash.hashCode64(methodName); } - return nameHashCode64; + return methodNameHashCode64; } public String getMethodName() { - return this.name; + return this.methodName; } public void setMethodName(String methodName) { - this.name = methodName; - this.nameHashCode64 = 0L; + this.methodName = methodName; + this.methodNameHashCode64 = 0L; + } + + /** + * instead of getArguments + * @deprecated + */ + public List getParameters() { + return this.arguments; + } + + public List getArguments() { + return this.arguments; + } + + public void setArgument(int i, SQLExpr arg) { + if (arg != null) { + arg.setParent(this); + } + this.arguments.set(i, arg); + } + + /** + * deprecated, instead of addArgument + * @deprecated + */ + public void addParameter(SQLExpr param) { + if (param != null) { + param.setParent(this); + } + this.arguments.add(param); + } + + public void addArgument(SQLExpr arg) { + if (arg != null) { + arg.setParent(this); + } + this.arguments.add(arg); } public SQLExpr getOwner() { @@ -110,27 +151,7 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, this.from = x; } - public List getArguments() { - return this.parameters; - } - public List getParameters() { - return this.parameters; - } - - public void addParameter(SQLExpr param) { - if (param != null) { - param.setParent(this); - } - this.parameters.add(param); - } - - public void addArgument(SQLExpr arg) { - if (arg != null) { - arg.setParent(this); - } - this.parameters.add(arg); - } public void output(StringBuffer buf) { if (this.owner != null) { @@ -138,14 +159,14 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, buf.append("."); } - buf.append(this.name); + buf.append(this.methodName); buf.append("("); - for (int i = 0, size = this.parameters.size(); i < size; ++i) { + for (int i = 0, size = this.arguments.size(); i < size; ++i) { if (i != 0) { buf.append(", "); } - this.parameters.get(i).output(buf); + this.arguments.get(i).output(buf); } buf.append(")"); } @@ -153,11 +174,27 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { - acceptChild(visitor, this.owner); - acceptChild(visitor, this.parameters); - acceptChild(visitor, this.from); - acceptChild(visitor, this.using); - acceptChild(visitor, this._for); + if (this.owner != null) { + this.owner.accept(visitor); + } + + for (SQLExpr arg : this.arguments) { + if (arg != null) { + arg.accept(visitor); + } + } + + if (this.from != null) { + this.from.accept(visitor); + } + + if (this.using != null) { + this.using.accept(visitor); + } + + if (this._for != null) { + this._for.accept(visitor); + } } visitor.endVisit(this); @@ -165,22 +202,38 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, public List getChildren() { if (this.owner == null) { - return this.parameters; + return this.arguments; } List children = new ArrayList(); children.add(owner); - children.addAll(this.parameters); + children.addAll(this.arguments); return children; } protected void accept0(OracleASTVisitor visitor) { if (visitor.visit(this)) { - acceptChild(visitor, this.owner); - acceptChild(visitor, this.parameters); - acceptChild(visitor, this.from); - acceptChild(visitor, this.using); - acceptChild(visitor, this._for); + if (this.owner != null) { + this.owner.accept(visitor); + } + + for (SQLExpr arg : this.arguments) { + if (arg != null) { + arg.accept(visitor); + } + } + + if (this.from != null) { + this.from.accept(visitor); + } + + if (this.using != null) { + this.using.accept(visitor); + } + + if (this._for != null) { + this._for.accept(visitor); + } } visitor.endVisit(this); @@ -193,18 +246,20 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, SQLMethodInvokeExpr that = (SQLMethodInvokeExpr) o; - if (name != null ? !name.equals(that.name) : that.name != null) return false; + if (methodNameHashCode64() != that.methodNameHashCode64()) { + return false; + } if (owner != null ? !owner.equals(that.owner) : that.owner != null) return false; - if (parameters != null ? !parameters.equals(that.parameters) : that.parameters != null) return false; + if (!arguments.equals(that.arguments)) return false; return from != null ? from.equals(that.from) : that.from == null; } @Override public int hashCode() { - int result = name != null ? name.hashCode() : 0; + int result = (int) (methodNameHashCode64() ^ (methodNameHashCode64() >>> 32)); result = 31 * result + (owner != null ? owner.hashCode() : 0); - result = 31 * result + (parameters != null ? parameters.hashCode() : 0); + result = 31 * result + arguments.hashCode(); result = 31 * result + (from != null ? from.hashCode() : 0); return result; } @@ -212,14 +267,14 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, public SQLMethodInvokeExpr clone() { SQLMethodInvokeExpr x = new SQLMethodInvokeExpr(); - x.name = name; + x.methodName = methodName; if (owner != null) { x.setOwner(owner.clone()); } - for (SQLExpr param : parameters) { - x.addParameter(param.clone()); + for (SQLExpr arg : arguments) { + x.addArgument(arg.clone()); } if (from != null) { @@ -230,6 +285,21 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, x.setUsing(using.clone()); } + if (trimOption != null) { + x.setTrimOption(trimOption); + } + + if (attributes != null) { + for (Map.Entry entry : attributes.entrySet()) { + String key = entry.getKey(); + Object value = entry.getValue(); + if (value instanceof SQLObject) { + value = ((SQLObject) value).clone(); + } + x.putAttribute(key, value); + } + } + return x; } @@ -239,9 +309,9 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, return false; } - for (int i = 0; i < parameters.size(); ++i) { - if (parameters.get(i) == expr) { - parameters.set(i, target); + for (int i = 0; i < arguments.size(); ++i) { + if (arguments.get(i) == expr) { + arguments.set(i, target); target.setParent(this); return true; } @@ -270,7 +340,7 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, return false; } - if (!SQLUtils.nameEquals(function, name)) { + if (!SQLUtils.nameEquals(function, methodName)) { return false; } @@ -290,19 +360,34 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, } public SQLDataType computeDataType() { - if (SQLUtils.nameEquals("to_date", name) - || SQLUtils.nameEquals("add_months", name)) { - return SQLDateExpr.DEFAULT_DATA_TYPE; + if (resolvedReturnDataType != null) { + return resolvedReturnDataType; } - if (parameters.size() == 1) { - if (SQLUtils.nameEquals("trunc", name)) { - return parameters.get(0).computeDataType(); + long nameHash = this.methodNameHashCode64(); + + if (nameHash == FnvHash.Constants.BIT_COUNT + || nameHash == FnvHash.Constants.ROW_NUMBER) { + return resolvedReturnDataType = new SQLDataTypeImpl("BIGINT"); + } + + if (arguments.size() == 1) { + if (nameHash == FnvHash.Constants.TRUNC) { + return resolvedReturnDataType = arguments.get(0).computeDataType(); } - } else if (parameters.size() == 2) { - SQLExpr param0 = parameters.get(0); - SQLExpr param1 = parameters.get(1); - if (SQLUtils.nameEquals("nvl", name) || SQLUtils.nameEquals("ifnull", name)) { + } else if (arguments.size() == 2) { + SQLExpr param0 = arguments.get(0); + SQLExpr param1 = arguments.get(1); + + if (nameHash == FnvHash.Constants.ROUND) { + SQLDataType dataType = param0.computeDataType(); + if (dataType != null) { + return dataType; + } + } else if (nameHash == FnvHash.Constants.NVL + || nameHash == FnvHash.Constants.IFNULL + || nameHash == FnvHash.Constants.ISNULL + || nameHash == FnvHash.Constants.COALESCE) { SQLDataType dataType = param0.computeDataType(); if (dataType != null) { return dataType; @@ -310,7 +395,35 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, return param1.computeDataType(); } + } + +// if (nameHash == FnvHash.Constants.ROUND) { +// return resolvedReturnDataType = SQLDecimalExpr.DATA_TYPE; +// } + + if (nameHash == FnvHash.Constants.YEAR + || nameHash == FnvHash.Constants.MONTH + || nameHash == FnvHash.Constants.DAY + || nameHash == FnvHash.Constants.HOUR + || nameHash == FnvHash.Constants.MINUTE + || nameHash == FnvHash.Constants.SECOND + || nameHash == FnvHash.Constants.PERIOD_ADD + || nameHash == FnvHash.Constants.PERIOD_DIFF + ) { + return resolvedReturnDataType = new SQLDataTypeImpl("INT"); + } + + if (nameHash == FnvHash.Constants.GROUPING) { + return resolvedReturnDataType = new SQLDataTypeImpl("INT"); + } + + if (nameHash == FnvHash.Constants.TIME) { + return resolvedReturnDataType = new SQLDataTypeImpl("VARCHAR"); + } + + + return null; } @@ -343,4 +456,12 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, public void setTrimOption(String trimOption) { this.trimOption = trimOption; } + + public SQLDataType getResolvedReturnDataType() { + return resolvedReturnDataType; + } + + public void setResolvedReturnDataType(SQLDataType resolvedReturnDataType) { + this.resolvedReturnDataType = resolvedReturnDataType; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprTableSource.java index 93e7173811..e3cf92a66f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprTableSource.java @@ -21,6 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; @@ -35,6 +36,8 @@ public class SQLExprTableSource extends SQLTableSourceImpl implements SQLReplace private List partitions; private SchemaObject schemaObject; + protected List columns; + public SQLExprTableSource(){ } @@ -309,4 +312,54 @@ public class SQLExprTableSource extends SQLTableSourceImpl implements SQLReplace } return false; } + + public SQLObject resolveColum(long columnNameHash) { + if (schemaObject != null) { + SQLStatement stmt = schemaObject.getStatement(); + if (stmt instanceof SQLCreateTableStatement) { + SQLCreateTableStatement createTableStmt = (SQLCreateTableStatement) stmt; + return createTableStmt.findColumn(columnNameHash); + } + } + + SQLObject resolvedOwnerObject = null; + if (expr instanceof SQLIdentifierExpr) { + resolvedOwnerObject = ((SQLIdentifierExpr) expr).getResolvedOwnerObject(); + } + + if (resolvedOwnerObject == null) { + return resolvedOwnerObject; + } + + if (resolvedOwnerObject instanceof SQLWithSubqueryClause.Entry) { + final SQLSelect subQuery = ((SQLWithSubqueryClause.Entry) resolvedOwnerObject) + .getSubQuery(); + if (subQuery == null) { + return null; + } + + final SQLSelectQueryBlock firstQueryBlock = subQuery.getFirstQueryBlock(); + if (firstQueryBlock == null) { + return null; + } + + SQLSelectItem selectItem = firstQueryBlock.findSelectItem(columnNameHash); + if (selectItem != null) { + return selectItem; + } + } + return null; + } + + public List getColumns() { + if (columns == null) { + columns = new ArrayList(2); + } + return columns; + } + + public List getColumnsDirect() { + return columns; + } + } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java index 94da7151f4..932054b8c1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java @@ -20,6 +20,7 @@ import java.util.List; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLReplaceable; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; @@ -125,6 +126,29 @@ public class SQLJoinTableSource extends SQLTableSourceImpl implements SQLReplace this.condition = condition; } + public void addCondition(SQLExpr condition) { + if (this.condition == null) { + this.condition = condition; + setImplicitJoinToCross(); + return; + } + + this.condition = SQLBinaryOpExpr.and(this.condition, condition); + } + + public void setImplicitJoinToCross() { + if (joinType == JoinType.COMMA) { + joinType = JoinType.CROSS_JOIN; + } + if (left instanceof SQLJoinTableSource) { + ((SQLJoinTableSource) left).setImplicitJoinToCross(); + } + + if (right instanceof SQLJoinTableSource) { + ((SQLJoinTableSource) right).setImplicitJoinToCross(); + } + } + public void addConditionn(SQLExpr condition) { this.condition = SQLBinaryOpExpr.and(this.condition, condition); } @@ -207,6 +231,7 @@ public class SQLJoinTableSource extends SQLTableSourceImpl implements SQLReplace JOIN("JOIN"), // INNER_JOIN("INNER JOIN"), // CROSS_JOIN("CROSS JOIN"), // + NATURAL_CROSS_JOIN("NATURAL CROSS JOIN"), // NATURAL_JOIN("NATURAL JOIN"), // NATURAL_INNER_JOIN("NATURAL INNER JOIN"), // LEFT_OUTER_JOIN("LEFT JOIN"), // @@ -517,4 +542,19 @@ public class SQLJoinTableSource extends SQLTableSourceImpl implements SQLReplace return null; } + + public SQLObject resolveColum(long columnNameHash) { + if (left != null) { + SQLObject column = left.resolveColum(columnNameHash); + if (column != null) { + return column; + } + } + + if (right != null) { + return right.resolveColum(columnNameHash); + } + + return null; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLateralViewTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLateralViewTableSource.java index e49d28c925..9c5b3394d8 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLateralViewTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLateralViewTableSource.java @@ -25,6 +25,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLLateralViewTableSource extends SQLTableSourceImpl { private SQLTableSource tableSource; + private boolean outer; private SQLMethodInvokeExpr method; @@ -101,4 +102,12 @@ public class SQLLateralViewTableSource extends SQLTableSourceImpl { } return null; } + + public boolean isOuter() { + return outer; + } + + public void setOuter(boolean outer) { + this.outer = outer; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java index 26a43a008c..690a715ca4 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java @@ -21,6 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLHint; +import com.alibaba.druid.sql.ast.SQLLimit; import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.SQLOrderBy; @@ -36,6 +37,7 @@ public class SQLSelect extends SQLObjectImpl { protected SQLWithSubqueryClause withSubQuery; protected SQLSelectQuery query; protected SQLOrderBy orderBy; + protected SQLLimit limit; protected List hints; @@ -123,31 +125,65 @@ public class SQLSelect extends SQLObjectImpl { } @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((orderBy == null) ? 0 : orderBy.hashCode()); - result = prime * result + ((query == null) ? 0 : query.hashCode()); - result = prime * result + ((withSubQuery == null) ? 0 : withSubQuery.hashCode()); - return result; + public boolean equals(Object o) + { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + SQLSelect sqlSelect = (SQLSelect) o; + + if (forBrowse != sqlSelect.forBrowse) { + return false; + } + if (withSubQuery != null ? !withSubQuery.equals(sqlSelect.withSubQuery) : sqlSelect.withSubQuery != null) { + return false; + } + if (query != null ? !query.equals(sqlSelect.query) : sqlSelect.query != null) { + return false; + } + if (orderBy != null ? !orderBy.equals(sqlSelect.orderBy) : sqlSelect.orderBy != null) { + return false; + } + if (limit != null ? !limit.equals(sqlSelect.limit) : sqlSelect.limit != null) { + return false; + } + if (hints != null ? !hints.equals(sqlSelect.hints) : sqlSelect.hints != null) { + return false; + } + if (restriction != null ? !restriction.equals(sqlSelect.restriction) : sqlSelect.restriction != null) { + return false; + } + if (forXmlOptions != null ? !forXmlOptions.equals(sqlSelect.forXmlOptions) : sqlSelect.forXmlOptions != null) { + return false; + } + if (xmlPath != null ? !xmlPath.equals(sqlSelect.xmlPath) : sqlSelect.xmlPath != null) { + return false; + } + if (rowCount != null ? !rowCount.equals(sqlSelect.rowCount) : sqlSelect.rowCount != null) { + return false; + } + return offset != null ? offset.equals(sqlSelect.offset) : sqlSelect.offset == null; } @Override - public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null) return false; - if (getClass() != obj.getClass()) return false; - SQLSelect other = (SQLSelect) obj; - if (orderBy == null) { - if (other.orderBy != null) return false; - } else if (!orderBy.equals(other.orderBy)) return false; - if (query == null) { - if (other.query != null) return false; - } else if (!query.equals(other.query)) return false; - if (withSubQuery == null) { - if (other.withSubQuery != null) return false; - } else if (!withSubQuery.equals(other.withSubQuery)) return false; - return true; + public int hashCode() + { + int result = withSubQuery != null ? withSubQuery.hashCode() : 0; + result = 31 * result + (query != null ? query.hashCode() : 0); + result = 31 * result + (orderBy != null ? orderBy.hashCode() : 0); + result = 31 * result + (limit != null ? limit.hashCode() : 0); + result = 31 * result + (hints != null ? hints.hashCode() : 0); + result = 31 * result + (restriction != null ? restriction.hashCode() : 0); + result = 31 * result + (forBrowse ? 1 : 0); + result = 31 * result + (forXmlOptions != null ? forXmlOptions.hashCode() : 0); + result = 31 * result + (xmlPath != null ? xmlPath.hashCode() : 0); + result = 31 * result + (rowCount != null ? rowCount.hashCode() : 0); + result = 31 * result + (offset != null ? offset.hashCode() : 0); + return result; } public void output(StringBuffer buf) { @@ -349,4 +385,15 @@ public class SQLSelect extends SQLObjectImpl { return false; } + + public SQLLimit getLimit() { + return limit; + } + + public void setLimit(SQLLimit x) { + if (x != null) { + x.setParent(this); + } + this.limit = x; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectGroupByClause.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectGroupByClause.java index 3f3fbb2f36..a58e383410 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectGroupByClause.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectGroupByClause.java @@ -20,6 +20,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLObjectImpl; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSelectGroupByClause extends SQLObjectImpl { @@ -28,6 +29,8 @@ public class SQLSelectGroupByClause extends SQLObjectImpl { private SQLExpr having; private boolean withRollUp = false; private boolean withCube = false; + private boolean distinct = false; + private boolean paren = false; public SQLSelectGroupByClause(){ @@ -96,4 +99,58 @@ public class SQLSelectGroupByClause extends SQLObjectImpl { x.withCube = withCube; return x; } + + public void addHaving(SQLExpr condition) { + if (condition == null) { + return; + } + + if (having == null) { + having = condition; + } else { + having = SQLBinaryOpExpr.and(having, condition); + } + } + + public boolean isDistinct() { + return distinct; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isParen() { + return paren; + } + + public void setParen(boolean paren) { + this.paren = paren; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + SQLSelectGroupByClause group = (SQLSelectGroupByClause) o; + + if (withRollUp != group.withRollUp) return false; + if (withCube != group.withCube) return false; + if (distinct != group.distinct) return false; + if (paren != group.paren) return false; + if (!items.equals(group.items)) return false; + return having != null ? having.equals(group.having) : group.having == null; + } + + @Override + public int hashCode() { + int result = items != null ? items.hashCode() : 0; + result = 31 * result + (having != null ? having.hashCode() : 0); + result = 31 * result + (withRollUp ? 1 : 0); + result = 31 * result + (withCube ? 1 : 0); + result = 31 * result + (distinct ? 1 : 0); + result = 31 * result + (paren ? 1 : 0); + return result; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectOrderByItem.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectOrderByItem.java index 0067f6ac5a..5db19d5bd6 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectOrderByItem.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectOrderByItem.java @@ -38,6 +38,11 @@ public final class SQLSelectOrderByItem extends SQLObjectImpl implements SQLRepl this.setExpr(expr); } + public SQLSelectOrderByItem(SQLExpr expr, SQLOrderingSpecification type){ + this.setExpr(expr); + this.type = type; + } + public SQLExpr getExpr() { return this.expr; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java index 477b429476..033df7524d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 Alibaba Group Holding Ltd. + * Copyright 1999-2017 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,29 +15,23 @@ */ package com.alibaba.druid.sql.ast.statement; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLCommentHint; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLLimit; -import com.alibaba.druid.sql.ast.SQLObjectImpl; -import com.alibaba.druid.sql.ast.SQLOrderBy; -import com.alibaba.druid.sql.ast.SQLReplaceable; -import com.alibaba.druid.sql.ast.SQLWindow; -import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExprGroup; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; -import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; +import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.expr.*; +import com.alibaba.druid.sql.dialect.odps.ast.OdpsUDTFSQLSelectItem; +import com.alibaba.druid.sql.parser.Lexer; +import com.alibaba.druid.sql.parser.SQLParserUtils; +import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; +import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; import com.alibaba.druid.util.FnvHash; -public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery, SQLReplaceable { - private boolean bracket = false; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.TreeSet; + +public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery, SQLReplaceable, SQLDbTypedObject { protected int distionOption; protected final List selectList = new ArrayList(); @@ -63,19 +57,24 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery // for oracle protected List forUpdateOf; - protected List distributeBy; + protected List distributeBy; protected List sortBy; + protected List clusterBy; protected String cachedSelectList; // optimized for SelectListCache protected long cachedSelectListHash; // optimized for SelectListCache - protected List hints; protected String dbType; + protected List hints; public SQLSelectQueryBlock(){ } + public SQLSelectQueryBlock(String dbType){ + this.dbType = dbType; + } + public SQLExprTableSource getInto() { return into; } @@ -95,22 +94,36 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery return this.groupBy; } - public void setGroupBy(SQLSelectGroupByClause groupBy) { - if (groupBy != null) { - groupBy.setParent(this); + public void setGroupBy(SQLSelectGroupByClause x) { + if (x != null) { + x.setParent(this); } - this.groupBy = groupBy; + this.groupBy = x; + } + + public List getWindows() { + return windows; + } + + public void addWindow(SQLWindow x) { + if (x != null) { + x.setParent(this); + } + if (windows == null) { + windows = new ArrayList(4); + } + this.windows.add(x); } public SQLExpr getWhere() { return this.where; } - public void setWhere(SQLExpr where) { - if (where != null) { - where.setParent(this); + public void setWhere(SQLExpr x) { + if (x != null) { + x.setParent(this); } - this.where = where; + this.where = x; } public void addWhere(SQLExpr condition) { @@ -119,12 +132,103 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery } if (where == null) { + condition.setParent(this); where = condition; + return; + } + + List items = SQLBinaryOpExpr.split(where, SQLBinaryOperator.BooleanAnd); + for (SQLExpr item : items) { + if (condition.equals(item)) { + return; + } + + if (condition instanceof SQLInListExpr) { + SQLInListExpr inListExpr = (SQLInListExpr) condition; + + if (item instanceof SQLBinaryOpExpr) { + SQLBinaryOpExpr binaryOpItem = (SQLBinaryOpExpr) item; + SQLExpr left = binaryOpItem.getLeft(); + SQLExpr right = binaryOpItem.getRight(); + if (inListExpr.getExpr().equals(left) + && binaryOpItem.getOperator() == SQLBinaryOperator.Equality + && !(right instanceof SQLNullExpr) + ) { + if (inListExpr.getTargetList().contains(right)) { + return; + } + + SQLUtils.replaceInParent(item, new SQLBooleanExpr(false)); + return; + } + } else { + if (item instanceof SQLInListExpr) { + SQLInListExpr inListItem = (SQLInListExpr) item; + if (inListExpr.getExpr().equals(inListItem.getExpr())) { + TreeSet set = new TreeSet(); + for (SQLExpr itemItem : inListItem.getTargetList()) { + set.add(itemItem); + } + + List andList = new ArrayList(); + for (SQLExpr exprItem : inListExpr.getTargetList()) { + if (set.contains(exprItem)) { + andList.add(exprItem.clone()); + } + } + + if (andList.size() == 0) { + SQLUtils.replaceInParent(item, new SQLBooleanExpr(false)); + return; + } + + inListItem.getTargetList().clear(); + for (SQLExpr val : andList) { + inListItem.addTarget(val); + } + return; + } + } + } + } + } + + where = SQLBinaryOpExpr.and(this.where, condition); + where.setParent(this); + } + + public void whereOr(SQLExpr condition) { + if (condition == null) { + return; + } + + if (where == null) { + condition.setParent(this); + where = condition; + } else if (SQLBinaryOpExpr.isOr(where) || SQLBinaryOpExpr.isOr(condition)) { + SQLBinaryOpExprGroup group = new SQLBinaryOpExprGroup(SQLBinaryOperator.BooleanOr, dbType); + group.add(where); + group.add(condition); + group.setParent(this); + where = group; } else { - where = SQLBinaryOpExpr.and(where, condition); + where = SQLBinaryOpExpr.or(where, condition); + where.setParent(this); } } - + + public void addHaving(SQLExpr condition) { + if (condition == null) { + return; + } + + if (groupBy == null) { + groupBy = new SQLSelectGroupByClause(); + } + + groupBy.addHaving(condition); + } + public SQLOrderBy getOrderBy() { return orderBy; } @@ -133,10 +237,99 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery if (orderBy != null) { orderBy.setParent(this); } - + this.orderBy = orderBy; } + public void addOrderBy(SQLOrderBy orderBy) { + if (orderBy == null) { + return; + } + + if (this.orderBy == null) { + setOrderBy(orderBy); + return; + } + + for (SQLSelectOrderByItem item : orderBy.getItems()) { + this.orderBy.addItem(item.clone()); + } + } + + public void addOrderBy(SQLSelectOrderByItem orderByItem) { + if (orderByItem == null) { + return; + } + + if (this.orderBy == null) { + orderBy = new SQLOrderBy(); + orderBy.setParent(this); + } + + orderBy.addItem(orderByItem); + } + + public boolean containsOrderBy(SQLSelectOrderByItem orderByItem) { + if (orderByItem == null || this.orderBy == null) { + return false; + } + + if (this.orderBy.getItems().contains(orderByItem)) { + return true; + } + + SQLExpr expr = orderByItem.getExpr(); + if (expr == null && expr instanceof SQLIntegerExpr) { + return false; + } + + int index = 0; + for (int i = 0; i < selectList.size(); i++) { + SQLSelectItem selectItem = selectList.get(i); + if (selectItem.getExpr().equals(expr)) { + index = i + 1; + break; + } + } + + if (index > 0) { + for (SQLSelectOrderByItem selectOrderByItem : orderBy.getItems()) { + final SQLExpr orderByItemExpr = selectOrderByItem.getExpr(); + if (orderByItemExpr instanceof SQLIntegerExpr && ((SQLIntegerExpr) orderByItemExpr).getNumber().intValue() == index) { + return true; + } + } + } + + return false; + } + + public void addOrderBy(SQLExpr orderBy, SQLOrderingSpecification type) { + if (orderBy == null) { + return; + } + + if (this.orderBy == null) { + setOrderBy(new SQLOrderBy(orderBy, type)); + return; + } + + this.orderBy.addItem(orderBy, type); + } + + public void addOrderBy(SQLExpr orderBy) { + if (orderBy == null) { + return; + } + + if (this.orderBy == null) { + setOrderBy(new SQLOrderBy(orderBy)); + return; + } + + this.orderBy.addItem(orderBy); + } + public SQLOrderBy getOrderBySiblings() { return orderBySiblings; } @@ -156,27 +349,67 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery this.distionOption = distionOption; } + public void setDistinct() { + this.distionOption = SQLSetQuantifier.DISTINCT; + } + + public boolean isDistinct() { + return this.distionOption == SQLSetQuantifier.DISTINCT; + } + public List getSelectList() { return this.selectList; } - + + public SQLSelectItem getSelectItem(int i) { + return this.selectList.get(i); + } + public void addSelectItem(SQLSelectItem item) { this.selectList.add(item); item.setParent(this); } - public void addSelectItem(SQLExpr expr) { - this.addSelectItem(new SQLSelectItem(expr)); + public SQLSelectItem addSelectItem(SQLExpr expr) { + SQLSelectItem item = new SQLSelectItem(expr); + this.addSelectItem(item); + return item; + } + + public void addSelectItem(String selectItemExpr, String alias) { + SQLExpr expr = SQLUtils.toSQLExpr(selectItemExpr, dbType); + this.addSelectItem(new SQLSelectItem(expr, alias)); } public void addSelectItem(SQLExpr expr, String alias) { this.addSelectItem(new SQLSelectItem(expr, alias)); } + private static class AggregationStatVisitor extends SQLASTVisitorAdapter { + private boolean aggregation = false; + public boolean visit(SQLAggregateExpr x) { + aggregation = true; + return false; + } + }; + + public boolean hasSelectAggregation() { + AggregationStatVisitor v = new AggregationStatVisitor(); + for (SQLSelectItem item : selectList) { + SQLExpr expr = item.getExpr(); + expr.accept(v); + } + return v.aggregation; + } + public SQLTableSource getFrom() { return this.from; } + public void setFrom(SQLExpr from) { + setFrom(new SQLExprTableSource(from)); + } + public void setFrom(SQLTableSource from) { if (from != null) { from.setParent(this); @@ -209,19 +442,20 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery if (tableName == null || tableName.length() == 0) { from = null; } else { - from = new SQLExprTableSource(new SQLIdentifierExpr(tableName), alias); + SQLExpr expr = SQLUtils.toSQLExpr(tableName); + from = new SQLExprTableSource(expr, alias); } this.setFrom(from); } public boolean isParenthesized() { - return parenthesized; - } + return parenthesized; + } + + public void setParenthesized(boolean parenthesized) { + this.parenthesized = parenthesized; + } - public void setParenthesized(boolean parenthesized) { - this.parenthesized = parenthesized; - } - public boolean isForUpdate() { return forUpdate; } @@ -229,7 +463,7 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery public void setForUpdate(boolean forUpdate) { this.forUpdate = forUpdate; } - + public boolean isNoWait() { return noWait; } @@ -237,11 +471,11 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery public void setNoWait(boolean noWait) { this.noWait = noWait; } - + public SQLExpr getWaitTime() { return waitTime; } - + public void setWaitTime(SQLExpr waitTime) { if (waitTime != null) { waitTime.setParent(this); @@ -328,11 +562,49 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery this.noCycle = noCycle; } - public List getDistributeBy() { + public List getDistributeBy() { + if (distributeBy == null) { + distributeBy = new ArrayList(); + } + return distributeBy; } + public List getDistributeByDirect() { + return distributeBy; + } + + public void addDistributeBy(SQLExpr x) { + if (x != null) { + x.setParent(this); + } else { + return; + } + + if (distributeBy == null) { + distributeBy = new ArrayList(); + } + distributeBy.add(new SQLSelectOrderByItem(x)); + } + + public void addDistributeBy(SQLSelectOrderByItem item) { + if (distributeBy == null) { + distributeBy = new ArrayList(); + } + if (item != null) { + item.setParent(this); + } + this.distributeBy.add(item); + } + public List getSortBy() { + if (sortBy == null) { + sortBy = new ArrayList(); + } + return sortBy; + } + + public List getSortByDirect() { return sortBy; } @@ -346,67 +618,179 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery this.sortBy.add(item); } - @Override + @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { - acceptChild(visitor, this.selectList); - acceptChild(visitor, this.from); - acceptChild(visitor, this.into); - acceptChild(visitor, this.where); - acceptChild(visitor, this.startWith); - acceptChild(visitor, this.connectBy); - acceptChild(visitor, this.groupBy); - acceptChild(visitor, this.orderBy); - acceptChild(visitor, this.distributeBy); - acceptChild(visitor, this.sortBy); - acceptChild(visitor, this.waitTime); - acceptChild(visitor, this.limit); + for (int i = 0; i < this.selectList.size(); i++) { + SQLSelectItem item = this.selectList.get(i); + if (item != null) { + item.accept(visitor); + } + } + + if (this.from != null) { + this.from.accept(visitor); + } + + if (this.windows != null) { + for (int i = 0; i < windows.size(); i++) { + SQLWindow item = windows.get(i); + item.accept(visitor); + } + } + + if (this.into != null) { + this.into.accept(visitor); + } + + if (this.where != null) { + this.where.accept(visitor); + } + + if (this.startWith != null) { + this.startWith.accept(visitor); + } + + if (this.connectBy != null) { + this.connectBy.accept(visitor); + } + + if (this.groupBy != null) { + this.groupBy.accept(visitor); + } + + if (this.orderBy != null) { + this.orderBy.accept(visitor); + } + + if (this.distributeBy != null) { + for (int i = 0; i < distributeBy.size(); i++) { + SQLSelectOrderByItem item = distributeBy.get(i); + item.accept(visitor); + } + } + + if (this.sortBy != null) { + for (int i = 0; i < sortBy.size(); i++) { + SQLSelectOrderByItem item = sortBy.get(i); + item.accept(visitor); + } + } + + if (this.waitTime != null) { + this.waitTime.accept(visitor); + } + + if (this.limit != null) { + this.limit.accept(visitor); + } } visitor.endVisit(this); } @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (Boolean.valueOf(parenthesized).hashCode()); - result = prime * result + distionOption; - result = prime * result + ((from == null) ? 0 : from.hashCode()); - result = prime * result + ((groupBy == null) ? 0 : groupBy.hashCode()); - result = prime * result + ((into == null) ? 0 : into.hashCode()); - result = prime * result + ((selectList == null) ? 0 : selectList.hashCode()); - result = prime * result + ((where == null) ? 0 : where.hashCode()); - return result; + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + SQLSelectQueryBlock that = (SQLSelectQueryBlock) o; + + if (distionOption != that.distionOption) return false; + if (prior != that.prior) return false; + if (noCycle != that.noCycle) return false; + if (parenthesized != that.parenthesized) return false; + if (forUpdate != that.forUpdate) return false; + if (noWait != that.noWait) return false; + if (cachedSelectListHash != that.cachedSelectListHash) return false; + if (selectList != null ? !selectList.equals(that.selectList) : that.selectList != null) { + return false; + } + if (from != null ? !from.equals(that.from) : that.from != null) return false; + if (into != null ? !into.equals(that.into) : that.into != null) return false; + if (where != null ? !where.equals(that.where) : that.where != null) return false; + if (startWith != null ? !startWith.equals(that.startWith) : that.startWith != null) return false; + if (connectBy != null ? !connectBy.equals(that.connectBy) : that.connectBy != null) return false; + if (orderBySiblings != null ? !orderBySiblings.equals(that.orderBySiblings) : that.orderBySiblings != null) + return false; + if (groupBy != null ? !groupBy.equals(that.groupBy) : that.groupBy != null) return false; + if (orderBy != null ? !orderBy.equals(that.orderBy) : that.orderBy != null) return false; + if (waitTime != null ? !waitTime.equals(that.waitTime) : that.waitTime != null) return false; + if (limit != null ? !limit.equals(that.limit) : that.limit != null) return false; + if (forUpdateOf != null ? !forUpdateOf.equals(that.forUpdateOf) : that.forUpdateOf != null) return false; + if (distributeBy != null ? !distributeBy.equals(that.distributeBy) : that.distributeBy != null) return false; + if (sortBy != null ? !sortBy.equals(that.sortBy) : that.sortBy != null) return false; + if (cachedSelectList != null ? !cachedSelectList.equals(that.cachedSelectList) : that.cachedSelectList != null) + return false; + if (dbType != that.dbType) return false; + return hints != null ? hints.equals(that.hints) : that.hints == null; } @Override - public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null) return false; - if (getClass() != obj.getClass()) return false; - SQLSelectQueryBlock other = (SQLSelectQueryBlock) obj; - if (parenthesized ^ other.parenthesized) return false; - if (distionOption != other.distionOption) return false; - if (from == null) { - if (other.from != null) return false; - } else if (!from.equals(other.from)) return false; - if (groupBy == null) { - if (other.groupBy != null) return false; - } else if (!groupBy.equals(other.groupBy)) return false; - if (into == null) { - if (other.into != null) return false; - } else if (!into.equals(other.into)) return false; - if (selectList == null) { - if (other.selectList != null) return false; - } else if (!selectList.equals(other.selectList)) return false; - if (where == null) { - if (other.where != null) return false; - } else if (!where.equals(other.where)) return false; - return true; + public int hashCode() { + int result = distionOption; + result = 31 * result + (selectList != null ? selectList.hashCode() : 0); + result = 31 * result + (from != null ? from.hashCode() : 0); + result = 31 * result + (into != null ? into.hashCode() : 0); + result = 31 * result + (where != null ? where.hashCode() : 0); + result = 31 * result + (startWith != null ? startWith.hashCode() : 0); + result = 31 * result + (connectBy != null ? connectBy.hashCode() : 0); + result = 31 * result + (prior ? 1 : 0); + result = 31 * result + (noCycle ? 1 : 0); + result = 31 * result + (orderBySiblings != null ? orderBySiblings.hashCode() : 0); + result = 31 * result + (groupBy != null ? groupBy.hashCode() : 0); + result = 31 * result + (orderBy != null ? orderBy.hashCode() : 0); + result = 31 * result + (parenthesized ? 1 : 0); + result = 31 * result + (forUpdate ? 1 : 0); + result = 31 * result + (noWait ? 1 : 0); + result = 31 * result + (waitTime != null ? waitTime.hashCode() : 0); + result = 31 * result + (limit != null ? limit.hashCode() : 0); + result = 31 * result + (forUpdateOf != null ? forUpdateOf.hashCode() : 0); + result = 31 * result + (distributeBy != null ? distributeBy.hashCode() : 0); + result = 31 * result + (sortBy != null ? sortBy.hashCode() : 0); + result = 31 * result + (cachedSelectList != null ? cachedSelectList.hashCode() : 0); + result = 31 * result + (int) (cachedSelectListHash ^ (cachedSelectListHash >>> 32)); + result = 31 * result + (dbType != null ? dbType.hashCode() : 0); + result = 31 * result + (hints != null ? hints.hashCode() : 0); + return result; + } + + public boolean equalsForMergeJoin(SQLSelectQueryBlock that) { + if (this == that) return true; + if (that == null) return false; + + if (into != null || limit != null || groupBy != null) { + return false; + } + + if (distionOption != that.distionOption) return false; + if (prior != that.prior) return false; + if (noCycle != that.noCycle) return false; + if (parenthesized != that.parenthesized) return false; + if (forUpdate != that.forUpdate) return false; + if (noWait != that.noWait) return false; + if (cachedSelectListHash != that.cachedSelectListHash) return false; + if (selectList != null ? !selectList.equals(that.selectList) : that.selectList != null) return false; + if (from != null ? !from.equals(that.from) : that.from != null) return false; + if (into != null ? !into.equals(that.into) : that.into != null) return false; +// if (where != null ? !where.equals(that.where) : that.where != null) return false; + if (startWith != null ? !startWith.equals(that.startWith) : that.startWith != null) return false; + if (connectBy != null ? !connectBy.equals(that.connectBy) : that.connectBy != null) return false; + if (orderBySiblings != null ? !orderBySiblings.equals(that.orderBySiblings) : that.orderBySiblings != null) + return false; + if (groupBy != null ? !groupBy.equals(that.groupBy) : that.groupBy != null) return false; + if (orderBy != null ? !orderBy.equals(that.orderBy) : that.orderBy != null) return false; + if (waitTime != null ? !waitTime.equals(that.waitTime) : that.waitTime != null) return false; + if (limit != null ? !limit.equals(that.limit) : that.limit != null) return false; + if (forUpdateOf != null ? !forUpdateOf.equals(that.forUpdateOf) : that.forUpdateOf != null) return false; + if (distributeBy != null ? !distributeBy.equals(that.distributeBy) : that.distributeBy != null) return false; + if (sortBy != null ? !sortBy.equals(that.sortBy) : that.sortBy != null) return false; + if (cachedSelectList != null ? !cachedSelectList.equals(that.cachedSelectList) : that.cachedSelectList != null) + return false; + return dbType == that.dbType; } public SQLSelectQueryBlock clone() { - SQLSelectQueryBlock x = new SQLSelectQueryBlock(); + SQLSelectQueryBlock x = new SQLSelectQueryBlock(dbType); cloneTo(x); return x; } @@ -436,9 +820,21 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery } public void cloneTo(SQLSelectQueryBlock x) { - + x.parenthesized = parenthesized; x.distionOption = distionOption; + if (x.selectList.size() > 0) { + x.selectList.clear(); + } + + if (hints != null) { + for (SQLCommentHint hint : hints) { + SQLCommentHint hint1 = hint.clone(); + hint1.setParent(x); + x.getHints().add(hint1); + } + } + for (SQLSelectItem item : this.selectList) { x.addSelectItem(item.clone()); } @@ -478,6 +874,43 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery x.setOrderBy(orderBy.clone()); } + if (distributeBy != null) { + if (x.distributeBy == null) { + x.distributeBy = new ArrayList(); + } + + for (int i = 0; i < distributeBy.size(); i++) { + SQLSelectOrderByItem item = distributeBy.get(i).clone(); + item.setParent(x); + x.distributeBy.add(item); + } + } + + if (sortBy != null) { + if (x.sortBy == null) { + x.sortBy = new ArrayList(); + } + + for (int i = 0; i < sortBy.size(); i++) { + SQLSelectOrderByItem item = sortBy.get(i).clone(); + item.setParent(x); + x.sortBy.add(item); + } + } + + if (clusterBy != null) { + if (x.clusterBy == null) { + x.clusterBy = new ArrayList(); + } + + for (int i = 0; i < clusterBy.size(); i++) { + SQLSelectOrderByItem item = clusterBy.get(i).clone(); + item.setParent(x); + x.clusterBy.add(item); + } + } + + x.parenthesized = parenthesized; x.forUpdate = forUpdate; x.noWait = noWait; @@ -492,12 +925,12 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery @Override public boolean isBracket() { - return bracket; + return parenthesized; } @Override public void setBracket(boolean bracket) { - this.bracket = bracket; + this.parenthesized = bracket; } public SQLTableSource findTableSource(String alias) { @@ -518,7 +951,19 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery if (from == null) { return null; } - return from.findTableSourceWithColumn(columnHash); + + SQLTableSource tableSource = from.findTableSourceWithColumn(columnHash); + + if (tableSource == null && from instanceof SQLExprTableSource) { + SQLSelectItem selectItem = this.findSelectItem(columnHash); + if (selectItem != null + && selectItem.getExpr() instanceof SQLName + && ((SQLName) selectItem.getExpr()).nameHashCode64() == columnHash) { + tableSource = from; + } + } + + return tableSource; } @Override @@ -527,6 +972,16 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery setWhere(target); return true; } + + if (startWith == expr) { + setStartWith(target); + return true; + } + + if (connectBy == expr) { + setConnectBy(target); + return true; + } return false; } @@ -546,6 +1001,43 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery } } + if (from == null) { + return null; + } + + if (selectList.size() == 1 + && selectList.get(0).getExpr() instanceof SQLAllColumnExpr) { + SQLTableSource matchedTableSource = from.findTableSourceWithColumn(identHash); + if (matchedTableSource != null) { + return selectList.get(0); + } + } + + SQLSelectItem ownerAllItem = null; + for (SQLSelectItem item : this.selectList) { + SQLExpr itemExpr = item.getExpr(); +// if (itemExpr instanceof SQLAllColumnExpr && !(from instanceof SQLJoinTableSource)) { +// if (ownerAllItem != null) { +// return null; // dup * +// } +// ownerAllItem = item; +// continue; +// } + + if (itemExpr instanceof SQLPropertyExpr + && ((SQLPropertyExpr) itemExpr).getName().equals("*") + ) { + if (ownerAllItem != null) { + return null; // dup * + } + ownerAllItem = item; + } + } + + if (ownerAllItem != null) { + return ownerAllItem; + } + return null; } @@ -601,6 +1093,45 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery return from.findColumn(hash); } + public SQLColumnDefinition findColumn(long columnNameHash) { + SQLObject object = resolveColum(columnNameHash); + if (object instanceof SQLColumnDefinition) { + return (SQLColumnDefinition) object; + } + return null; + } + + public SQLObject resolveColum(long columnNameHash) { + final SQLSelectItem selectItem = findSelectItem(columnNameHash); + if (selectItem != null) { + SQLExpr selectItemExpr = selectItem.getExpr(); + if (selectItemExpr instanceof SQLAllColumnExpr) { + SQLObject resolveColumn = from.resolveColum(columnNameHash); + if (resolveColumn != null) { + return resolveColumn; + } + } else if (selectItemExpr instanceof SQLPropertyExpr + && ((SQLPropertyExpr) selectItemExpr).getName().equals("*")) { + SQLTableSource resolvedTableSource = ((SQLPropertyExpr) selectItemExpr).getResolvedTableSource(); + if (resolvedTableSource instanceof SQLSubqueryTableSource) { + SQLObject resolveColumn = resolvedTableSource.resolveColum(columnNameHash); + if (resolveColumn != null) { + return resolveColumn; + } + } + } + + return selectItem; + } + + if (from != null) { + return from.resolveColum(columnNameHash); + } else { + return null; + } + } + + public void addCondition(String conditionSql) { if (conditionSql == null || conditionSql.length() == 0) { return; @@ -639,7 +1170,8 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery int removedCount = 0; List items = group.getItems(); for (int i = items.size() - 1; i >= 0; i--) { - if (items.get(i).equals(condition)) { + SQLExpr item = items.get(i); + if (item.equals(condition)) { items.remove(i); removedCount++; } @@ -702,6 +1234,14 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery return cachedSelectListHash; } + public String getDbType() { + return dbType; + } + + public void setDbType(String dbType) { + this.dbType = dbType; + } + public List getHintsDirect() { return hints; } @@ -725,25 +1265,117 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery return hints.size(); } - public String getDbType() { - return dbType; - } - - public void setDbType(String dbType) { - this.dbType = dbType; - } - - public List getWindows() { - return windows; - } - - public void addWindow(SQLWindow x) { - if (x != null) { - x.setParent(this); + public boolean replaceInParent(SQLSelectQuery x) { + if (parent instanceof SQLSelect) { + ((SQLSelect) parent).setQuery(x); + return true; } - if (windows == null) { - windows = new ArrayList(4); + + if (parent instanceof SQLUnionQuery) { + SQLUnionQuery union = (SQLUnionQuery) parent; + return union.replace(this, x); } - this.windows.add(x); + + return false; + } + + public List getClusterBy() { + if (clusterBy == null) { + clusterBy = new ArrayList(); + } + + return clusterBy; + } + + public List getClusterByDirect() { + return clusterBy; + } + + public void addClusterBy(SQLSelectOrderByItem item) { + if (clusterBy == null) { + clusterBy = new ArrayList(); + } + if (item != null) { + item.setParent(this); + } + this.clusterBy.add(item); + } + + public List computeSelecteListAlias() { + List aliasList = new ArrayList(); + + for (SQLSelectItem item : this.selectList) { + if (item instanceof OdpsUDTFSQLSelectItem) { + aliasList.addAll(((OdpsUDTFSQLSelectItem) item).getAliasList()); + } else { + SQLExpr expr = item.getExpr(); + if (expr instanceof SQLAllColumnExpr) { + // TODO + } else if (expr instanceof SQLPropertyExpr && ((SQLPropertyExpr) expr).getName().equals("*")) { + // TODO + } else { + aliasList.add(item.computeAlias()); + } + } + } + + return aliasList; + } + + public List getMappJoinTableSources() { + if (hints == null) { + return Collections.emptyList(); + } + + List tableSources = null; + for (SQLCommentHint hint : hints) { + String text = hint.getText(); + if (text.startsWith("+")) { + SQLExpr hintExpr = SQLUtils.toSQLExpr(text.substring(1), dbType); + if (hintExpr instanceof SQLMethodInvokeExpr) { + SQLMethodInvokeExpr func = (SQLMethodInvokeExpr) hintExpr; + if (func.methodNameHashCode64() == FnvHash.Constants.MAPJOIN) { + for (SQLExpr arg : func.getArguments()) { + SQLIdentifierExpr tablename = (SQLIdentifierExpr) arg; + SQLTableSource tableSource = findTableSource(tablename.getName()); + if (tableSources == null) { + tableSources = new ArrayList(2); + } + tableSources.add(tableSource); + } + } + } + } + } + + if (tableSources == null) { + return Collections.emptyList(); + } + + return tableSources; + } + + public boolean clearMapJoinHint() { + if (hints == null) { + return false; + } + + int removeCount = 0; + for (int i = hints.size() - 1; i >= 0; i--) { + SQLCommentHint hint = hints.get(i); + String text = hint.getText(); + if (text.startsWith("+")) { + SQLExpr hintExpr = SQLUtils.toSQLExpr(text.substring(1), dbType); + if (hintExpr instanceof SQLMethodInvokeExpr) { + SQLMethodInvokeExpr func = (SQLMethodInvokeExpr) hintExpr; + if (func.methodNameHashCode64() == FnvHash.Constants.MAPJOIN) { + hints.remove(i); + removeCount++; + } + } + } + } + + return removeCount > 0; } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSubqueryTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSubqueryTableSource.java index 54fd995698..c21133e9a0 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSubqueryTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSubqueryTableSource.java @@ -15,11 +15,16 @@ */ package com.alibaba.druid.sql.ast.statement; +import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.visitor.SQLASTVisitor; +import java.util.ArrayList; +import java.util.List; + public class SQLSubqueryTableSource extends SQLTableSourceImpl { protected SQLSelect select; + protected List columns = new ArrayList(); public SQLSubqueryTableSource(){ @@ -57,6 +62,7 @@ public class SQLSubqueryTableSource extends SQLTableSourceImpl { protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { acceptChild(visitor, select); + acceptChild(visitor, columns); } visitor.endVisit(this); } @@ -73,6 +79,12 @@ public class SQLSubqueryTableSource extends SQLTableSourceImpl { if (select != null) { x.select = select.clone(); } + + for (SQLName column : columns) { + SQLName c2 = column.clone(); + c2.setParent(x); + x.columns.add(c2); + } } public SQLSubqueryTableSource clone() { @@ -114,4 +126,28 @@ public class SQLSubqueryTableSource extends SQLTableSourceImpl { return null; } + + public List getColumns() { + return columns; + } + + public void addColumn(SQLName column) { + column.setParent(this); + this.columns.add(column); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + SQLSubqueryTableSource that = (SQLSubqueryTableSource) o; + + return select != null ? select.equals(that.select) : that.select == null; + } + + @Override + public int hashCode() { + return select != null ? select.hashCode() : 0; + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSource.java index 40c72bc4ec..223747d311 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSource.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSource.java @@ -38,6 +38,8 @@ public interface SQLTableSource extends SQLObject { SQLExpr getFlashback(); void setFlashback(SQLExpr flashback); + SQLObject resolveColum(long columnNameHash); + SQLColumnDefinition findColumn(String columnName); SQLColumnDefinition findColumn(long columnNameHash); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSourceImpl.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSourceImpl.java index 03ba257b41..c4091e35b2 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSourceImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableSourceImpl.java @@ -21,6 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLHint; +import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.util.FnvHash; @@ -139,4 +140,8 @@ public abstract class SQLTableSourceImpl extends SQLObjectImpl implements SQLTab } return null; } + + public SQLObject resolveColum(long columnNameHash) { + return findColumn(columnNameHash); + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQuery.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQuery.java index 78964ee7c7..e114eb5b26 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQuery.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 Alibaba Group Holding Ltd. + * Copyright 1999-2017 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,19 +15,20 @@ */ package com.alibaba.druid.sql.ast.statement; -import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLDbTypedObject; import com.alibaba.druid.sql.ast.SQLLimit; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.ast.SQLOrderBy; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class SQLUnionQuery extends SQLObjectImpl implements SQLSelectQuery { +import java.util.ArrayList; +import java.util.List; + +public class SQLUnionQuery extends SQLObjectImpl implements SQLSelectQuery, SQLDbTypedObject { private boolean bracket = false; - private SQLSelectQuery left; - private SQLSelectQuery right; + private List relations = new ArrayList(); private SQLUnionOperator operator = SQLUnionOperator.UNION; private SQLOrderBy orderBy; @@ -52,26 +53,67 @@ public class SQLUnionQuery extends SQLObjectImpl implements SQLSelectQuery { this.setRight(right); } + + public List getRelations() { + return relations; + } + + public void addRelation(SQLSelectQuery relation) { + if (relation != null) { + relation.setParent(this); + } + + relations.add(relation); + } + public SQLSelectQuery getLeft() { - return left; + if (relations.size() == 0) { + return null; + } + return relations.get(0); } public void setLeft(SQLSelectQuery left) { if (left != null) { left.setParent(this); } - this.left = left; + + if (relations.size() == 0) { + relations.add(left); + } else if (relations.size() <= 2) { + relations.set(0, left); + } else { + throw new UnsupportedOperationException("multi-union"); + } } public SQLSelectQuery getRight() { - return right; + if (relations.size() < 2) { + return null; + } + if (relations.size() == 2) { + return relations.get(1); + } + + throw new UnsupportedOperationException("multi-union"); } public void setRight(SQLSelectQuery right) { if (right != null) { right.setParent(this); } - this.right = right; + + if (relations.size() == 0) { + relations.add(null); + } + + if (relations.size() == 1) { + relations.add(right); + } else if (relations.size() == 2) { + relations.set(1, right); + } else { + throw new UnsupportedOperationException("multi-union"); + } } public SQLOrderBy getOrderBy() { @@ -88,10 +130,17 @@ public class SQLUnionQuery extends SQLObjectImpl implements SQLSelectQuery { @Override protected void accept0(SQLASTVisitor visitor) { if (visitor.visit(this)) { - acceptChild(visitor, left); - acceptChild(visitor, right); - acceptChild(visitor, orderBy); - acceptChild(visitor, limit); + for (SQLSelectQuery relation : relations) { + relation.accept(visitor); + } + + if (orderBy != null) { + orderBy.accept(visitor); + } + + if (limit != null) { + limit.accept(visitor); + } } visitor.endVisit(this); } @@ -120,12 +169,13 @@ public class SQLUnionQuery extends SQLObjectImpl implements SQLSelectQuery { SQLUnionQuery x = new SQLUnionQuery(); x.bracket = bracket; - if (left != null) { - x.setLeft(left.clone()); - } - if (right != null) { - x.setRight(right.clone()); + + for (SQLSelectQuery relation : relations) { + SQLSelectQuery r = relation.clone(); + r.setParent(x); + x.relations.add(r); } + x.operator = operator; if (orderBy != null) { @@ -142,6 +192,8 @@ public class SQLUnionQuery extends SQLObjectImpl implements SQLSelectQuery { } public SQLSelectQueryBlock getFirstQueryBlock() { + SQLSelectQuery left = getLeft(); + if (left instanceof SQLSelectQueryBlock) { return (SQLSelectQueryBlock) left; } @@ -161,8 +213,44 @@ public class SQLUnionQuery extends SQLObjectImpl implements SQLSelectQuery { this.dbType = dbType; } - public void output(StringBuffer buf) { - SQLASTOutputVisitor visitor = SQLUtils.createOutputVisitor(buf, dbType); - this.accept(visitor); + public boolean replace(SQLSelectQuery cmp, SQLSelectQuery target) { + for (int i = 0; i < relations.size(); i++) { + SQLSelectQuery r = relations.get(i); + if (r == cmp) { + if (cmp != null) { + cmp.setParent(this); + } + relations.set(i, cmp); + return true; + } + } + + return false; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + SQLUnionQuery that = (SQLUnionQuery) o; + + if (bracket != that.bracket) return false; + if (relations != null ? !relations.equals(that.relations) : that.relations != null) return false; + if (operator != that.operator) return false; + if (orderBy != null ? !orderBy.equals(that.orderBy) : that.orderBy != null) return false; + if (limit != null ? !limit.equals(that.limit) : that.limit != null) return false; + return dbType == that.dbType; + } + + @Override + public int hashCode() { + int result = (bracket ? 1 : 0); + result = 31 * result + (relations != null ? relations.hashCode() : 0); + result = 31 * result + (operator != null ? operator.hashCode() : 0); + result = 31 * result + (orderBy != null ? orderBy.hashCode() : 0); + result = 31 * result + (limit != null ? limit.hashCode() : 0); + result = 31 * result + (dbType != null ? dbType.hashCode() : 0); + return result; } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java index e49b422ee1..f3e4354e20 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsSelectQueryBlock.java @@ -35,7 +35,7 @@ public class OdpsSelectQueryBlock extends SQLSelectQueryBlock { public OdpsSelectQueryBlock(){ dbType = JdbcConstants.ODPS; - distributeBy = new ArrayList(); + distributeBy = new ArrayList(); sortBy = new ArrayList(2); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java index aab2bccee0..f5fa6864b4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsSelectParser.java @@ -17,6 +17,7 @@ package com.alibaba.druid.sql.dialect.odps.parser; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLLimit; +import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLOrderingSpecification; import com.alibaba.druid.sql.ast.SQLSetQuantifier; import com.alibaba.druid.sql.ast.expr.SQLListExpr; @@ -29,6 +30,7 @@ import com.alibaba.druid.sql.parser.SQLExprParser; import com.alibaba.druid.sql.parser.SQLSelectListCache; import com.alibaba.druid.sql.parser.SQLSelectParser; import com.alibaba.druid.sql.parser.Token; +import com.alibaba.druid.util.FnvHash; public class OdpsSelectParser extends SQLSelectParser { public OdpsSelectParser(SQLExprParser exprParser){ @@ -43,24 +45,24 @@ public class OdpsSelectParser extends SQLSelectParser { } @Override - public SQLSelectQuery query() { + public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { if (lexer.token() == Token.LPAREN) { lexer.nextToken(); SQLSelectQuery select = query(); accept(Token.RPAREN); - return queryRest(select); + return queryRest(select, acceptUnion); } OdpsSelectQueryBlock queryBlock = new OdpsSelectQueryBlock(); - + if (lexer.hasComment() && lexer.isKeepComments()) { queryBlock.addBeforeComment(lexer.readAndResetComments()); } - + accept(Token.SELECT); - + if (lexer.token() == Token.HINT) { this.exprParser.parseHints(queryBlock.getHints()); } @@ -89,36 +91,51 @@ public class OdpsSelectParser extends SQLSelectParser { parseGroupBy(queryBlock); queryBlock.setOrderBy(this.exprParser.parseOrderBy()); - + if (lexer.token() == Token.DISTRIBUTE) { lexer.nextToken(); accept(Token.BY); - this.exprParser.exprList(queryBlock.getDistributeBy(), queryBlock); - if (lexer.identifierEquals("SORT")) { - lexer.nextToken(); - accept(Token.BY); - - for (;;) { - SQLExpr expr = this.expr(); - - SQLSelectOrderByItem sortByItem = new SQLSelectOrderByItem(expr); - - if (lexer.token() == Token.ASC) { - sortByItem.setType(SQLOrderingSpecification.ASC); - lexer.nextToken(); - } else if (lexer.token() == Token.DESC) { - sortByItem.setType(SQLOrderingSpecification.DESC); - lexer.nextToken(); - } - - queryBlock.getSortBy().add(sortByItem); - - if (lexer.token() == Token.COMMA) { - lexer.nextToken(); - } else { - break; - } + for (;;) { + SQLSelectOrderByItem distributeByItem = this.exprParser.parseSelectOrderByItem(); + queryBlock.addDistributeBy(distributeByItem); + + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + } else { + break; + } + } + } + + if (lexer.identifierEquals(FnvHash.Constants.SORT)) { + lexer.nextToken(); + accept(Token.BY); + + for (;;) { + SQLSelectOrderByItem sortByItem = this.exprParser.parseSelectOrderByItem(); + queryBlock.addSortBy(sortByItem); + + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + } else { + break; + } + } + } + + if (lexer.identifierEquals(FnvHash.Constants.CLUSTER)) { + lexer.nextToken(); + accept(Token.BY); + + for (;;) { + SQLSelectOrderByItem clusterByItem = this.exprParser.parseSelectOrderByItem(); + queryBlock.addClusterBy(clusterByItem); + + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + } else { + break; } } } @@ -128,7 +145,7 @@ public class OdpsSelectParser extends SQLSelectParser { queryBlock.setLimit(new SQLLimit(this.expr())); } - return queryRest(queryBlock); + return queryRest(queryBlock, acceptUnion); } public SQLTableSource parseTableSource() { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSelectParser.java index 1291f0e1ee..9225c8e7e5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSelectParser.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 Alibaba Group Holding Ltd. + * Copyright 1999-2017 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,12 +15,7 @@ */ package com.alibaba.druid.sql.dialect.postgresql.parser; -import java.util.List; - -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLLimit; -import com.alibaba.druid.sql.ast.SQLParameter; -import com.alibaba.druid.sql.ast.SQLSetQuantifier; +import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.ast.statement.SQLSelectQuery; @@ -29,12 +24,9 @@ import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGFunctionTableSource; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.IntoOption; -import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGValuesQuery; -import com.alibaba.druid.sql.parser.ParserException; -import com.alibaba.druid.sql.parser.SQLExprParser; -import com.alibaba.druid.sql.parser.SQLSelectListCache; -import com.alibaba.druid.sql.parser.SQLSelectParser; -import com.alibaba.druid.sql.parser.Token; +import com.alibaba.druid.sql.parser.*; + +import java.util.List; public class PGSelectParser extends SQLSelectParser { @@ -55,14 +47,9 @@ public class PGSelectParser extends SQLSelectParser { } @Override - public SQLSelectQuery query() { + public SQLSelectQuery query(SQLObject parent, boolean acceptUnion) { if (lexer.token() == Token.VALUES) { - lexer.nextToken(); - accept(Token.LPAREN); - PGValuesQuery valuesQuery = new PGValuesQuery(); - this.exprParser.exprList(valuesQuery.getValues(), valuesQuery); - accept(Token.RPAREN); - return queryRest(valuesQuery); + return valuesQuery(acceptUnion); } if (lexer.token() == Token.LPAREN) { @@ -74,11 +61,15 @@ public class PGSelectParser extends SQLSelectParser { } accept(Token.RPAREN); - return queryRest(select); + return queryRest(select, acceptUnion); } PGSelectQueryBlock queryBlock = new PGSelectQueryBlock(); + if (lexer.hasComment() && lexer.isKeepComments()) { + queryBlock.addBeforeComment(lexer.readAndResetComments()); + } + if (lexer.token() == Token.SELECT) { lexer.nextToken(); @@ -244,7 +235,7 @@ public class PGSelectParser extends SQLSelectParser { queryBlock.setForClause(forClause); } - return queryRest(queryBlock); + return queryRest(queryBlock, acceptUnion); } protected SQLTableSource parseTableSourceRest(SQLTableSource tableSource) { @@ -264,7 +255,7 @@ public class PGSelectParser extends SQLSelectParser { if (alias != null) { functionTableSource.setAlias(alias); } - + lexer.nextToken(); parserParameters(functionTableSource.getParameters()); accept(Token.RPAREN); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java index 7f3ce12afb..f216e54dd4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java @@ -30,6 +30,7 @@ import com.alibaba.druid.sql.ast.SQLParameter; import com.alibaba.druid.sql.ast.SQLPartitionBy; import com.alibaba.druid.sql.ast.SQLSetQuantifier; import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.SQLWindow; import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr; import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr; import com.alibaba.druid.sql.ast.expr.SQLBinaryExpr; @@ -247,8 +248,16 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor return false; } - public boolean visit(PGSelectQueryBlock x) { + if ((!isParameterized()) && isPrettyFormat() && x.hasBeforeComment()) { + printlnComments(x.getBeforeCommentsDirect()); + } + + final boolean bracket = x.isBracket(); + if (bracket) { + print('('); + } + print0(ucase ? "SELECT " : "select "); if (SQLSetQuantifier.ALL == x.getDistionOption()) { @@ -258,7 +267,9 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor if (x.getDistinctOn() != null && x.getDistinctOn().size() > 0) { print0(ucase ? "ON " : "on "); + print0("("); printAndAccept(x.getDistinctOn(), ", "); + print0(") "); } } @@ -281,10 +292,16 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor x.getFrom().accept(this); } - if (x.getWhere() != null) { + SQLExpr where = x.getWhere(); + if (where != null) { println(); print0(ucase ? "WHERE " : "where "); - x.getWhere().accept(this); + where.accept(this); + + if (where.hasAfterComment() && isPrettyFormat()) { + print(' '); + printlnComment(x.getWhere().getAfterCommentsDirect()); + } } if (x.getGroupBy() != null) { @@ -292,9 +309,16 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor x.getGroupBy().accept(this); } - if (x.getWindow() != null) { +// if (x.getWindow() != null) { +// println(); +// x.getWindow().accept(this); +// } + + final List windows = x.getWindows(); + if (windows != null && windows.size() > 0) { println(); - x.getWindow().accept(this); + print0(ucase ? "WINDOW " : "window "); + printAndAccept(windows, ", "); } if (x.getOrderBy() != null) { @@ -317,6 +341,10 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor x.getForClause().accept(this); } + if (bracket) { + print(')'); + } + return false; } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index e7a4809d48..9ac5b59d49 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -25,6 +25,7 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.ast.SQLDataTypeImpl; +import com.alibaba.druid.sql.ast.SQLDataTypeRefExpr; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLLimit; import com.alibaba.druid.sql.ast.SQLName; @@ -120,6 +121,8 @@ public class SQLExprParser extends SQLParser { protected long[] aggregateFunctionHashCodes = AGGREGATE_FUNCTIONS_CODES; + protected boolean allowIdentifierMethod = true; + public SQLExprParser(String sql){ super(sql); } @@ -402,6 +405,12 @@ public class SQLExprParser extends SQLParser { } else if (JdbcConstants.MYSQL.equalsIgnoreCase(dbType) && ident.startsWith("0x") && (ident.length() % 2) == 0) { sqlExpr = new SQLHexExpr(ident.substring(2)); } else { + if (ident.charAt(0) == '`') { + if (lexer.isEnabled(SQLParserFeature.IgnoreNameQuotes)) { + ident = ident.substring(1, ident.length() - 1); + } + hash_lower = FnvHash.hashCode64(ident); + } sqlExpr = new SQLIdentifierExpr(ident, hash_lower); } break; @@ -1058,6 +1067,10 @@ public class SQLExprParser extends SQLParser { if (lexer.token == Token.DISTINCT) { lexer.nextToken(); distinct = true; + + if (lexer.token == Token.RPAREN || lexer.token == Token.COMMA) { + throw new ParserException(lexer.info()); + } } String methodName = null; @@ -1072,43 +1085,87 @@ public class SQLExprParser extends SQLParser { methodName = identifierExpr.getName(); hash_lower = identifierExpr.nameHashCode64(); - if (hash_lower == FnvHash.Constants.TRIM) { - if (lexer.identifierEquals(FnvHash.Constants.LEADING)) { - trimOption = lexer.stringVal(); - lexer.nextToken(); - } else if (lexer.identifierEquals(FnvHash.Constants.BOTH)) { - trimOption = lexer.stringVal(); - lexer.nextToken(); - } else if (lexer.identifierEquals(FnvHash.Constants.TRAILING)) { - trimOption = lexer.stringVal(); - lexer.nextToken(); + if (allowIdentifierMethod) { + if (hash_lower == FnvHash.Constants.TRIM) { + if (lexer.identifierEquals(FnvHash.Constants.LEADING)) { + trimOption = lexer.stringVal(); + lexer.nextToken(); + } else if (lexer.identifierEquals(FnvHash.Constants.BOTH)) { + trimOption = lexer.stringVal(); + lexer.nextToken(); + } else if (lexer.identifierEquals(FnvHash.Constants.TRAILING)) { + trimOption = lexer.stringVal(); + lexer.nextToken(); + } + } else if (hash_lower == FnvHash.Constants.MATCH + && (JdbcConstants.MYSQL.equals(dbType) || JdbcConstants.ALIYUN_ADS.equals(dbType))) { + return parseMatch(); + } else if (hash_lower == FnvHash.Constants.EXTRACT + && JdbcConstants.MYSQL.equals(dbType)) { + return parseExtract(); + } else if (hash_lower == FnvHash.Constants.POSITION + && JdbcConstants.MYSQL.equals(dbType)) { + return parsePosition(); + }else if (hash_lower == FnvHash.Constants.INT4 && JdbcConstants.POSTGRESQL.equals(dbType)) { + PGTypeCastExpr castExpr = new PGTypeCastExpr(); + castExpr.setExpr(this.expr()); + castExpr.setDataType(new SQLDataTypeImpl(methodName)); + accept(Token.RPAREN); + return castExpr; + } else if (hash_lower == FnvHash.Constants.VARBIT && JdbcConstants.POSTGRESQL.equals(dbType)) { + PGTypeCastExpr castExpr = new PGTypeCastExpr(); + SQLExpr len = this.primary(); + castExpr.setDataType(new SQLDataTypeImpl(methodName, len)); + accept(Token.RPAREN); + castExpr.setExpr(this.expr()); + return castExpr; + } else if (hash_lower == FnvHash.Constants.CONVERT && JdbcConstants.MYSQL.equals(dbType)) { + methodInvokeExpr = new SQLMethodInvokeExpr(methodName, hash_lower); + SQLExpr arg0 = this.expr(); + // Fix for using. + Object exprUsing = arg0.getAttributes().get("USING"); + if (exprUsing instanceof String) { + String charset = (String) exprUsing; + methodInvokeExpr.setUsing(new SQLIdentifierExpr(charset)); + arg0.getAttributes().remove("USING"); + } + methodInvokeExpr.addArgument(arg0); + + if (lexer.token == Token.COMMA) { + lexer.nextToken(); + SQLDataType dataType = this.parseDataType(); + SQLDataTypeRefExpr dataTypeRefExpr = new SQLDataTypeRefExpr(dataType); + methodInvokeExpr.addArgument(dataTypeRefExpr); + } + + if (lexer.token == Token.USING || lexer.identifierEquals(FnvHash.Constants.USING)) { + lexer.nextToken(); + SQLExpr using; + if (lexer.token == Token.STAR) { + lexer.nextToken(); + using = new SQLAllColumnExpr(); + } else if (lexer.token == Token.BINARY) { + using = new SQLIdentifierExpr(lexer.stringVal()); + lexer.nextToken(); + } else { + using = this.primary(); + } + methodInvokeExpr.setUsing(using); + } + + accept(Token.RPAREN); + + return primaryRest(methodInvokeExpr); } - } else if (hash_lower == FnvHash.Constants.MATCH - && JdbcConstants.MYSQL.equals(dbType)) { - return parseMatch(); - } else if (hash_lower == FnvHash.Constants.EXTRACT - && JdbcConstants.MYSQL.equals(dbType)) { - return parseExtract(); - } else if (hash_lower == FnvHash.Constants.POSITION - && JdbcConstants.MYSQL.equals(dbType)) { - return parsePosition(); - } else if (hash_lower == FnvHash.Constants.INT4 && JdbcConstants.POSTGRESQL.equals(dbType)) { - PGTypeCastExpr castExpr = new PGTypeCastExpr(); - castExpr.setExpr(this.expr()); - castExpr.setDataType(new SQLDataTypeImpl(methodName)); - accept(Token.RPAREN); - return castExpr; - } else if (hash_lower == FnvHash.Constants.VARBIT && JdbcConstants.POSTGRESQL.equals(dbType)) { - PGTypeCastExpr castExpr = new PGTypeCastExpr(); - SQLExpr len = this.primary(); - castExpr.setDataType(new SQLDataTypeImpl(methodName, len)); - accept(Token.RPAREN); - castExpr.setExpr(this.expr()); - return castExpr; } - aggMethodName = getAggreateFunction(hash_lower); + + if (distinct) { + aggMethodName = methodName; + } else { + aggMethodName = getAggreateFunction(hash_lower); + } } else if (expr instanceof SQLPropertyExpr) { - methodName = expr.toString(); + methodName = ((SQLPropertyExpr) expr).getSimpleName(); aggMethodName = SQLUtils.normalize(methodName); hash_lower = FnvHash.fnv1a_64_lower(aggMethodName); aggMethodName = getAggreateFunction(hash_lower); @@ -1118,10 +1175,13 @@ public class SQLExprParser extends SQLParser { methodName = "DEFAULT"; } else if (expr instanceof SQLCharExpr) { methodName = ((SQLCharExpr) expr).getText(); + if (isAggreateFunction(methodName)) { + aggMethodName = methodName; + } } if (aggMethodName != null) { - SQLAggregateExpr aggregateExpr = parseAggregateExpr(aggMethodName); + SQLAggregateExpr aggregateExpr = parseAggregateExpr(methodName); if (distinct) { aggregateExpr.setOption(SQLAggregateOption.DISTINCT); } @@ -1140,12 +1200,12 @@ public class SQLExprParser extends SQLParser { Token token = lexer.token; if (token != Token.RPAREN && token != Token.FROM) { - exprList(methodInvokeExpr.getParameters(), methodInvokeExpr); + exprList(methodInvokeExpr.getArguments(), methodInvokeExpr); } if (hash_lower == FnvHash.Constants.EXIST - && methodInvokeExpr.getParameters().size() == 1 - && methodInvokeExpr.getParameters().get(0) instanceof SQLQueryExpr) { + && methodInvokeExpr.getArguments().size() == 1 + && methodInvokeExpr.getArguments().get(0) instanceof SQLQueryExpr) { throw new ParserException("exists syntax error."); } @@ -1176,13 +1236,42 @@ public class SQLExprParser extends SQLParser { methodInvokeExpr.setUsing(using); } + // mysql + if (hash_lower == FnvHash.Constants.WEIGHT_STRING) { + if (lexer.token == Token.AS) { + lexer.nextToken(); + SQLDataType as = this.parseDataType(); + methodInvokeExpr.putAttribute("as", as); + } + + if (lexer.identifierEquals(FnvHash.Constants.LEVEL)) { + lexer.nextToken(); + List levels = new ArrayList(); + for (;;) { + SQLSelectOrderByItem level = this.parseSelectOrderByItem(); + levels.add(level); + if (lexer.token == Token.COMMA) { + lexer.nextToken(); + continue; + } + break; + } + methodInvokeExpr.putAttribute("levels", levels); + } + + if (lexer.identifierEquals(FnvHash.Constants.REVERSE)) { + lexer.nextToken(); + methodInvokeExpr.putAttribute("reverse", true); + } + } + SQLAggregateExpr aggregateExpr = null; if (lexer.token == Token.ORDER) { lexer.nextToken(); accept(Token.BY); aggregateExpr = new SQLAggregateExpr(methodName); - aggregateExpr.getArguments().addAll(methodInvokeExpr.getParameters()); + aggregateExpr.getArguments().addAll(methodInvokeExpr.getArguments()); SQLOrderBy orderBy = new SQLOrderBy(); this.orderBy(orderBy.getItems(), orderBy); @@ -1191,10 +1280,28 @@ public class SQLExprParser extends SQLParser { accept(Token.RPAREN); + + if (lexer.identifierEquals(FnvHash.Constants.FILTER)) { + if (aggregateExpr == null) { + Lexer.SavePoint mark = lexer.mark(); + lexer.nextToken(); + Token nextToken = lexer.token; + lexer.reset(mark); + + if (nextToken == Token.LPAREN) { + aggregateExpr = new SQLAggregateExpr(methodName); + aggregateExpr.getArguments().addAll(methodInvokeExpr.getArguments()); + filter(aggregateExpr); + } + } else { + filter(aggregateExpr); + } + } + if (lexer.token == Token.OVER) { if (aggregateExpr == null) { aggregateExpr = new SQLAggregateExpr(methodName); - aggregateExpr.getArguments().addAll(methodInvokeExpr.getParameters()); + aggregateExpr.getArguments().addAll(methodInvokeExpr.getArguments()); } over(aggregateExpr); } @@ -1203,6 +1310,10 @@ public class SQLExprParser extends SQLParser { return primaryRest(aggregateExpr); } + if (lexer.token == Token.LPAREN) { + return methodInvokeExpr; + } + return primaryRest(methodInvokeExpr); //throw new ParserException("not support token:" + lexer.token + ", " + lexer.info()); diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java index bc72d371cc..628f8fd382 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java @@ -25,6 +25,8 @@ public enum SQLParserFeature { KeepComments, SkipComments, StrictForWall, + EnableMultiUnion, + IgnoreNameQuotes, PipesAsConcat, // for mysql ; diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java index 7d667eb7f0..9821be97e3 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2018 Alibaba Group Holding Ltd. + * Copyright 1999-2017 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,45 +15,18 @@ */ package com.alibaba.druid.sql.parser; -import java.util.List; - -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLLimit; -import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObject; -import com.alibaba.druid.sql.ast.SQLOrderBy; -import com.alibaba.druid.sql.ast.SQLOrderingSpecification; -import com.alibaba.druid.sql.ast.SQLOver; -import com.alibaba.druid.sql.ast.SQLSetQuantifier; -import com.alibaba.druid.sql.ast.SQLWindow; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; -import com.alibaba.druid.sql.ast.expr.SQLDateExpr; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.expr.SQLListExpr; -import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; -import com.alibaba.druid.sql.ast.expr.SQLRealExpr; -import com.alibaba.druid.sql.ast.expr.SQLTimestampExpr; -import com.alibaba.druid.sql.ast.statement.SQLExprHint; -import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; -import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource; -import com.alibaba.druid.sql.ast.statement.SQLLateralViewTableSource; -import com.alibaba.druid.sql.ast.statement.SQLSelect; -import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause; -import com.alibaba.druid.sql.ast.statement.SQLSelectItem; -import com.alibaba.druid.sql.ast.statement.SQLSelectQuery; -import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; -import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource; -import com.alibaba.druid.sql.ast.statement.SQLTableSource; -import com.alibaba.druid.sql.ast.statement.SQLUnionOperator; -import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; -import com.alibaba.druid.sql.ast.statement.SQLUnionQueryTableSource; -import com.alibaba.druid.sql.ast.statement.SQLValuesTableSource; -import com.alibaba.druid.sql.ast.statement.SQLWithSubqueryClause; +import com.alibaba.druid.sql.ast.*; +import com.alibaba.druid.sql.ast.expr.*; +import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock; +import com.alibaba.druid.sql.dialect.hive.parser.HiveCreateTableParser; +import com.alibaba.druid.sql.dialect.hive.stmt.HiveCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlOrderingExpr; import com.alibaba.druid.util.FnvHash; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.druid.util.StringUtils; + +import java.util.List; public class SQLSelectParser extends SQLParser { protected SQLExprParser exprParser; @@ -85,7 +58,7 @@ public class SQLSelectParser extends SQLParser { select.setWithSubQuery(with); } - SQLSelectQuery query = query(); + SQLSelectQuery query = query(select); select.setQuery(query); SQLOrderBy orderBy = this.parseOrderBy(); @@ -95,8 +68,16 @@ public class SQLSelectParser extends SQLParser { if (queryBlock.getOrderBy() == null) { queryBlock.setOrderBy(orderBy); + if (lexer.token == Token.LIMIT) { + SQLLimit limit = this.exprParser.parseLimit(); + queryBlock.setLimit(limit); + } } else { select.setOrderBy(orderBy); + if (lexer.token == Token.LIMIT) { + SQLLimit limit = this.exprParser.parseLimit(); + select.setLimit(limit); + } } if (orderBy != null) { @@ -106,6 +87,11 @@ public class SQLSelectParser extends SQLParser { select.setOrderBy(orderBy); } + if (lexer.token == Token.LIMIT) { + SQLLimit limit = this.exprParser.parseLimit(); + select.setLimit(limit); + } + while (lexer.token == Token.HINT) { this.exprParser.parseHints(select.getHints()); } @@ -115,7 +101,7 @@ public class SQLSelectParser extends SQLParser { protected SQLUnionQuery createSQLUnionQuery() { SQLUnionQuery union = new SQLUnionQuery(); - union.setDbType(getDbType()); + union.setDbType(dbType); return union; } @@ -125,6 +111,11 @@ public class SQLSelectParser extends SQLParser { union.setOrderBy(orderBy); return unionRest(union); } + + if (lexer.token == Token.LIMIT) { + SQLLimit limit = this.exprParser.parseLimit(); + union.setLimit(limit); + } return union; } @@ -142,12 +133,10 @@ public class SQLSelectParser extends SQLParser { lexer.nextToken(); SQLUnionQuery union = createSQLUnionQuery(); - if (union.getLeft() == null) { + if (union.getRelations().isEmpty()) { union.setLeft(selectQuery); } - boolean paren = lexer.token == Token.LPAREN; - if (lexer.token == Token.ALL) { union.setOperator(SQLUnionOperator.UNION_ALL); lexer.nextToken(); @@ -155,24 +144,71 @@ public class SQLSelectParser extends SQLParser { union.setOperator(SQLUnionOperator.DISTINCT); lexer.nextToken(); } + + boolean paren = lexer.token == Token.LPAREN; SQLSelectQuery right = this.query(paren ? null : union, false); union.setRight(right); + while (lexer.isEnabled(SQLParserFeature.EnableMultiUnion) + && lexer.token == Token.UNION + ) { + Lexer.SavePoint mark = lexer.mark(); + lexer.nextToken(); + + if (lexer.token == Token.ALL) { + if (union.getOperator() == SQLUnionOperator.UNION_ALL) { + lexer.nextToken(); + } else { + lexer.reset(mark); + break; + } + } else if (lexer.token == Token.DISTINCT) { + if (union.getOperator() == SQLUnionOperator.DISTINCT) { + lexer.nextToken(); + } else { + lexer.reset(mark); + break; + } + } else if (union.getOperator() == SQLUnionOperator.UNION) { + // skip + } else { + lexer.reset(mark); + break; + } + + paren = lexer.token == Token.LPAREN; + SQLSelectQuery r = this.query(paren ? null : union, false); + union.addRelation(r); + right = r; + } + if (!paren) { if (right instanceof SQLSelectQueryBlock) { SQLSelectQueryBlock rightQuery = (SQLSelectQueryBlock) right; SQLOrderBy orderBy = rightQuery.getOrderBy(); - SQLLimit limit = rightQuery.getLimit(); - if (orderBy != null && limit == null) { + if (orderBy != null) { union.setOrderBy(orderBy); rightQuery.setOrderBy(null); } + + SQLLimit limit = rightQuery.getLimit(); + if (limit != null) { + union.setLimit(limit); + rightQuery.setLimit(null); + } } else if (right instanceof SQLUnionQuery) { SQLUnionQuery rightUnion = (SQLUnionQuery) right; - if (rightUnion.getOrderBy() != null) { - union.setOrderBy(rightUnion.getOrderBy()); + final SQLOrderBy orderBy = rightUnion.getOrderBy(); + if (orderBy != null) { + union.setOrderBy(orderBy); rightUnion.setOrderBy(null); } + + SQLLimit limit = rightUnion.getLimit(); + if (limit != null) { + union.setLimit(limit); + rightUnion.setLimit(null); + } } } @@ -195,9 +231,41 @@ public class SQLSelectParser extends SQLParser { union.setOperator(SQLUnionOperator.EXCEPT); + boolean paren = lexer.token == Token.LPAREN; + SQLSelectQuery right = this.query(union, false); union.setRight(right); + if (!paren) { + if (right instanceof SQLSelectQueryBlock) { + SQLSelectQueryBlock rightQuery = (SQLSelectQueryBlock) right; + SQLOrderBy orderBy = rightQuery.getOrderBy(); + if (orderBy != null) { + union.setOrderBy(orderBy); + rightQuery.setOrderBy(null); + } + + SQLLimit limit = rightQuery.getLimit(); + if (limit != null) { + union.setLimit(limit); + rightQuery.setLimit(null); + } + } else if (right instanceof SQLUnionQuery) { + SQLUnionQuery rightUnion = (SQLUnionQuery) right; + final SQLOrderBy orderBy = rightUnion.getOrderBy(); + if (orderBy != null) { + union.setOrderBy(orderBy); + rightUnion.setOrderBy(null); + } + + SQLLimit limit = rightUnion.getLimit(); + if (limit != null) { + union.setLimit(limit); + rightUnion.setLimit(null); + } + } + } + return queryRest(union, true); } @@ -209,8 +277,38 @@ public class SQLSelectParser extends SQLParser { union.setOperator(SQLUnionOperator.INTERSECT); + boolean paren = lexer.token == Token.LPAREN; SQLSelectQuery right = this.query(union, false); union.setRight(right); + if (!paren) { + if (right instanceof SQLSelectQueryBlock) { + SQLSelectQueryBlock rightQuery = (SQLSelectQueryBlock) right; + SQLOrderBy orderBy = rightQuery.getOrderBy(); + if (orderBy != null) { + union.setOrderBy(orderBy); + rightQuery.setOrderBy(null); + } + + SQLLimit limit = rightQuery.getLimit(); + if (limit != null) { + union.setLimit(limit); + rightQuery.setLimit(null); + } + } else if (right instanceof SQLUnionQuery) { + SQLUnionQuery rightUnion = (SQLUnionQuery) right; + final SQLOrderBy orderBy = rightUnion.getOrderBy(); + if (orderBy != null) { + union.setOrderBy(orderBy); + rightUnion.setOrderBy(null); + } + + SQLLimit limit = rightUnion.getLimit(); + if (limit != null) { + union.setLimit(limit); + rightUnion.setLimit(null); + } + } + } return queryRest(union, true); } @@ -232,6 +330,30 @@ public class SQLSelectParser extends SQLParser { return selectQuery; } + private void setToLeft(SQLSelectQuery selectQuery, SQLUnionQuery parentUnion, SQLUnionQuery union, SQLSelectQuery right) { + SQLUnionOperator operator = union.getOperator(); + + if (union.getLeft() instanceof SQLUnionQuery) { + SQLUnionQuery left = (SQLUnionQuery) union.getLeft(); + while (left.getLeft() instanceof SQLUnionQuery) { + left = (SQLUnionQuery) left.getLeft(); + } + + left.setLeft(new SQLUnionQuery(parentUnion.getLeft(), parentUnion.getOperator(), left.getLeft())); + + parentUnion.setLeft(union.getLeft()); + parentUnion.setRight(union.getRight()); + } else { + parentUnion.setRight(right); + union.setLeft(parentUnion.getLeft()); + parentUnion.setLeft(union); + union.setRight(selectQuery); + union.setOperator(parentUnion.getOperator()); + parentUnion.setOperator(operator); + } + + } + public SQLSelectQuery query() { return query(null, true); } @@ -250,7 +372,11 @@ public class SQLSelectParser extends SQLParser { return queryRest(select, acceptUnion); } - SQLSelectQueryBlock queryBlock = new SQLSelectQueryBlock(); + if (lexer.token() == Token.VALUES) { + return valuesQuery(acceptUnion); + } + + SQLSelectQueryBlock queryBlock = new SQLSelectQueryBlock(dbType); if (lexer.hasComment() && lexer.isKeepComments()) { queryBlock.addBeforeComment(lexer.readAndResetComments()); @@ -293,12 +419,25 @@ public class SQLSelectParser extends SQLParser { parseSelectList(queryBlock); + if (lexer.token() == Token.INTO) { + lexer.nextToken(); + + SQLExpr expr = expr(); + if (lexer.token() != Token.COMMA) { + queryBlock.setInto(expr); + } + } + parseFrom(queryBlock); parseWhere(queryBlock); parseGroupBy(queryBlock); + if (lexer.identifierEquals(FnvHash.Constants.WINDOW)) { + parseWindow(queryBlock); + } + parseSortBy(queryBlock); parseFetchClause(queryBlock); @@ -322,8 +461,30 @@ public class SQLSelectParser extends SQLParser { return queryRest(queryBlock, acceptUnion); } - protected void parseSortBy(SQLSelectQueryBlock queryBlock) { + protected SQLSelectQuery valuesQuery(boolean acceptUnion) { + lexer.nextToken(); + SQLValuesQuery valuesQuery = new SQLValuesQuery(); + for (;;) { + if (lexer.token == Token.LPAREN) { + lexer.nextToken(); + SQLListExpr listExpr = new SQLListExpr(); + this.exprParser.exprList(listExpr.getItems(), listExpr); + accept(Token.RPAREN); + valuesQuery.addValue(listExpr); + } else { + this.exprParser.exprList(valuesQuery.getValues(), valuesQuery); + } + + if (lexer.token == Token.COMMA) { + lexer.nextToken(); + continue; + } else { + break; + } + } + + return queryRest(valuesQuery, acceptUnion); } protected void withSubquery(SQLSelect select) { @@ -371,9 +532,12 @@ public class SQLSelectParser extends SQLParser { } public SQLWithSubqueryClause parseWith() { - accept(Token.WITH); - SQLWithSubqueryClause withQueryClause = new SQLWithSubqueryClause(); + if (lexer.hasComment() && lexer.isKeepComments()) { + withQueryClause.addBeforeComment(lexer.readAndResetComments()); + } + + accept(Token.WITH); if (lexer.token == Token.RECURSIVE || lexer.identifierEquals(FnvHash.Constants.RECURSIVE)) { lexer.nextToken(); @@ -399,6 +563,7 @@ public class SQLSelectParser extends SQLParser { switch (lexer.token) { case SELECT: + case WITH: entry.setSubQuery(select()); break; default: @@ -502,7 +667,15 @@ public class SQLSelectParser extends SQLParser { where = this.exprParser.exprRest(identExpr); } } else { + while (lexer.token == Token.HINT) { + lexer.nextToken(); + } + where = this.exprParser.expr(); + + while (lexer.token == Token.HINT) { + lexer.nextToken(); + } } // where = this.exprParser.expr(); @@ -512,7 +685,7 @@ public class SQLSelectParser extends SQLParser { if (lexer.hasComment() && lexer.isKeepComments() // && lexer.token != Token.INSERT // odps multi-insert - ) { + ) { where.addAfterComment(lexer.readAndResetComments()); } @@ -520,6 +693,61 @@ public class SQLSelectParser extends SQLParser { } } + protected void parseSortBy(SQLSelectQueryBlock queryBlock) { + if (lexer.token() == Token.ORDER) { + SQLOrderBy orderBy = parseOrderBy(); + queryBlock.setOrderBy(orderBy); + } + + if (lexer.identifierEquals(FnvHash.Constants.DISTRIBUTE)) { + lexer.nextToken(); + accept(Token.BY); + + for (;;) { + SQLSelectOrderByItem distributeByItem = this.exprParser.parseSelectOrderByItem(); + queryBlock.addDistributeBy(distributeByItem); + + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + } else { + break; + } + } + } + + if (lexer.identifierEquals(FnvHash.Constants.SORT)) { + lexer.nextToken(); + accept(Token.BY); + + for (;;) { + SQLSelectOrderByItem sortByItem = this.exprParser.parseSelectOrderByItem(); + queryBlock.addSortBy(sortByItem); + + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + } else { + break; + } + } + } + + if (lexer.identifierEquals(FnvHash.Constants.CLUSTER)) { + lexer.nextToken(); + accept(Token.BY); + + for (;;) { + SQLSelectOrderByItem clusterByItem = this.exprParser.parseSelectOrderByItem(); + queryBlock.addClusterBy(clusterByItem); + + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + } else { + break; + } + } + } + } + protected void parseWindow(SQLSelectQueryBlock queryBlock) { if (!(lexer.identifierEquals(FnvHash.Constants.WINDOW) || lexer.token == Token.WINDOW)) { return; @@ -542,13 +770,24 @@ public class SQLSelectParser extends SQLParser { break; } } - + protected void parseGroupBy(SQLSelectQueryBlock queryBlock) { - if (lexer.token == (Token.GROUP)) { + if (lexer.token == Token.GROUP) { lexer.nextTokenBy(); accept(Token.BY); SQLSelectGroupByClause groupBy = new SQLSelectGroupByClause(); + + if (lexer.token == Token.ALL) { + lexer.nextToken(); + if (!lexer.identifierEquals(FnvHash.Constants.GROUPING)) { + throw new ParserException("group by all syntax error. " + lexer.info()); + } + } else if (lexer.token == Token.DISTINCT) { + lexer.nextToken(); + groupBy.setDistinct(true); + } + if (lexer.identifierEquals(FnvHash.Constants.ROLLUP)) { lexer.nextToken(); accept(Token.LPAREN); @@ -562,18 +801,22 @@ public class SQLSelectParser extends SQLParser { for (;;) { SQLExpr item = parseGroupByItem(); - + item.setParent(groupBy); groupBy.addItem(item); - if (!(lexer.token == (Token.COMMA))) { + if (lexer.token == Token.COMMA) { + lexer.nextToken(); + continue; + } else if(lexer.identifierEquals(FnvHash.Constants.GROUPING)) { + continue; + } else { break; } - - lexer.nextToken(); } if (groupBy.isWithRollUp() || groupBy.isWithCube()) { accept(Token.RPAREN); + groupBy.setParen(true); } if (lexer.token == (Token.HAVING)) { @@ -582,10 +825,11 @@ public class SQLSelectParser extends SQLParser { SQLExpr having = this.exprParser.expr(); groupBy.setHaving(having); } - + if (lexer.token == Token.WITH) { + Lexer.SavePoint mark = lexer.mark(); lexer.nextToken(); - + if (lexer.identifierEquals(FnvHash.Constants.CUBE)) { lexer.nextToken(); groupBy.setWithCube(true); @@ -609,10 +853,17 @@ public class SQLSelectParser extends SQLParser { lexer.nextToken(); ((DB2SelectQueryBlock) queryBlock).setIsolation(DB2SelectQueryBlock.Isolation.UR); } else { - throw new ParserException("TODO " + lexer.info()); + lexer.reset(mark); } } - + + if (groupBy.getHaving() == null && lexer.token == Token.HAVING) { + lexer.nextToken(); + + SQLExpr having = this.exprParser.expr(); + groupBy.setHaving(having); + } + queryBlock.setGroupBy(groupBy); } else if (lexer.token == (Token.HAVING)) { lexer.nextToken(); @@ -626,7 +877,7 @@ public class SQLSelectParser extends SQLParser { for (;;) { SQLExpr item = parseGroupByItem(); - + item.setParent(groupBy); groupBy.addItem(item); @@ -637,15 +888,15 @@ public class SQLSelectParser extends SQLParser { lexer.nextToken(); } } - + if (lexer.token == Token.WITH) { lexer.nextToken(); acceptIdentifier("ROLLUP"); groupBy.setWithRollUp(true); } - - if(JdbcConstants.MYSQL.equals(getDbType()) + + if (JdbcConstants.MYSQL.equals(dbType) && lexer.token == Token.DESC) { lexer.nextToken(); // skip } @@ -655,9 +906,20 @@ public class SQLSelectParser extends SQLParser { } protected SQLExpr parseGroupByItem() { + if (lexer.token == Token.LPAREN) { + Lexer.SavePoint mark = lexer.mark(); + lexer.nextToken(); + + if (lexer.token == Token.RPAREN) { + lexer.nextToken(); + return new SQLListExpr(); + } + + lexer.reset(mark); + } SQLExpr item = this.exprParser.expr(); - - if(JdbcConstants.MYSQL.equals(getDbType())) { + + if (JdbcConstants.MYSQL.equals(dbType)) { if (lexer.token == Token.DESC) { lexer.nextToken(); // skip item =new MySqlOrderingExpr(item, SQLOrderingSpecification.DESC); @@ -688,9 +950,9 @@ public class SQLSelectParser extends SQLParser { if (lexer.token != Token.FROM) { return; } - + lexer.nextToken(); - + queryBlock.setFrom( parseTableSource()); } @@ -703,6 +965,10 @@ public class SQLSelectParser extends SQLParser { || lexer.token == Token.SEL) { SQLSelect select = select(); accept(Token.RPAREN); + if (select.getQuery() instanceof SQLSelectQueryBlock) { + ((SQLSelectQueryBlock) select.getQuery()).setParenthesized(true); + } + SQLSelectQuery query = queryRest(select.getQuery(), true); if (query instanceof SQLUnionQuery) { tableSource = new SQLUnionQueryTableSource((SQLUnionQuery) query); @@ -717,19 +983,25 @@ public class SQLSelectParser extends SQLParser { accept(Token.RPAREN); } - if (lexer.token == Token.AS - && tableSource instanceof SQLValuesTableSource - && ((SQLValuesTableSource) tableSource).getColumns().size() == 0) - { + if (lexer.token == Token.AS) { lexer.nextToken(); - - String alias = this.tableAlias(); + String alias = this.tableAlias(true); tableSource.setAlias(alias); - SQLValuesTableSource values = (SQLValuesTableSource) tableSource; - accept(Token.LPAREN); - this.exprParser.names(values.getColumns(), values); - accept(Token.RPAREN); + if (tableSource instanceof SQLValuesTableSource + && ((SQLValuesTableSource) tableSource).getColumns().size() == 0) { + SQLValuesTableSource values = (SQLValuesTableSource) tableSource; + accept(Token.LPAREN); + this.exprParser.names(values.getColumns(), values); + accept(Token.RPAREN); + } else if (tableSource instanceof SQLSubqueryTableSource) { + SQLSubqueryTableSource values = (SQLSubqueryTableSource) tableSource; + if (lexer.token == Token.LPAREN) { + lexer.nextToken(); + this.exprParser.names(values.getColumns(), values); + accept(Token.RPAREN); + } + } } return parseTableSourceRest(tableSource); @@ -790,13 +1062,14 @@ public class SQLSelectParser extends SQLParser { } protected void parseTableSourceQueryTableExpr(SQLExprTableSource tableReference) { - if (lexer.token == Token.LITERAL_ALIAS || lexer.token == Token.IDENTIFIED - || lexer.token == Token.LITERAL_CHARS) { + if (lexer.token == Token.LITERAL_ALIAS || lexer.identifierEquals(FnvHash.Constants.IDENTIFIED) + || lexer.token == Token.LITERAL_CHARS) { tableReference.setExpr(this.exprParser.name()); return; } - tableReference.setExpr(expr()); + tableReference.setExpr( + expr()); } protected SQLTableSource primaryTableSourceRest(SQLTableSource tableSource) { @@ -812,13 +1085,31 @@ public class SQLSelectParser extends SQLParser { && token != Token.FULL && token != Token.OUTER && !(token == Token.IDENTIFIER - && ((hash = lexer.hash_lower()) == FnvHash.Constants.STRAIGHT_JOIN - || hash == FnvHash.Constants.CROSS))) + && ((hash = lexer.hash_lower()) == FnvHash.Constants.STRAIGHT_JOIN + || hash == FnvHash.Constants.CROSS))) { String alias = tableAlias(); if (alias != null) { + if (isEnabled(SQLParserFeature.IgnoreNameQuotes) && alias.length() > 1) { + alias = StringUtils.removeNameQuotes(alias); + } tableSource.setAlias(alias); + if (tableSource instanceof SQLValuesTableSource + && ((SQLValuesTableSource) tableSource).getColumns().size() == 0) { + SQLValuesTableSource values = (SQLValuesTableSource) tableSource; + accept(Token.LPAREN); + this.exprParser.names(values.getColumns(), values); + accept(Token.RPAREN); + } else if (tableSource instanceof SQLSubqueryTableSource) { + SQLSubqueryTableSource values = (SQLSubqueryTableSource) tableSource; + if (lexer.token == Token.LPAREN) { + lexer.nextToken(); + this.exprParser.names(values.getColumns(), values); + accept(Token.RPAREN); + } + } + if (lexer.token == Token.WHERE) { return tableSource; } @@ -830,71 +1121,88 @@ public class SQLSelectParser extends SQLParser { SQLJoinTableSource.JoinType joinType = null; - boolean natural = lexer.identifierEquals(FnvHash.Constants.NATURAL) && JdbcConstants.MYSQL.equals(dbType); + boolean natural = lexer.identifierEquals(FnvHash.Constants.NATURAL); if (natural) { lexer.nextToken(); } - if (lexer.token == Token.LEFT) { - lexer.nextToken(); + switch (lexer.token) { + case LEFT: + lexer.nextToken(); - if (lexer.identifierEquals(FnvHash.Constants.SEMI)) { - lexer.nextToken(); - joinType = SQLJoinTableSource.JoinType.LEFT_SEMI_JOIN; - } else if (lexer.identifierEquals(FnvHash.Constants.ANTI)) { - lexer.nextToken(); - joinType = SQLJoinTableSource.JoinType.LEFT_ANTI_JOIN; - } else if (lexer.token == Token.OUTER) { - lexer.nextToken(); - joinType = SQLJoinTableSource.JoinType.LEFT_OUTER_JOIN; - } else { - joinType = SQLJoinTableSource.JoinType.LEFT_OUTER_JOIN; - } + if (lexer.identifierEquals(FnvHash.Constants.SEMI)) { + lexer.nextToken(); + joinType = SQLJoinTableSource.JoinType.LEFT_SEMI_JOIN; + } else if (lexer.identifierEquals(FnvHash.Constants.ANTI)) { + lexer.nextToken(); + joinType = SQLJoinTableSource.JoinType.LEFT_ANTI_JOIN; + } else if (lexer.token == Token.OUTER) { + lexer.nextToken(); + joinType = SQLJoinTableSource.JoinType.LEFT_OUTER_JOIN; + } else { + joinType = SQLJoinTableSource.JoinType.LEFT_OUTER_JOIN; + } - accept(Token.JOIN); - - } else if (lexer.token == Token.RIGHT) { - lexer.nextToken(); - if (lexer.token == Token.OUTER) { + accept(Token.JOIN); + break; + case RIGHT: lexer.nextToken(); - } - accept(Token.JOIN); - joinType = SQLJoinTableSource.JoinType.RIGHT_OUTER_JOIN; - } else if (lexer.token == Token.FULL) { - lexer.nextToken(); - if (lexer.token == Token.OUTER) { + if (lexer.token == Token.OUTER) { + lexer.nextToken(); + } + accept(Token.JOIN); + joinType = SQLJoinTableSource.JoinType.RIGHT_OUTER_JOIN; + break; + case FULL: lexer.nextToken(); - } - accept(Token.JOIN); - joinType = SQLJoinTableSource.JoinType.FULL_OUTER_JOIN; - } else if (lexer.token == Token.INNER) { - lexer.nextToken(); - accept(Token.JOIN); - joinType = SQLJoinTableSource.JoinType.INNER_JOIN; - } else if (lexer.token == Token.JOIN) { - lexer.nextToken(); - joinType = SQLJoinTableSource.JoinType.JOIN; - } else if (lexer.token == Token.COMMA) { - lexer.nextToken(); - joinType = SQLJoinTableSource.JoinType.COMMA; - } else if (lexer.identifierEquals(FnvHash.Constants.STRAIGHT_JOIN)) { - lexer.nextToken(); - joinType = SQLJoinTableSource.JoinType.STRAIGHT_JOIN; - } else if (lexer.identifierEquals(FnvHash.Constants.CROSS)) { - lexer.nextToken(); - if (lexer.token == Token.JOIN) { + if (lexer.token == Token.OUTER) { + lexer.nextToken(); + } + accept(Token.JOIN); + joinType = SQLJoinTableSource.JoinType.FULL_OUTER_JOIN; + break; + case INNER: lexer.nextToken(); - joinType = SQLJoinTableSource.JoinType.CROSS_JOIN; - } else if (lexer.identifierEquals(FnvHash.Constants.APPLY)) { + accept(Token.JOIN); + joinType = SQLJoinTableSource.JoinType.INNER_JOIN; + break; + case JOIN: lexer.nextToken(); - joinType = SQLJoinTableSource.JoinType.CROSS_APPLY; - } - } else if (lexer.token == Token.OUTER) { - lexer.nextToken(); - if (lexer.identifierEquals(FnvHash.Constants.APPLY)) { + joinType = natural ? SQLJoinTableSource.JoinType.NATURAL_JOIN : SQLJoinTableSource.JoinType.JOIN; + break; + case COMMA: lexer.nextToken(); - joinType = SQLJoinTableSource.JoinType.OUTER_APPLY; - } + joinType = SQLJoinTableSource.JoinType.COMMA; + break; + case OUTER: + lexer.nextToken(); + if (lexer.identifierEquals(FnvHash.Constants.APPLY)) { + lexer.nextToken(); + joinType = SQLJoinTableSource.JoinType.OUTER_APPLY; + } + break; + case IDENTIFIER: + final long hash = lexer.hash_lower; + if (hash == FnvHash.Constants.STRAIGHT_JOIN) { + lexer.nextToken(); + joinType = SQLJoinTableSource.JoinType.STRAIGHT_JOIN; + } else if (hash == FnvHash.Constants.STRAIGHT) { + lexer.nextToken(); + accept(Token.JOIN); + joinType = SQLJoinTableSource.JoinType.STRAIGHT_JOIN; + } else if (hash == FnvHash.Constants.CROSS) { + lexer.nextToken(); + if (lexer.token == Token.JOIN) { + lexer.nextToken(); + joinType = natural ? SQLJoinTableSource.JoinType.NATURAL_CROSS_JOIN : SQLJoinTableSource.JoinType.CROSS_JOIN; + } else if (lexer.identifierEquals(FnvHash.Constants.APPLY)) { + lexer.nextToken(); + joinType = SQLJoinTableSource.JoinType.CROSS_APPLY; + } + } + break; + default: + break; } if (joinType != null) { @@ -902,25 +1210,75 @@ public class SQLSelectParser extends SQLParser { join.setLeft(tableSource); join.setJoinType(joinType); + boolean isBrace = false; + if (SQLJoinTableSource.JoinType.COMMA == joinType) { + if (lexer.token == Token.LBRACE) { + lexer.nextToken(); + acceptIdentifier("OJ"); + isBrace = true; + } + } - SQLTableSource rightTableSource; + SQLTableSource rightTableSource = null; if (lexer.token == Token.LPAREN) { lexer.nextToken(); if (lexer.token == Token.SELECT) { SQLSelect select = this.select(); rightTableSource = new SQLSubqueryTableSource(select); - } else { + } else { rightTableSource = this.parseTableSource(); } + + if (lexer.token == Token.UNION && rightTableSource instanceof SQLSubqueryTableSource) { + SQLSelect select = ((SQLSubqueryTableSource) rightTableSource).getSelect(); + SQLSelectQuery query = queryRest(select.getQuery(), true); + select.setQuery(query); + } + accept(Token.RPAREN); + + if (rightTableSource instanceof SQLValuesTableSource + && (lexer.token == Token.AS || lexer.token == Token.IDENTIFIER) + && rightTableSource.getAlias() == null + && ((SQLValuesTableSource) rightTableSource).getColumns().size() == 0 + ) { + rightTableSource.setAlias(tableAlias(true)); + + if (lexer.token == Token.LPAREN) { + lexer.nextToken(); + this.exprParser.names(((SQLValuesTableSource) rightTableSource).getColumns(), rightTableSource); + accept(Token.RPAREN); + } + } } else { - SQLExpr expr = this.expr(); - rightTableSource = new SQLExprTableSource(expr); + if (rightTableSource == null) { + boolean aliasToken = lexer.token == Token.LITERAL_ALIAS; + SQLExpr expr = this.expr(); + if (aliasToken && expr instanceof SQLCharExpr) { + expr = new SQLIdentifierExpr(((SQLCharExpr) expr).getText()); + } + SQLExprTableSource exprTableSource = new SQLExprTableSource(expr); + + if (expr instanceof SQLMethodInvokeExpr && lexer.token == Token.AS) { + lexer.nextToken(); + String alias = this.tableAlias(true); + exprTableSource.setAlias(alias); + + if (lexer.token == Token.LPAREN) { + lexer.nextToken(); + + this.exprParser.names(exprTableSource.getColumns(), exprTableSource); + accept(Token.RPAREN); + } + } + + rightTableSource = exprTableSource; + } primaryTableSourceRest(rightTableSource); } if (lexer.token == Token.USING - ||lexer.identifierEquals(FnvHash.Constants.USING)) + ||lexer.identifierEquals(FnvHash.Constants.USING)) { Lexer.SavePoint savePoint = lexer.mark(); lexer.nextToken(); @@ -937,8 +1295,28 @@ public class SQLSelectParser extends SQLParser { } else { join.setAlias(this.tableAlias()); } - } else { - rightTableSource.setAlias(this.tableAlias()); + } else if (rightTableSource.getAlias() == null && !(rightTableSource instanceof SQLValuesTableSource)) { + String tableAlias = this.tableAlias(); + if (tableAlias != null) { + rightTableSource.setAlias(tableAlias); + + if (lexer.token == Token.LPAREN) { + if (rightTableSource instanceof SQLSubqueryTableSource) { + lexer.nextToken(); + List columns = ((SQLSubqueryTableSource) rightTableSource).getColumns(); + this.exprParser.names(columns, rightTableSource); + accept(Token.RPAREN); + } else if (rightTableSource instanceof SQLExprTableSource + && ((SQLExprTableSource) rightTableSource).getExpr() instanceof SQLMethodInvokeExpr) { + List columns = ((SQLExprTableSource) rightTableSource).getColumns(); + if (columns.size() == 0) { + lexer.nextToken(); + this.exprParser.names(columns, rightTableSource); + accept(Token.RPAREN); + } + } + } + } primaryTableSourceRest(rightTableSource); } @@ -966,7 +1344,8 @@ public class SQLSelectParser extends SQLParser { join.setRight(rightTableSource); if (!natural) { - if (tableSource.aliasHashCode64() == FnvHash.Constants.NATURAL && JdbcConstants.MYSQL.equals(dbType)) { + if (!StringUtils.isEmpty(tableSource.getAlias()) + && tableSource.aliasHashCode64() == FnvHash.Constants.NATURAL && JdbcConstants.MYSQL.equals(dbType)) { tableSource.setAlias(null); natural = true; } @@ -975,7 +1354,15 @@ public class SQLSelectParser extends SQLParser { if (lexer.token == Token.ON) { lexer.nextToken(); - join.setCondition(expr()); + SQLExpr joinOn = expr(); + join.setCondition(joinOn); + + while (lexer.token == Token.ON) { + lexer.nextToken(); + + SQLExpr joinOn2 = expr(); + join.addCondition(joinOn2); + } } else if (lexer.token == Token.USING || lexer.identifierEquals(FnvHash.Constants.USING)) { Lexer.SavePoint savePoint = lexer.mark(); @@ -989,7 +1376,13 @@ public class SQLSelectParser extends SQLParser { } } - return parseTableSourceRest(join); + SQLTableSource tableSourceReturn = parseTableSourceRest(join); + + if (isBrace) { + accept(Token.RBRACE); + } + + return parseTableSourceRest(tableSourceReturn); } if (tableSource.aliasHashCode64() == FnvHash.Constants.LATERAL @@ -1031,7 +1424,7 @@ public class SQLSelectParser extends SQLParser { if (lexer.identifierEquals(FnvHash.Constants.OFFSET) || lexer.token == Token.OFFSET) { lexer.nextToken(); - SQLExpr offset = this.exprParser.primary(); + SQLExpr offset = this.exprParser.expr(); queryBlock.setOffset(offset); if (lexer.identifierEquals(FnvHash.Constants.ROW) || lexer.identifierEquals(FnvHash.Constants.ROWS)) { lexer.nextToken(); @@ -1120,16 +1513,75 @@ public class SQLSelectParser extends SQLParser { SQLLateralViewTableSource lateralViewTabSrc = new SQLLateralViewTableSource(); lateralViewTabSrc.setTableSource(tableSource); + if (lexer.token == Token.OUTER) { + lateralViewTabSrc.setOuter(true); + lexer.nextToken(); + } + SQLMethodInvokeExpr udtf = (SQLMethodInvokeExpr) this.exprParser.expr(); lateralViewTabSrc.setMethod(udtf); String alias = as(); lateralViewTabSrc.setAlias(alias); - accept(Token.AS); - - this.exprParser.names(lateralViewTabSrc.getColumns()); + if (lexer.token == Token.AS) { + lexer.nextToken(); + this.exprParser.names(lateralViewTabSrc.getColumns()); + } return parseTableSourceRest(lateralViewTabSrc); } + + public SQLValuesTableSource parseValues() { + accept(Token.VALUES); + SQLValuesTableSource tableSource = new SQLValuesTableSource(); + + for (;;) { + + // compatible (VALUES 1,2,3) and (VALUES (1), (2), (3)) for ads + boolean isSingleValue = true; + if (lexer.token == Token.ROW) { + lexer.nextToken(); + } + if(lexer.token() == Token.LPAREN) { + accept(Token.LPAREN); + isSingleValue = false; + } + + SQLListExpr listExpr = new SQLListExpr(); + + if (isSingleValue) { + SQLExpr expr = expr(); + expr.setParent(listExpr); + listExpr.getItems().add(expr); + } else { + this.exprParser.exprList(listExpr.getItems(), listExpr); + accept(Token.RPAREN); + } + + listExpr.setParent(tableSource); + + tableSource.getValues().add(listExpr); + + if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + continue; + } + break; + } + + String alias = this.tableAlias(); + if (alias != null) { + tableSource.setAlias(alias); + } + + if (lexer.token() == Token.LPAREN) { + lexer.nextToken(); + this.exprParser.names(tableSource.getColumns(), tableSource); + accept(Token.RPAREN); + } + + + return tableSource; + } } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index 144c515fdf..ebf9c9733b 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -1917,6 +1917,12 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet orderBy.accept(this); } + final SQLLimit limit = x.getLimit(); + if (limit != null) { + println(); + limit.accept(this); + } + if (x.getHintsSize() > 0) { printAndAccept(x.getHints(), ""); } @@ -2881,6 +2887,34 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet @Override public boolean visit(SQLUnionQuery x) { SQLUnionOperator operator = x.getOperator(); + + List relations = x.getRelations(); + if (relations.size() > 2) { + for (int i = 0; i < relations.size(); i++) { + if (i != 0) { + println(); + print0(ucase ? operator.name : operator.name_lcase); + println(); + } + + SQLSelectQuery item = relations.get(i); + item.accept(this); + } + + SQLOrderBy orderBy = x.getOrderBy(); + if (orderBy != null) { + println(); + orderBy.accept(this); + } + + SQLLimit limit = x.getLimit(); + if (limit != null) { + println(); + limit.accept(this); + } + return false; + } + SQLSelectQuery left = x.getLeft(); SQLSelectQuery right = x.getRight(); @@ -2891,10 +2925,18 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet && left instanceof SQLUnionQuery && ((SQLUnionQuery) left).getOperator() == operator && !right.isBracket() + && x.getLimit() == null && orderBy == null) { SQLUnionQuery leftUnion = (SQLUnionQuery) left; + if (right instanceof SQLSelectQueryBlock) { + SQLSelectQueryBlock rightQueryBlock = (SQLSelectQueryBlock) right; + if (rightQueryBlock.getOrderBy() != null || rightQueryBlock.getLimit() != null) { + rightQueryBlock.setBracket(true); + } + } + List rights = new ArrayList(); rights.add(right); @@ -2902,6 +2944,13 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet SQLSelectQuery leftLeft = leftUnion.getLeft(); SQLSelectQuery leftRight = leftUnion.getRight(); + if (leftRight instanceof SQLSelectQueryBlock) { + SQLSelectQueryBlock leftRightQueryBlock = (SQLSelectQueryBlock) leftRight; + if (leftRightQueryBlock.getOrderBy() != null || leftRightQueryBlock.getLimit() != null) { + leftRightQueryBlock.setBracket(true); + } + } + if ((!leftUnion.isBracket()) && leftUnion.getOrderBy() == null && (!leftLeft.isBracket()) @@ -2939,24 +2988,30 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet for (;;) { if (left.getClass() == SQLUnionQuery.class) { SQLUnionQuery leftUnion = (SQLUnionQuery) left; - SQLSelectQuery leftLeft = leftUnion.getLeft(); - SQLSelectQuery leftRigt = leftUnion.getRight(); - if ((!leftUnion.isBracket()) - && leftUnion.getRight() instanceof SQLSelectQueryBlock - && leftUnion.getLeft() != null - && leftUnion.getOrderBy() == null) - { - if (leftLeft.getClass() == SQLUnionQuery.class) { - visit((SQLUnionQuery) leftLeft); - } else { - printQuery(leftLeft); - } - println(); - print0(ucase ? leftUnion.getOperator().name : leftUnion.getOperator().name_lcase); - println(); - leftRigt.accept(this); - } else { + if (leftUnion.getRelations().size() > 2) { visit(leftUnion); + } else { + SQLSelectQuery leftLeft = leftUnion.getLeft(); + SQLSelectQuery leftRigt = leftUnion.getRight(); + if ((!leftUnion.isBracket()) + && leftUnion.getRight() instanceof SQLSelectQueryBlock + && leftUnion.getLeft() != null + && leftUnion.getLimit() == null + && leftUnion.getOrderBy() == null) { + if (leftLeft.getClass() == SQLUnionQuery.class) { + visit((SQLUnionQuery) leftLeft); + } + else { + printQuery(leftLeft); + } + println(); + print0(ucase ? leftUnion.getOperator().name : leftUnion.getOperator().name_lcase); + println(); + leftRigt.accept(this); + } + else { + visit(leftUnion); + } } } else { left.accept(this); @@ -2974,8 +3029,8 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet println(); boolean needParen = false; - if (orderBy != null - && (!right.isBracket()) && right instanceof SQLSelectQueryBlock) { + if ((!right.isBracket()) + && right instanceof SQLSelectQueryBlock) { SQLSelectQueryBlock rightQuery = (SQLSelectQueryBlock) right; if (rightQuery.getOrderBy() != null || rightQuery.getLimit() != null) { needParen = true; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java index 4fecbbd4b1..92a93e2eae 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java @@ -19,6 +19,7 @@ import com.alibaba.druid.sql.ast.SQLArgument; import com.alibaba.druid.sql.ast.SQLArrayDataType; import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLDataType; +import com.alibaba.druid.sql.ast.SQLDataTypeRefExpr; import com.alibaba.druid.sql.ast.SQLDeclareItem; import com.alibaba.druid.sql.ast.SQLKeep; import com.alibaba.druid.sql.ast.SQLLimit; @@ -905,4 +906,10 @@ public interface SQLASTVisitor { boolean visit(SQLDumpStatement x); void endVisit(SQLDumpStatement x); + boolean visit(SQLValuesQuery x); + void endVisit(SQLValuesQuery x); + + boolean visit(SQLDataTypeRefExpr x); + void endVisit(SQLDataTypeRefExpr x); + } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java index 513d17231d..3e81ee864c 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java @@ -19,6 +19,7 @@ import com.alibaba.druid.sql.ast.SQLArgument; import com.alibaba.druid.sql.ast.SQLArrayDataType; import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLDataType; +import com.alibaba.druid.sql.ast.SQLDataTypeRefExpr; import com.alibaba.druid.sql.ast.SQLDeclareItem; import com.alibaba.druid.sql.ast.SQLKeep; import com.alibaba.druid.sql.ast.SQLLimit; @@ -85,6 +86,9 @@ import com.alibaba.druid.sql.ast.statement.SQLInsertStatement.ValuesClause; import com.alibaba.druid.sql.ast.statement.SQLMergeStatement.MergeInsertClause; import com.alibaba.druid.sql.ast.statement.SQLMergeStatement.MergeUpdateClause; +import java.util.ArrayList; +import java.util.List; + public class SQLASTVisitorAdapter implements SQLASTVisitor { protected int features; @@ -412,6 +416,58 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor { @Override public boolean visit(SQLUnionQuery x) { + SQLUnionOperator operator = x.getOperator(); + List relations = x.getRelations(); + if (relations.size() > 2) { + for (SQLSelectQuery relation : x.getRelations()) { + relation.accept(this); + } + return false; + } + + SQLSelectQuery left = x.getLeft(); + SQLSelectQuery right = x.getRight(); + + boolean bracket = x.isBracket() && !(x.getParent() instanceof SQLUnionQueryTableSource); + + if ((!bracket) + && left instanceof SQLUnionQuery + && ((SQLUnionQuery) left).getOperator() == operator + && !right.isBracket() + && x.getOrderBy() == null) { + + SQLUnionQuery leftUnion = (SQLUnionQuery) left; + + List rights = new ArrayList(); + rights.add(right); + + for (; ; ) { + SQLSelectQuery leftLeft = leftUnion.getLeft(); + SQLSelectQuery leftRight = leftUnion.getRight(); + + if ((!leftUnion.isBracket()) + && leftUnion.getOrderBy() == null + && (!leftLeft.isBracket()) + && (!leftRight.isBracket()) + && leftLeft instanceof SQLUnionQuery + && ((SQLUnionQuery) leftLeft).getOperator() == operator) { + rights.add(leftRight); + leftUnion = (SQLUnionQuery) leftLeft; + continue; + } else { + rights.add(leftRight); + rights.add(leftLeft); + } + break; + } + + for (int i = rights.size() - 1; i >= 0; i--) { + SQLSelectQuery item = rights.get(i); + item.accept(this); + } + return false; + } + return true; } @@ -2068,6 +2124,26 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor { } + @Override + public void endVisit(SQLValuesQuery x) { + + } + + @Override + public boolean visit(SQLValuesQuery x) { + return true; + } + + @Override + public void endVisit(SQLDataTypeRefExpr x) { + + } + + @Override + public boolean visit(SQLDataTypeRefExpr x) { + return true; + } + public final boolean isEnabled(VisitorFeature feature) { return VisitorFeature.isEnabled(this.features, feature); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java index 9e1485ef51..51ad560222 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -41,6 +41,7 @@ import com.alibaba.druid.sql.ast.SQLPartitionValue; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.SQLSubPartition; import com.alibaba.druid.sql.ast.SQLSubPartitionByHash; +import com.alibaba.druid.sql.ast.SQLWindow; import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr; import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr; import com.alibaba.druid.sql.ast.expr.SQLArrayExpr; @@ -1003,7 +1004,9 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { } public boolean visit(SQLSelectQueryBlock x) { - if (x.getFrom() == null) { + SQLTableSource from = x.getFrom(); + + if (from == null) { for (SQLSelectItem selectItem : x.getSelectList()) { statExpr( selectItem.getExpr()); @@ -1018,7 +1021,6 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { // return false; // } - SQLTableSource from = x.getFrom(); if (from != null) { from.accept(this); // 提前执行,获得aliasMap } @@ -1039,8 +1041,12 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { } for (SQLSelectItem selectItem : x.getSelectList()) { - statExpr( - selectItem.getExpr()); + if (selectItem.getClass() == SQLSelectItem.class) { + statExpr( + selectItem.getExpr()); + } else { + selectItem.accept(this); + } } SQLExpr where = x.getWhere(); @@ -1065,6 +1071,13 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { } } + List windows = x.getWindows(); + if (windows != null && windows.size() > 0) { + for (SQLWindow window : windows) { + window.accept(this); + } + } + SQLOrderBy orderBy = x.getOrderBy(); if (orderBy != null) { this.visit(orderBy); @@ -1075,17 +1088,17 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { statExpr(first); } - List distributeBy = x.getDistributeBy(); + List distributeBy = x.getDistributeBy(); if (distributeBy != null) { - for (SQLExpr expr : distributeBy) { - statExpr(expr); + for (SQLSelectOrderByItem item : distributeBy) { + statExpr(item.getExpr()); } } List sortBy = x.getSortBy(); if (sortBy != null) { for (SQLSelectOrderByItem orderByItem : sortBy) { - visit(orderBy); + statExpr(orderByItem.getExpr()); } } diff --git a/src/main/java/com/alibaba/druid/util/FnvHash.java b/src/main/java/com/alibaba/druid/util/FnvHash.java index 262037cd3b..0106038932 100644 --- a/src/main/java/com/alibaba/druid/util/FnvHash.java +++ b/src/main/java/com/alibaba/druid/util/FnvHash.java @@ -656,5 +656,24 @@ public final class FnvHash { long OVERWRITE = fnv1a_64_lower("OVERWRITE"); long FILTER = fnv1a_64_lower("FILTER"); + long MAPJOIN = fnv1a_64_lower("MAPJOIN"); + long DISTRIBUTE = fnv1a_64_lower("DISTRIBUTE"); + long SORT = fnv1a_64_lower("SORT"); + long CLUSTER = fnv1a_64_lower("CLUSTER"); + long GROUPING = fnv1a_64_lower("GROUPING"); + long IDENTIFIED = fnv1a_64_lower("IDENTIFIED"); + long STRAIGHT = fnv1a_64_lower("STRAIGHT"); + long IFNULL = fnv1a_64_lower("IFNULL"); + long TO_DATE = fnv1a_64_lower("TO_DATE"); + long ADD_MONTHS = fnv1a_64_lower("ADD_MONTHS"); + long PERIOD_ADD = fnv1a_64_lower("PERIOD_ADD"); + long PERIOD_DIFF = fnv1a_64_lower("PERIOD_DIFF"); + long ISNULL = fnv1a_64_lower("ISNULL"); + long COALESCE = fnv1a_64_lower("COALESCE"); + long NVL = fnv1a_64_lower("NVL"); + long ROUND = fnv1a_64_lower("ROUND"); + long BIT_COUNT = fnv1a_64_lower("BIT_COUNT"); + long WEIGHT_STRING = fnv1a_64_lower("WEIGHT_STRING"); + long REVERSE = fnv1a_64_lower("REVERSE"); } } diff --git a/src/main/java/com/alibaba/druid/util/StringUtils.java b/src/main/java/com/alibaba/druid/util/StringUtils.java index 1fcaf51f43..0ebf181776 100644 --- a/src/main/java/com/alibaba/druid/util/StringUtils.java +++ b/src/main/java/com/alibaba/druid/util/StringUtils.java @@ -386,4 +386,18 @@ public class StringUtils { chars[18] = (char) (second%10 + '0'); return new String(chars); } + + public static String removeNameQuotes(String s) { + if (s == null || s.length() <= 1) { + return null; + } + int len = s.length(); + char c0 = s.charAt(0); + char last = s.charAt(len - 1); + + if (c0 == last && (c0 == '`' || c0 == '\'' || c0 == '\"') ) { + return s.substring(1, len - 1); + } + return s; + } } diff --git a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java index dfd9ac6fa9..ce1ac5d67b 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java @@ -1729,7 +1729,7 @@ public class WallVisitorUtils { SQLExpr selectItemExpr = queryBlock.getSelectList().get(0).getExpr(); if (selectItemExpr instanceof SQLAggregateExpr) { if (((SQLAggregateExpr) selectItemExpr) - .methodNameHashCod64() == FnvHash.Constants.COUNT) { + .methodNameHashCode64() == FnvHash.Constants.COUNT) { simpleCount = true; } } diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java index 7171bc5688..197c9d97d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java @@ -17,7 +17,7 @@ public class Bug_for_qianbi extends TestCase { + "where match(auctionTitle,\"男鞋\\n中石化&加油卡\\n中石化&充值卡\\n中石化&冲值卡\\n中石化&代冲\\n中石化&代充\\n中国石化&加油卡\\n中国石化&充值卡\\n中国石化&冲值卡\\n中国石化&代冲\\n中国石化&代充\",\"\\n\")"; String expected = "INSERT INTO TABLE lol\n" + - "SELECT detail(sellerid, id) AS count1, SUM(sellerid) AS sum1\n" + + "SELECT detail(sellerid, id) AS count1, sum(sellerid) AS sum1\n" + "FROM ctu_trade_paid_done:time('natural', '1d', '1h')\n" + "WHERE match(auctionTitle, '男鞋\\n中石化&加油卡\\n中石化&充值卡\\n中石化&冲值卡\\n中石化&代冲\\n中石化&代充\\n中国石化&加油卡\\n中国石化&充值卡\\n中国石化&冲值卡\\n中国石化&代冲\\n中国石化&代充', '\\n');\n"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java b/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java index af3fe6d535..52a7e3220e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java @@ -26,26 +26,26 @@ public class DistinctTest extends TestCase { private String sql = "select count(distinct *) from t"; public void test_mysql() throws Exception { - Assert.assertEquals("SELECT COUNT(DISTINCT *)\nFROM t", SQLUtils.format(sql, JdbcUtils.MYSQL)); + Assert.assertEquals("SELECT count(DISTINCT *)\nFROM t", SQLUtils.format(sql, JdbcUtils.MYSQL)); } public void test_oracle() throws Exception { - Assert.assertEquals("SELECT COUNT(DISTINCT *)\nFROM t", SQLUtils.format(sql, JdbcUtils.ORACLE)); - Assert.assertEquals("SELECT COUNT(DISTINCT *)\nFROM t", SQLUtils.format(sql, JdbcUtils.ALI_ORACLE)); + Assert.assertEquals("SELECT count(DISTINCT *)\nFROM t", SQLUtils.format(sql, JdbcUtils.ORACLE)); + Assert.assertEquals("SELECT count(DISTINCT *)\nFROM t", SQLUtils.format(sql, JdbcUtils.ALI_ORACLE)); } public void test_oracle_unique() throws Exception { - Assert.assertEquals("SELECT COUNT(UNIQUE *)\nFROM t", + Assert.assertEquals("SELECT count(UNIQUE *)\nFROM t", SQLUtils.format("select count(unique *) from t", JdbcUtils.ORACLE)); - Assert.assertEquals("SELECT COUNT(UNIQUE *)\nFROM t", + Assert.assertEquals("SELECT count(UNIQUE *)\nFROM t", SQLUtils.format("select count(unique *) from t", JdbcUtils.ALI_ORACLE)); } public void test_postgres() throws Exception { - Assert.assertEquals("SELECT COUNT(DISTINCT *)\nFROM t", SQLUtils.format(sql, JdbcUtils.POSTGRESQL)); + Assert.assertEquals("SELECT count(DISTINCT *)\nFROM t", SQLUtils.format(sql, JdbcUtils.POSTGRESQL)); } public void test_sql92() throws Exception { - Assert.assertEquals("SELECT COUNT(DISTINCT *)\nFROM t", SQLUtils.format(sql, null)); + Assert.assertEquals("SELECT count(DISTINCT *)\nFROM t", SQLUtils.format(sql, null)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/GroupingSetsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/GroupingSetsTest.java index b4612ade69..07f0e7fafb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/GroupingSetsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/GroupingSetsTest.java @@ -12,7 +12,7 @@ public class GroupingSetsTest extends TestCase { String result = SQLUtils.format(sql, null); - Assert.assertEquals("SELECT brand, size, SUM(sales)" + Assert.assertEquals("SELECT brand, size, sum(sales)" + "\nFROM items_sold" + "\nGROUP BY GROUPING SETS ((brand), (size), ());", result); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java index f0b35eb3b7..ee05bf3316 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java @@ -51,7 +51,7 @@ public class PagerUtilsTest_Count_MySql_0 extends TestCase { String result = PagerUtils.count(sql, JdbcConstants.MYSQL); Assert.assertEquals("SELECT COUNT(*)\n" + "FROM (\n" + - "\tSELECT type, COUNT(*)\n" + + "\tSELECT type, count(*)\n" + "\tFROM t\n" + "\tGROUP BY type\n" + ") ALIAS_COUNT", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java index 634a380d2f..3cf48c55b2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java @@ -35,7 +35,7 @@ public class PagerUtilsTest_Count_Oracle_0 extends TestCase { String result = PagerUtils.count(sql, JdbcConstants.ORACLE); Assert.assertEquals("SELECT COUNT(*)\n" + "FROM (\n" + - "\tSELECT type, COUNT(*)\n" + + "\tSELECT type, count(*)\n" + "\tFROM t\n" + "\tGROUP BY type\n" + ") ALIAS_COUNT", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_PG_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_PG_0.java index c22683aa81..97413f6b82 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_PG_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_PG_0.java @@ -35,7 +35,7 @@ public class PagerUtilsTest_Count_PG_0 extends TestCase { String result = PagerUtils.count(sql, JdbcConstants.POSTGRESQL); Assert.assertEquals("SELECT COUNT(*)\n" + "FROM (\n" + - "\tSELECT type, COUNT(*)\n" + + "\tSELECT type, count(*)\n" + "\tFROM t\n" + "\tGROUP BY type\n" + ") ALIAS_COUNT", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_SQLServer_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_SQLServer_0.java index 7465979e92..75af842af1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_SQLServer_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_SQLServer_0.java @@ -35,7 +35,7 @@ public class PagerUtilsTest_Count_SQLServer_0 extends TestCase { String result = PagerUtils.count(sql, JdbcConstants.SQL_SERVER); assertEquals("SELECT COUNT(*)\n" + "FROM (\n" + - "\tSELECT type, COUNT(*)\n" + + "\tSELECT type, count(*)\n" + "\tFROM t\n" + "\tGROUP BY type\n" + ") ALIAS_COUNT", result); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderSelectTest.java index df755afc14..ba6a2dab98 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderSelectTest.java @@ -22,11 +22,11 @@ public class BuilderSelectTest extends TestCase { String sql = builder.toString(); System.out.println(sql); - Assert.assertEquals("SELECT f1, f2, f3 AS F3, COUNT(*) AS cnt\n" + + Assert.assertEquals("SELECT f1, f2, f3 AS F3, count(*) AS cnt\n" + "FROM mytable\n" + "WHERE f1 > 0\n" + "GROUP BY f1\n" + - "HAVING COUNT(*) > 1\n" + + "HAVING count(*) > 1\n" + "ORDER BY f1, f2 DESC", sql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java index 6cd6f33218..ecb2f2ab6b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java @@ -179,7 +179,7 @@ public class DMLSelectParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("SELECT SQL_CACHE id1, MAX(id2)\nFROM tb1\nGROUP BY id1\nHAVING id1 > 10\nORDER BY id3 DESC", + Assert.assertEquals("SELECT SQL_CACHE id1, max(id2)\nFROM tb1\nGROUP BY id1\nHAVING id1 > 10\nORDER BY id3 DESC", output); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java index 48e9b46648..1137290344 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java @@ -67,7 +67,7 @@ public class DB2SelectTest_10 extends DB2Test { Assert.assertEquals("SELECT *\n" + "FROM (\n" + - "\tSELECT inner2_.*, ROWNUMBER() OVER (ORDER BY order OF inner2_) AS rownumber_\n" + + "\tSELECT inner2_.*, rownumber() OVER (ORDER BY order OF inner2_) AS rownumber_\n" + "\tFROM (\n" + "\t\tSELECT tsuserstb0_.USERID AS USERID1_1_, tsuserstb0_.CREASTAF AS CREASTAF2_1_, tsuserstb0_.CREATIME AS CREATIME3_1_, tsuserstb0_.LOCORGNO AS LOCORGNO4_1_, tsuserstb0_.PWDMODIFYTIME AS PWDMODIF5_1_\n" + "\t\t\t, tsuserstb0_.REMARK01 AS REMARK6_1_, tsuserstb0_.REMARK02 AS REMARK7_1_, tsuserstb0_.STAORGNO AS STAORGNO8_1_, tsuserstb0_.UPDASTAF AS UPDASTAF9_1_, tsuserstb0_.UPDATIME AS UPDATIM10_1_\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CobarHintsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CobarHintsTest.java index 383d064284..20e7b70ca7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CobarHintsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CobarHintsTest.java @@ -37,15 +37,15 @@ public class CobarHintsTest extends TestCase { ") b Order by product_id desc ) a limit 25 offset (1-1)*20"; String mergedSql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.POSTGRESQL); - Assert.assertEquals("SELECT product_id, noeff_days, total_cnt\n" + + Assert.assertEquals("SELECT product_id, noeff_days, total_cnt\n" + "FROM (\n" + - "\tSELECT product_id, noeff_days, COUNT(*) OVER () AS total_cnt\n" + + "\t(SELECT product_id, noeff_days, count(*) OVER () AS total_cnt\n" + "\tFROM (\n" + - "\t\tSELECT product_id, noeff_days\n" + + "\t\t(SELECT product_id, noeff_days\n" + "\t\tFROM ireport.dm_mdm_mem_prod_noeff_sdt0\n" + - "\t\tWHERE admin_member_seq = ?\n" + + "\t\tWHERE admin_member_seq = ?)\n" + "\t) b\n" + - "\tORDER BY product_id DESC\n" + + "\tORDER BY product_id DESC)\n" + ") a\n" + "LIMIT ? OFFSET (? - ?) * ?", mergedSql); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest_1.java index 1f15ad0548..d618ef8bc3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest_1.java @@ -45,7 +45,7 @@ public class MySqlReplaceTest_1 extends MysqlTest { "\t\t, if(b.song_name IS NULL, '新发布歌曲', b.song_name)\n" + "\t\t, a.play_num_1d\n" + "\tFROM (\n" + - "\t\t(SELECT pt, song_id, SUM(play_num_1d) AS `play_num_1d`\n" + + "\t\t(SELECT pt, song_id, sum(play_num_1d) AS `play_num_1d`\n" + "\t\tFROM `tb_002`\n" + "\t\tWHERE `theday` = '20170820'\n" + "\t\t\tAND `pt` IN ('android')\n" + @@ -53,7 +53,7 @@ public class MySqlReplaceTest_1 extends MysqlTest { "\t\tORDER BY `play_num_1d` DESC\n" + "\t\tLIMIT 0, 100)\n" + "\t\tUNION\n" + - "\t\t(SELECT pt, song_id, SUM(play_num_1d) AS `play_num_1d`\n" + + "\t\t(SELECT pt, song_id, sum(play_num_1d) AS `play_num_1d`\n" + "\t\tFROM `tb_002`\n" + "\t\tWHERE `theday` = '20170820'\n" + "\t\t\tAND `pt` IN ('ios')\n" + @@ -61,7 +61,7 @@ public class MySqlReplaceTest_1 extends MysqlTest { "\t\tORDER BY `play_num_1d` DESC\n" + "\t\tLIMIT 0, 100)\n" + "\t\tUNION\n" + - "\t\t(SELECT pt, song_id, SUM(play_num_1d) AS `play_num_1d`\n" + + "\t\t(SELECT pt, song_id, sum(play_num_1d) AS `play_num_1d`\n" + "\t\tFROM `tb_002`\n" + "\t\tWHERE `theday` = '20170820'\n" + "\t\t\tAND `pt` IN ('yunos')\n" + @@ -82,7 +82,7 @@ public class MySqlReplaceTest_1 extends MysqlTest { "\tFROM (\n" + "\t\tSELECT song_id, play_num_1d\n" + "\t\tFROM (\n" + - "\t\t\tSELECT song_id, SUM(play_num_1d) AS `play_num_1d`\n" + + "\t\t\tSELECT song_id, sum(play_num_1d) AS `play_num_1d`\n" + "\t\t\tFROM `tb_002`\n" + "\t\t\tWHERE `theday` = '20170820'\n" + "\t\t\tGROUP BY `song_id`\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterViewTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterViewTest_0.java index 521ff99ad0..b29becd987 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterViewTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterViewTest_0.java @@ -32,7 +32,7 @@ public class MySqlAlterViewTest_0 extends TestCase { assertEquals("ALTER DEFINER = 'ivan'@'%'\n" + "\tVIEW my_view3\n" + "AS\n" + - "SELECT COUNT(*)\n" + + "SELECT count(*)\n" + "FROM t3;", SQLUtils.toMySqlString(stmt)); assertEquals("atler definer = 'ivan'@'%'\n" + "\tview my_view3\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest2.java index a5c8d9197d..87dc6c6739 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest2.java @@ -48,7 +48,7 @@ public class MySqlCreateViewTest2 extends MysqlTest { assertEquals("CREATE VIEW revenue0\n" + "AS\n" + - "SELECT l_suppkey AS supplier_no, SUM(l_extendedprice * (1 - l_discount)) AS total_revenue\n" + + "SELECT l_suppkey AS supplier_no, sum(l_extendedprice * (1 - l_discount)) AS total_revenue\n" + "FROM lineitem\n" + "WHERE l_shipdate >= DATE '1993-01-01'\n" + "\tAND l_shipdate < DATE '1993-01-01' + INTERVAL '3' MONTH\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest4.java index fba917bca5..5cc878b086 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest4.java @@ -45,7 +45,7 @@ public class MySqlCreateViewTest4 extends MysqlTest { assertEquals("CREATE OR REPLACE DEFINER = 'ivan'@'%'\n" + "\tVIEW my_view3\n" + "AS\n" + - "SELECT COUNT(*)\n" + + "SELECT count(*)\n" + "FROM t3;", // SQLUtils.toMySqlString(stmt)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java index 069949ae47..22e4879dbd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java @@ -69,13 +69,13 @@ public class MySqlInsertTest_17 extends MysqlTest { "\t\t\t\t) c\n" + "\t\t\t\tON a.userid = c.userid\n" + "\t\t)\n" + - "\tSELECT 'col_1' AS cname, col_1 AS cvalue, SUM(orders_week) AS orders\n" + - "\t\t, COUNT(userid) AS users\n" + + "\tSELECT 'col_1' AS cname, col_1 AS cvalue, sum(orders_week) AS orders\n" + + "\t\t, count(userid) AS users\n" + "\tFROM h\n" + "\tGROUP BY col_1\n" + "\tUNION ALL\n" + - "\tSELECT 'col_2' AS cname, col_2 AS cvalue, SUM(orders_week) AS orders\n" + - "\t\t, COUNT(userid) AS users\n" + + "\tSELECT 'col_2' AS cname, col_2 AS cvalue, sum(orders_week) AS orders\n" + + "\t\t, count(userid) AS users\n" + "\tFROM h\n" + "\tGROUP BY col_2\n" + ") x"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java index 7872bb344c..0ad9fb16c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java @@ -87,7 +87,7 @@ public class MySqlInsertTest_43 extends TestCase { "\t, CAST(20190115 AS bigint) AS sys_ds, str_to_date('2019-01-15 21:51:00', '%Y-%m-%d %H:%i:%s') AS sys_biztime, now() AS sys_gmt_modified\n" + "\t, CAST(businessType AS varchar) AS business_type, CAST(parcelledOrderNum AS bigint) AS parcelled_order_num, CAST(warehouseId AS varchar) AS warehouse_id\n" + "FROM (\n" + - "\tSELECT CAST(t1.warehouse_id AS varchar) AS warehouseId, t2.businessType, COUNT(1) AS parcelledOrderNum\n" + + "\tSELECT CAST(t1.warehouse_id AS varchar) AS warehouseId, t2.businessType, count(1) AS parcelledOrderNum\n" + "\tFROM sales_order t1\n" + "\t\tJOIN (\n" + "\t\t\tSELECT t2_1.warehouse_id, t2_1.external_batch_code\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_1.java index a01d333353..6eedb36b3b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_1.java @@ -86,18 +86,18 @@ public class mysql_block_1 extends OracleTest { "\t, `physical_read_requests`, `\n" + "physical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + "SELECT `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`\n" + - "\t, SUM(`cpu_time`), SUM(`buffer_gets`)\n" + - "\t, SUM(`executions`), MAX(`command_name`)\n" + - "\t, SUM(`sharable_mem`), SUM(`\n" + + "\t, sum(`cpu_time`), sum(`buffer_gets`)\n" + + "\t, sum(`executions`), max(`command_name`)\n" + + "\t, sum(`sharable_mem`), sum(`\n" + "persistent_mem`)\n" + - "\t, SUM(`users_opening`), SUM(`fetches`)\n" + - "\t, SUM(`loads`), SUM(`disk_reads`)\n" + - "\t, SUM(`direct_writes`), MAX(`command_type`)\n" + - "\t, MAX(`plan_hash_value`), MAX(`action`)\n" + - "\t, MAX(`remote`), MAX(`is_obsolete`)\n" + - "\t, SUM(`physical_read_requests`), SUM(`physical_write_requests`)\n" + - "\t, SUM(`elapsed_time`), SUM(`user_io_wait_time`)\n" + - "\t, MAX(`collection_time`)\n" + + "\t, sum(`users_opening`), sum(`fetches`)\n" + + "\t, sum(`loads`), sum(`disk_reads`)\n" + + "\t, sum(`direct_writes`), max(`command_type`)\n" + + "\t, max(`plan_hash_value`), max(`action`)\n" + + "\t, max(`remote`), max(`is_obsolete`)\n" + + "\t, sum(`physical_read_requests`), sum(`physical_write_requests`)\n" + + "\t, sum(`elapsed_time`), sum(`user_io_wait_time`)\n" + + "\t, max(`collection_time`)\n" + "FROM ktv_sqlarea\n" + "WHERE dbid = ?\n" + "GROUP BY sql_fulltext;\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_2.java index d176c0f1d1..b69cd1cacc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_2.java @@ -86,18 +86,18 @@ public class mysql_block_2 extends OracleTest { "\t, `physical_read_requests`, `\n" + "physical_write_requests`, `elapsed_time`, `user_io_wait_time`, `collection_time`)\n" + "SELECT `dbid`, `sql_id`, `parsing_schema_name`, `sql_fulltext`\n" + - "\t, SUM(`cpu_time`), SUM(`buffer_gets`)\n" + - "\t, SUM(`executions`), MAX(`command_name`)\n" + - "\t, SUM(`sharable_mem`), SUM(`\n" + + "\t, sum(`cpu_time`), sum(`buffer_gets`)\n" + + "\t, sum(`executions`), max(`command_name`)\n" + + "\t, sum(`sharable_mem`), sum(`\n" + "persistent_mem`)\n" + - "\t, SUM(`users_opening`), SUM(`fetches`)\n" + - "\t, SUM(`loads`), SUM(`disk_reads`)\n" + - "\t, SUM(`direct_writes`), MAX(`command_type`)\n" + - "\t, MAX(`plan_hash_value`), MAX(`action`)\n" + - "\t, MAX(`remote`), MAX(`is_obsolete`)\n" + - "\t, SUM(`physical_read_requests`), SUM(`physical_write_requests`)\n" + - "\t, SUM(`elapsed_time`), SUM(`user_io_wait_time`)\n" + - "\t, MAX(`collection_time`)\n" + + "\t, sum(`users_opening`), sum(`fetches`)\n" + + "\t, sum(`loads`), sum(`disk_reads`)\n" + + "\t, sum(`direct_writes`), max(`command_type`)\n" + + "\t, max(`plan_hash_value`), max(`action`)\n" + + "\t, max(`remote`), max(`is_obsolete`)\n" + + "\t, sum(`physical_read_requests`), sum(`physical_write_requests`)\n" + + "\t, sum(`elapsed_time`), sum(`user_io_wait_time`)\n" + + "\t, max(`collection_time`)\n" + "FROM ktv_sqlarea\n" + "WHERE dbid = ?\n" + "GROUP BY sql_fulltext;\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_27.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_27.java index d7e4f6dfa6..4d3b75ba12 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_27.java @@ -22,7 +22,7 @@ public class MySqlParameterizedOutputVisitorTest_27 extends TestCase { String sql = "SELECT `xxx_reverse_od`.dept, count(*) from xxx_reverse_od_0446 `xxx_reverse_od` where `xxx_reverse_od`.name=1 group by `xxx_reverse_od`.dept order by `xxx_reverse_od`.dept"; String psql = ParameterizedOutputVisitorUtils.parameterize(sql, dbType); - assertEquals("SELECT `xxx_reverse_od`.dept, COUNT(*)\n" + + assertEquals("SELECT `xxx_reverse_od`.dept, count(*)\n" + "FROM xxx_reverse_od `xxx_reverse_od`\n" + "WHERE `xxx_reverse_od`.name = ?\n" + "GROUP BY `xxx_reverse_od`.dept\n" + @@ -52,7 +52,7 @@ public class MySqlParameterizedOutputVisitorTest_27 extends TestCase { visitor1.setParameters(visitor.getParameters()); stmt.accept(visitor1); - assertEquals("SELECT `xxx_reverse_od`.dept, COUNT(*)\n" + + assertEquals("SELECT `xxx_reverse_od`.dept, count(*)\n" + "FROM xxx_reverse_od_0446 `xxx_reverse_od`\n" + "WHERE `xxx_reverse_od`.name = ?\n" + "GROUP BY `xxx_reverse_od`.dept\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_28.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_28.java index 914b159ccd..cdf1b58b5c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_28.java @@ -22,7 +22,7 @@ public class MySqlParameterizedOutputVisitorTest_28 extends TestCase { String sql = "SELECT `xxx_reverse_od`.dept, count(*) from xxx_reverse_od_0446 `xxx_reverse_od` join abc_xx_abc `aa` on `xxx_reverse_od`.id = `aa`.id"; String psql = ParameterizedOutputVisitorUtils.parameterize(sql, dbType); - assertEquals("SELECT `xxx_reverse_od`.dept, COUNT(*)\n" + + assertEquals("SELECT `xxx_reverse_od`.dept, count(*)\n" + "FROM xxx_reverse_od `xxx_reverse_od`\n" + "\tJOIN abc_xx_abc `aa` ON `xxx_reverse_od`.id = `aa`.id", psql); @@ -50,7 +50,7 @@ public class MySqlParameterizedOutputVisitorTest_28 extends TestCase { visitor1.setParameters(visitor.getParameters()); stmt.accept(visitor1); - assertEquals("SELECT `xxx_reverse_od`.dept, COUNT(*)\n" + + assertEquals("SELECT `xxx_reverse_od`.dept, count(*)\n" + "FROM xxx_reverse_od_0446 `xxx_reverse_od`\n" + "\tJOIN abc_xx_abc `aa` ON `xxx_reverse_od`.id = `aa`.id", buf.toString()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_32.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_32.java index 30bcf373e3..1837ce64af 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_32.java @@ -26,7 +26,7 @@ public class MySqlParameterizedOutputVisitorTest_32 extends TestCase { ") as miao_sale_ledger_0060 where `miao_sale_ledger_0060`.`env_type` = 3"; String psql = ParameterizedOutputVisitorUtils.parameterize(sql, dbType); - assertEquals("SELECT COUNT(*) AS count\n" + + assertEquals("SELECT count(*) AS count\n" + "FROM (\n" + "\t(SELECT env_type\n" + "\tFROM `tmall_miaoscm`.miao_sale_ledger\n" + @@ -68,7 +68,7 @@ public class MySqlParameterizedOutputVisitorTest_32 extends TestCase { visitor1.setInputParameters(visitor.getParameters()); pstmt.accept(visitor1); - assertEquals("SELECT COUNT(*) AS count\n" + + assertEquals("SELECT count(*) AS count\n" + "FROM (\n" + "\t(SELECT env_type\n" + "\tFROM `tmall_miaoscm`.miao_sale_ledger\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_48_aggregate.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_48_aggregate.java index 3a65e0a226..9614370568 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_48_aggregate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_48_aggregate.java @@ -41,7 +41,7 @@ public class MySqlParameterizedOutputVisitorTest_48_aggregate extends TestCase { System.out.println(psql); - assertEquals("SELECT COUNT(1)\n" + + assertEquals("SELECT count(1)\n" + "FROM t", psql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_114.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_114.java index 405b3c5a15..3ceacff202 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_114.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_114.java @@ -48,7 +48,7 @@ public class MySqlSelectTest_114 extends TestCase { assertEquals(1, visitor.getConditions().size()); assertEquals(1, visitor.getOrderByColumns().size()); - assertEquals("SELECT COUNT(0)\n" + + assertEquals("SELECT count(0)\n" + "FROM (\n" + "\tSELECT id\n" + "\tFROM auth\n" + @@ -59,7 +59,7 @@ public class MySqlSelectTest_114 extends TestCase { ") total", stmt.toString()); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL); - assertEquals("SELECT COUNT(0)\n" + + assertEquals("SELECT count(0)\n" + "FROM (\n" + "\tSELECT id\n" + "\tFROM auth\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_147_huizhi.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_147_huizhi.java index 721d45f959..c3f0702a1c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_147_huizhi.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_147_huizhi.java @@ -31,7 +31,7 @@ public class MySqlSelectTest_147_huizhi extends MysqlTest { assertEquals(1, statementList.size()); assertEquals("INSERT INTO hz_dev_hb.tb_tmp_cda_opera_281c (target, appeartimes, source_id)\n" + - "SELECT VARCHAR20, COUNT(1) AS appeartimes, 'resource_count1' AS source_id\n" + + "SELECT VARCHAR20, count(1) AS appeartimes, 'resource_count1' AS source_id\n" + "FROM hz_dev_hb.tb_fxzx_large t1\n" + "WHERE 1 = 1\n" + "\tAND VARCHAR20 IS NOT NULL\n" + @@ -39,7 +39,7 @@ public class MySqlSelectTest_147_huizhi extends MysqlTest { "GROUP BY VARCHAR20", stmt.toString()); assertEquals("INSERT INTO hz_dev_hb.tb_tmp_cda_opera_281c(target, appeartimes, source_id)\n" + - "SELECT VARCHAR20, COUNT(1) AS appeartimes, ? AS source_id\n" + + "SELECT VARCHAR20, count(1) AS appeartimes, ? AS source_id\n" + "FROM hz_dev_hb.tb_fxzx_large t1\n" + "WHERE 1 = 1\n" + "\tAND VARCHAR20 IS NOT NULL\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_186.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_186.java index 2263405115..ae24391434 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_186.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_186.java @@ -53,7 +53,7 @@ public class MySqlSelectTest_186 extends MysqlTest { assertTrue(visitor.containsColumn("auth_tenant", "name")); String output = SQLUtils.toMySqlString(stmt); - assertEquals("SELECT COUNT(0)\n" + + assertEquals("SELECT count(0)\n" + "FROM (\n" + "\tSELECT *\n" + "\tFROM auth_tenant\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_187.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_187.java index 4f63a8500e..0fba649444 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_187.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_187.java @@ -62,7 +62,7 @@ public class MySqlSelectTest_187 extends MysqlTest { System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(2, visitor.getTables().size()); - assertEquals(15, visitor.getColumns().size()); + assertEquals(14, visitor.getColumns().size()); assertEquals(10, visitor.getConditions().size()); assertEquals(1, visitor.getOrderByColumns().size()); @@ -72,14 +72,14 @@ public class MySqlSelectTest_187 extends MysqlTest { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT coach_id, tournament_name, tournament_id, season_id, season\n" + - "\t, COUNT(1) AS num, SUM(CASE \n" + + "\t, count(1) AS num, sum(CASE \n" + "\t\tWHEN wdl = 0 THEN 1\n" + "\t\tELSE 0\n" + "\tEND) AS loss\n" + - "\t, SUM(CASE \n" + + "\t, sum(CASE \n" + "\t\tWHEN wdl = 1 THEN 1\n" + "\t\tELSE 0\n" + - "\tEND) AS draw, SUM(CASE \n" + + "\tEND) AS draw, sum(CASE \n" + "\t\tWHEN wdl = 3 THEN 1\n" + "\t\tELSE 0\n" + "\tEND) AS win\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java index 5dace80ce2..360df28415 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java @@ -62,9 +62,9 @@ public class MySqlSelectTest_20 extends MysqlTest { String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("SELECT bsvariety, MAX(bsh) AS bsh, MIN(bsl) AS bsl" - + "\nFROM exchange_market_info" - + "\nWHERE bsdate > date_sub(now(), INTERVAL 1 DAY)" - + "\nGROUP BY bsvariety DESC;", output); + Assert.assertEquals("SELECT bsvariety, max(bsh) AS bsh, min(bsl) AS bsl\n" + + "FROM exchange_market_info\n" + + "WHERE bsdate > date_sub(now(), INTERVAL 1 DAY)\n" + + "GROUP BY bsvariety DESC;", output); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_40.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_40.java index b121d4129b..43776d6be6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_40.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_40.java @@ -51,7 +51,7 @@ public class MySqlSelectTest_40 extends MysqlTest { { String output = SQLUtils.toMySqlString(stmt); Assert.assertEquals("/*0abcde*/\n" + - "SELECT MAX(id)\n" + + "SELECT max(id)\n" + "FROM base_request_log", // output); } @@ -64,7 +64,7 @@ public class MySqlSelectTest_40 extends MysqlTest { { String output = SQLUtils.toMySqlString(stmt, new SQLUtils.FormatOption(true, true, true)); - Assert.assertEquals("SELECT MAX(id)\n" + + Assert.assertEquals("SELECT max(id)\n" + "FROM base_request_log", // output); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_41.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_41.java index da64a0f674..ded1959dc5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_41.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_41.java @@ -50,7 +50,7 @@ public class MySqlSelectTest_41 extends MysqlTest { { String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("/*0abcde*/\nSELECT MAX(id)\n" + + Assert.assertEquals("/*0abcde*/\nSELECT max(id)\n" + "FROM base_request_log", // output); } @@ -64,7 +64,7 @@ public class MySqlSelectTest_41 extends MysqlTest { { String output = SQLUtils.toMySqlString(stmt, new SQLUtils.FormatOption(true, true, true)); - Assert.assertEquals("SELECT MAX(id)\n" + + Assert.assertEquals("SELECT max(id)\n" + "FROM base_request_log", // output); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_48_union.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_48_union.java index c09c377900..94ffe6e6e3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_48_union.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_48_union.java @@ -67,7 +67,7 @@ public class MySqlSelectTest_48_union extends MysqlTest { { String output = SQLUtils.toMySqlString(stmt); - assertEquals("SELECT SUM(hd.paid_amount)\n" + + assertEquals("SELECT sum(hd.paid_amount)\n" + "FROM (\n" + "\tSELECT 'fl', CAST(a.hosted_ymd AS date) AS hosted_ymd, a.user_id, 'boss1', a.paid_amount\n" + "\t\t, m.user_id, m.create_date, m.pmcode, n.type_name, n.product_name\n" + @@ -154,7 +154,7 @@ public class MySqlSelectTest_48_union extends MysqlTest { { String output = SQLUtils.toMySqlString(stmt, new SQLUtils.FormatOption(true, true, true)); - assertEquals("SELECT SUM(hd.paid_amount)\n" + + assertEquals("SELECT sum(hd.paid_amount)\n" + "FROM (\n" + "\tSELECT ?, CAST(a.hosted_ymd AS date) AS hosted_ymd, a.user_id, ?, a.paid_amount\n" + "\t\t, m.user_id, m.create_date, m.pmcode, n.type_name, n.product_name\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_55.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_55.java index fc032693b7..c0bf5602ec 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_55.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_55.java @@ -56,7 +56,7 @@ public class MySqlSelectTest_55 extends MysqlTest { { String output = SQLUtils.toMySqlString(stmt); - assertEquals("SELECT COUNT(0)\n" + + assertEquals("SELECT count(0)\n" + "FROM tb_user\n" + "WHERE (login_name LIKE '%j%'\n" + "\t\tAND v_sort BETWEEN 1 AND 10)\n" + @@ -77,7 +77,7 @@ public class MySqlSelectTest_55 extends MysqlTest { { String output = SQLUtils.toMySqlString(stmt, new SQLUtils.FormatOption(true, true, true)); - assertEquals("SELECT COUNT(0)\n" + + assertEquals("SELECT count(0)\n" + "FROM tb_user\n" + "WHERE (login_name LIKE ?\n" + "\t\tAND v_sort BETWEEN ? AND ?)\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_63_alias.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_63_alias.java index 69325ad9b9..1282ac0d17 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_63_alias.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_63_alias.java @@ -55,7 +55,7 @@ public class MySqlSelectTest_63_alias extends MysqlTest { assertEquals("SELECT totalNumber\n" + "\t, concat('', ?, round(memberNumber, 0), '') AS totalDisplay\n" + "FROM (\n" + - "\tSELECT COUNT(1) AS totalNumber, SUM(memberNumber) AS memberNumber\n" + + "\tSELECT count(1) AS totalNumber, SUM(memberNumber) AS memberNumber\n" + "\tFROM (\n" + "\t\tSELECT mmd.office_id AS departID, st.no AS staffNO, st.name AS staffName, COUNT(mmd.id) AS memberNumber\n" + "\t\tFROM ms_member_def mmd\n" + @@ -102,7 +102,7 @@ public class MySqlSelectTest_63_alias extends MysqlTest { assertEquals("SELECT totalNumber\n" + "\t, concat(?, ?, round(memberNumber, ?), ?) AS totalDisplay\n" + "FROM (\n" + - "\tSELECT COUNT(1) AS totalNumber, SUM(memberNumber) AS memberNumber\n" + + "\tSELECT count(1) AS totalNumber, SUM(memberNumber) AS memberNumber\n" + "\tFROM (\n" + "\t\tSELECT mmd.office_id AS departID, st.no AS staffNO, st.name AS staffName, COUNT(mmd.id) AS memberNumber\n" + "\t\tFROM ms_member_def mmd\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Topk.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Topk.java index c214e0cda1..c11a2e3411 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Topk.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Topk.java @@ -35,11 +35,11 @@ public class OceanbaseHintTest_Topk extends MysqlTest { SQLStatement stmt = stmtList.get(0); String result = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("SELECT /*+ topk(90 1000) */ SUM(c2), c1" - + "\nFROM t1" - + "\nGROUP BY c1" - + "\nORDER BY SUM(c2)" - + "\nLIMIT 10", result); + Assert.assertEquals("SELECT /*+ topk(90 1000) */ sum(c2), c1\n" + + "FROM t1\n" + + "GROUP BY c1\n" + + "ORDER BY sum(c2)\n" + + "LIMIT 10", result); print(stmtList); Assert.assertEquals(1, stmtList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java index d9d8b7b03c..d9e77f3d3d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java @@ -35,7 +35,7 @@ public class OceanbaseHintTest_parallel extends MysqlTest { SQLStatement stmt = stmtList.get(0); String result = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("SELECT /*+ parallel(5) */ COUNT(*)" + Assert.assertEquals("SELECT /*+ parallel(5) */ count(*)" + "\nFROM t1;", result); print(stmtList); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest22.java index 36112f4a61..e6b2a3c4a4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest22.java @@ -20,7 +20,7 @@ public class OdpsFormatCommentTest22 extends TestCase { } public void test_count() throws Exception { String sql = "select count(*) from dual"; - Assert.assertEquals("SELECT COUNT(*)" + Assert.assertEquals("SELECT count(*)" + "\nFROM dual", SQLUtils.formatOdps(sql)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsIfTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsIfTest.java index 53e53bb095..79a737374d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsIfTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsIfTest.java @@ -10,7 +10,7 @@ public class OdpsIfTest extends TestCase { public void test_if() throws Exception { String sql = "select sum(if(a > 0, 1, 0)) from t1"; - Assert.assertEquals("SELECT SUM(IF(a > 0, 1, 0))" // + Assert.assertEquals("SELECT sum(IF(a > 0, 1, 0))" // + "\nFROM t1", SQLUtils.formatOdps(sql)); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest13.java index ca5d2480cb..c3acb33180 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest13.java @@ -45,7 +45,7 @@ public class OdpsSelectTest13 extends TestCase { stmt.accept(visitor); // System.out.println("Tables : " + visitor.getTables()); -// System.out.println("fields : " + visitor.getColumns()); + System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); @@ -53,7 +53,7 @@ public class OdpsSelectTest13 extends TestCase { Assert.assertEquals(1, visitor.getColumns().size()); Assert.assertEquals(0, visitor.getConditions().size()); - Assert.assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); + assertTrue(visitor.containsColumn("abc", "name")); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest17.java index 3c64d0a93f..b7790d72c3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest17.java @@ -49,7 +49,7 @@ public class OdpsSelectTest17 extends TestCase { "\tAND prov IN (\n" + "\t\tSELECT prov\n" + "\t\tFROM (\n" + - "\t\t\tSELECT prov, SUM(cnt) AS cnt\n" + + "\t\t\tSELECT prov, sum(cnt) AS cnt\n" + "\t\t\tFROM mock_app.adl_mock_v_fct\n" + "\t\t\tWHERE ds = 20160920\n" + "\t\t\tGROUP BY prov\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest19.java index d461eeba17..9f5e7c1d30 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest19.java @@ -31,7 +31,7 @@ public class OdpsSelectTest19 extends TestCase { putLong(bytes, 0, 1095288847322L); // 1095288847322 String sql = "select wm_concat(distinct ',', name) from mytable";// - Assert.assertEquals("SELECT WM_CONCAT(DISTINCT ',', name)\n" + + Assert.assertEquals("SELECT wm_concat(DISTINCT ',', name)\n" + "FROM mytable", SQLUtils.formatOdps(sql)); Assert.assertEquals("select wm_concat(DISTINCT ',', name)\n" + "from mytable", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest21.java index 883fc7fcd0..a86a367f84 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest21.java @@ -29,7 +29,7 @@ public class OdpsSelectTest21 extends TestCase { public void test_select() throws Exception { // 1095288847322 String sql = "select wm_concat(',', a) from values('abc', 1), (null, 2) t (a, i);";// - Assert.assertEquals("SELECT WM_CONCAT(',', a)\n" + + Assert.assertEquals("SELECT wm_concat(',', a)\n" + "FROM VALUES ('abc', 1), (NULL, 2) t (a, i);", SQLUtils.formatOdps(sql)); Assert.assertEquals("select wm_concat(',', a)\n" + "from values ('abc', 1), (null, 2) t (a, i);", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest22.java index b436ec8f49..23b77b5fc1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest22.java @@ -55,18 +55,18 @@ public class OdpsSelectTest22 extends TestCase { "where UT.ad_clk > 0 or CLK.clk > 0\n" + ") A\n" + "group by bucket_id;";// - assertEquals("SELECT bucket_id, SUM(pv) AS pv, SUM(clk) AS clk\n" + - "\t, SUM(clk) / (SUM(pv) + 1e-10) AS ctr\n" + - "\t, SUM(ut_ad_clk) AS ut_ad_clk, SUM(ad_clk) AS ad_clk\n" + - "\t, SUM(cost) AS cost\n" + - "\t, SUM(cost) * 1000 / (SUM(pv) + 1e-10) / 100 AS rpm\n" + + assertEquals("SELECT bucket_id, sum(pv) AS pv, sum(clk) AS clk\n" + + "\t, sum(clk) / (sum(pv) + 1e-10) AS ctr\n" + + "\t, sum(ut_ad_clk) AS ut_ad_clk, sum(ad_clk) AS ad_clk\n" + + "\t, sum(cost) AS cost\n" + + "\t, sum(cost) * 1000 / (sum(pv) + 1e-10) / 100 AS rpm\n" + "FROM (\n" + "\tSELECT bucket_id, UT.pv AS pv, UT.clk AS clk, UT.ad_clk AS ut_ad_clk, CLK.clk AS ad_clk\n" + "\t\t, CLK.cost AS cost\n" + "\tFROM (\n" + - "\t\tSELECT item_id, pv_id, SUM(pv) AS pv\n" + - "\t\t\t, SUM(clk) AS clk\n" + - "\t\t\t, SUM(IF(str_to_map(args, ',', '=')['sid'] IS NOT NULL, clk, 0)) AS ad_clk\n" + + "\t\tSELECT item_id, pv_id, sum(pv) AS pv\n" + + "\t\t\t, sum(clk) AS clk\n" + + "\t\t\t, sum(IF(str_to_map(args, ',', '=')['sid'] IS NOT NULL, clk, 0)) AS ad_clk\n" + "\t\t\t, str_to_map(args, ',', '=')['sid'] AS ad_session, split_part(str_to_map(args, ',', '=')['scm'], '.', 2) AS bucket_id\n" + "\t\tFROM alimama_algo.fund_mlr_n_chicago_user_track_distinct_shark\n" + "\t\tWHERE ds = 20170627\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest25.java index 454752d64a..0e983d24b8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest25.java @@ -59,15 +59,15 @@ public class OdpsSelectTest25 extends TestCase { "GROUP BY tt.os,\n" + " tt.ver;";// assertEquals("INSERT OVERWRITE TABLE ids_openapp_dau_d PARTITION (dt='${lastday}')\n" + - "SELECT tt.os, tt.ver, COUNT(1) AS tt_user\n" + - "\t, SUM(tt.tt_cnt) AS tt_cnt\n" + - "\t, COUNT(IF(tt.tmp_cnt > 0, 1, NULL)) AS tmp_user\n" + - "\t, SUM(tt.tmp_cnt) AS tmp_cnt\n" + - "\t, COUNT(IF(tt.formal_cnt > 0, 1, NULL)) AS formal_user\n" + - "\t, SUM(tt.formal_cnt) AS formal_cnt\n" + + "SELECT tt.os, tt.ver, count(1) AS tt_user\n" + + "\t, sum(tt.tt_cnt) AS tt_cnt\n" + + "\t, count(IF(tt.tmp_cnt > 0, 1, NULL)) AS tmp_user\n" + + "\t, sum(tt.tmp_cnt) AS tmp_cnt\n" + + "\t, count(IF(tt.formal_cnt > 0, 1, NULL)) AS formal_user\n" + + "\t, sum(tt.formal_cnt) AS formal_cnt\n" + "FROM (\n" + - "\tSELECT t1.uid, t2.os, t3.ver, COUNT(1) AS tt_cnt\n" + - "\t\t, COUNT(t1.tmp) AS tmp_cnt, COUNT(t1.formal) AS formal_cnt\n" + + "\tSELECT t1.uid, t2.os, t3.ver, count(1) AS tt_cnt\n" + + "\t\t, count(t1.tmp) AS tmp_cnt, count(t1.formal) AS formal_cnt\n" + "\tFROM (\n" + "\t\tSELECT uid, array(pv, 'all') AS os\n" + "\t\t\t, array(v, 'all') AS ver\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest26.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest26.java index 38c7436340..e131ebae78 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest26.java @@ -34,7 +34,7 @@ public class OdpsSelectTest26 extends TestCase { " and process in('preCheckMobile','VerifyScrollCheckcode','SendMobileCheckcode','VerifyMobile',\n" + " 'VerifyMobileCheckCode','VerifyNick','VerifyPasswordFormat','register','CheckMobileConflict','VerifyEmail') \n" + " group by process,value5";// - assertEquals("SELECT COUNT(DISTINCT trackid) AS total, process, value5 AS result\n" + + assertEquals("SELECT count(DISTINCT trackid) AS total, process, value5 AS result\n" + "FROM havanaapp.s_register_process_log\n" + "WHERE ds = '20170706'\n" + "\tAND value6 = 'MOBILE_TB'\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows.java index 7bd57d899f..6294c5b668 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows.java @@ -28,7 +28,7 @@ public class OdpsSelectTest_over_rows extends TestCase { public void test_select() throws Exception { String sql = "SELECT sum(c) over(order by ds rows 9999 preceding) s, ds FROM t1";// - assertEquals("SELECT SUM(c) OVER (ORDER BY ds ROWS 9999 PRECEDING) AS s, ds\n" + + assertEquals("SELECT sum(c) OVER (ORDER BY ds ROWS 9999 PRECEDING) AS s, ds\n" + "FROM t1", SQLUtils.formatOdps(sql)); Assert.assertEquals("select sum(c) over (order by ds rows 9999 preceding) as s, ds\n" + "from t1", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_3.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_3.java index 779bccb897..6c513b8783 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_3.java @@ -28,7 +28,7 @@ public class OdpsSelectTest_over_rows_3 extends TestCase { public void test_select() throws Exception { String sql = "SELECT sum(c) over(order by ds rows current row) s, ds FROM t1";// - Assert.assertEquals("SELECT SUM(c) OVER (ORDER BY ds ROWS CURRENT ROW) AS s, ds\n" + + Assert.assertEquals("SELECT sum(c) OVER (ORDER BY ds ROWS CURRENT ROW) AS s, ds\n" + "FROM t1", SQLUtils.formatOdps(sql)); Assert.assertEquals("select sum(c) over (order by ds rows current row) as s, ds\n" + "from t1", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_4.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_4.java index 33d9ff4509..c2bb5546f3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_4.java @@ -28,7 +28,7 @@ public class OdpsSelectTest_over_rows_4 extends TestCase { public void test_select() throws Exception { String sql = "SELECT sum(c) over(order by ds rows UNBOUNDED PRECEDING) s, ds FROM t1";// - Assert.assertEquals("SELECT SUM(c) OVER (ORDER BY ds ROWS UNBOUNDED PRECEDING) AS s, ds\n" + + Assert.assertEquals("SELECT sum(c) OVER (ORDER BY ds ROWS UNBOUNDED PRECEDING) AS s, ds\n" + "FROM t1", SQLUtils.formatOdps(sql)); Assert.assertEquals("select sum(c) over (order by ds rows unbounded preceding) as s, ds\n" + "from t1", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_5.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_5.java index a9fe3d9f8f..23e4365c8e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_5.java @@ -28,7 +28,7 @@ public class OdpsSelectTest_over_rows_5 extends TestCase { public void test_select() throws Exception { String sql = "SELECT sum(c) over(order by ds rows UNBOUNDED following) s, ds FROM t1";// - Assert.assertEquals("SELECT SUM(c) OVER (ORDER BY ds ROWS UNBOUNDED FOLLOWING) AS s, ds\n" + + Assert.assertEquals("SELECT sum(c) OVER (ORDER BY ds ROWS UNBOUNDED FOLLOWING) AS s, ds\n" + "FROM t1", SQLUtils.formatOdps(sql)); Assert.assertEquals("select sum(c) over (order by ds rows unbounded following) as s, ds\n" + "from t1", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java index c053458237..ead9b157c3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java @@ -36,7 +36,7 @@ public class OracleGroupingSetTest extends TestCase { + "( calendar_month_desc, co.country_id) );\n"; String expected = "SELECT channel_desc, calendar_month_desc, co.country_id\n" + - "\t, TO_CHAR(SUM(amount_sold), '9,999,999,999') AS SALES$\n" + + "\t, TO_CHAR(sum(amount_sold), '9,999,999,999') AS SALES$\n" + "FROM sales, customers, times, channels, countries co\n" + "WHERE sales.time_id = times.time_id\n" + "\tAND sales.cust_id = customers.cust_id\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetsTest.java index b41ca0f500..1bba8cecf8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetsTest.java @@ -23,7 +23,7 @@ public class OracleGroupingSetsTest extends OracleTest { print(statementList); Assert.assertEquals(1, statementList.size()); - Assert.assertEquals("SELECT department_id, job_id, AVG(salary)" + Assert.assertEquals("SELECT department_id, job_id, avg(salary)" + "\nFROM hr.employees" + "\nGROUP BY GROUPING SETS ((department_id, job_id));", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest1.java index bd3dfb19a3..512a9e0fc8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest1.java @@ -36,7 +36,7 @@ public class OracleListAggTest1 extends OracleTest { Assert.assertEquals(1, statementList.size()); - Assert.assertEquals("SELECT COUNT(0)\n" + + Assert.assertEquals("SELECT count(0)\n" + "FROM WEP_USER T\n" + "\tLEFT JOIN (\n" + "\t\tSELECT T.ID, LISTAGG(T2.ROLE_NAME, ',') WITHIN GROUP (ORDER BY T.ID) AS ROLENAMES\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest0.java index e11d82d110..f4d3939089 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest0.java @@ -52,7 +52,7 @@ public class OracleCreateMaterializedViewTest0 extends OracleTest { assertEquals("CREATE MATERIALIZED VIEW sales_summary\n" + "AS\n" + - "SELECT seller_no, invoice_date, SUM(invoice_amt) AS sales_amt\n" + + "SELECT seller_no, invoice_date, sum(invoice_amt) AS sales_amt\n" + "FROM invoice\n" + "WHERE invoice_date < CURRENT_DATE\n" + "GROUP BY seller_no, invoice_date\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTableTest78.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTableTest78.java index 8217d4781d..c17597be15 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTableTest78.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTableTest78.java @@ -117,7 +117,7 @@ public class OracleCreateTableTest78 extends OracleTest { "\t, TCP_EPM.EPM_TB_CONTRACT_EX.sIsLastChecked AS sIsLastChecked\n" + "\t, CASE \n" + "\t\tWHEN (\n" + - "\t\t\tSELECT COUNT(*)\n" + + "\t\t\tSELECT count(*)\n" + "\t\t\tFROM EPM_TBL_ENGINE_PROJECT, EPM_TBL_SUBCONTRACT_DISPATCH\n" + "\t\t\tWHERE EPM_TBL_ENGINE_PROJECT.CONTRACTID = EPM_TBL_CONTRACT.Oid\n" + "\t\t\t\tAND EPM_TBL_ENGINE_PROJECT.OID = EPM_TBL_SUBCONTRACT_DISPATCH.ENGINEID\n" + @@ -126,7 +126,7 @@ public class OracleCreateTableTest78 extends OracleTest { "\tEND AS sIsOutSource\n" + "\t, CASE \n" + "\t\tWHEN (\n" + - "\t\t\tSELECT COUNT(*)\n" + + "\t\t\tSELECT count(*)\n" + "\t\t\tFROM TCP_EPM.EPM_TBL_RECONSIGN_RECONSIGN\n" + "\t\t\tWHERE TCP_EPM.EPM_TBL_RECONSIGN_RECONSIGN.CONTRACTID = EPM_TBL_CONTRACT.Oid\n" + "\t\t) > 0 THEN '/'\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest11.java index 5b72e5c097..49e64d75d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest11.java @@ -69,7 +69,7 @@ public class OracleSelectTest11 extends OracleTest { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("IMAGE_REPOSITORY"))); - Assert.assertEquals(17, visitor.getColumns().size()); + Assert.assertEquals(7, visitor.getColumns().size()); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("IMAGE_REPOSITORY", "rowid"))); Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("IMAGE_REPOSITORY", "COMPANY_ID"))); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest124.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest124.java index 635cc336b6..83362f2dd8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest124.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest124.java @@ -42,7 +42,7 @@ public class OracleSelectTest124 extends TestCase { SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); - assertEquals("SELECT J01.COL_A, J01.COL_B, SUM(J01.COL_C) OVER (PARTITION BY J01.COL_A ORDER BY J01.COL_B NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS COL_C\n" + + assertEquals("SELECT J01.COL_A, J01.COL_B, \"SUM\"(J01.COL_C) OVER (PARTITION BY J01.COL_A ORDER BY J01.COL_B NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS COL_C\n" + "FROM TAB_A J01", stmt.toString()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest37.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest37.java index 7d6f66242d..457677beae 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest37.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest37.java @@ -40,7 +40,7 @@ public class OracleSelectTest37 extends OracleTest { List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - Assert.assertEquals("SELECT resource_value, COUNT(resource_value) AS nums, http_method" + Assert.assertEquals("SELECT resource_value, count(resource_value) AS nums, http_method" + "\nFROM (" + "\n\tSELECT *" + "\n\tFROM audit_url_log" @@ -49,7 +49,7 @@ public class OracleSelectTest37 extends OracleTest { + "\n\t\tAND to_char(begin_time, 'yyyy-MM-dd') <= ?" + "\n)" + "\nGROUP BY resource_value, http_method" - + "\nHAVING COUNT(resource_value) >= ?", SQLUtils.toOracleString(stmt)); + + "\nHAVING count(resource_value) >= ?", SQLUtils.toOracleString(stmt)); Assert.assertEquals("select resource_value, count(resource_value) as nums, http_method" + "\nfrom (" diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest38.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest38.java index 5730912c7b..1036a199ac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest38.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest38.java @@ -60,7 +60,7 @@ public class OracleSelectTest38 extends OracleTest { "FROM (\n" + "\tWITH vw_kreis_statics_t AS (\n" + "\t\t\tSELECT substr(xzqh, 1, 6) AS xzqh, swrslx\n" + - "\t\t\t\t, SUM(swrs_count) AS acd_totle\n" + + "\t\t\t\t, sum(swrs_count) AS acd_totle\n" + "\t\t\tFROM (\n" + "\t\t\t\tSELECT xzqh, sglx\n" + "\t\t\t\t\t, CASE \n" + @@ -80,10 +80,10 @@ public class OracleSelectTest38 extends OracleTest { "\t\t, py2\n" + "\tFROM (\n" + "\t\tSELECT xzqh\n" + - "\t\t\t, nvl(MAX(decode(swrslx, '1', acd_totle)), 0) AS less3\n" + - "\t\t\t, nvl(MAX(decode(swrslx, '2', acd_totle)), 0) AS f3to5\n" + - "\t\t\t, nvl(MAX(decode(swrslx, '3', acd_totle)), 0) AS f5to9\n" + - "\t\t\t, nvl(MAX(decode(swrslx, '4', acd_totle)), 0) AS more9\n" + + "\t\t\t, nvl(max(decode(swrslx, '1', acd_totle)), 0) AS less3\n" + + "\t\t\t, nvl(max(decode(swrslx, '2', acd_totle)), 0) AS f3to5\n" + + "\t\t\t, nvl(max(decode(swrslx, '3', acd_totle)), 0) AS f5to9\n" + + "\t\t\t, nvl(max(decode(swrslx, '4', acd_totle)), 0) AS more9\n" + "\t\tFROM (\n" + "\t\t\tSELECT *\n" + "\t\t\tFROM acduser.vw_kreis_statics_t\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest62.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest62.java index afe666ee7d..0a18442630 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest62.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest62.java @@ -67,7 +67,7 @@ public class OracleSelectTest62 extends OracleTest { String text = SQLUtils.toOracleString(stmt); assertEquals("SELECT channel_desc, calendar_month_desc, co.country_id\n" + - "\t, TO_CHAR(SUM(amount_sold), '9,999,999,999') AS SALES$\n" + + "\t, TO_CHAR(sum(amount_sold), '9,999,999,999') AS SALES$\n" + "FROM sales, customers, times, channels, countries co\n" + "WHERE sales.time_id = times.time_id\n" + "\tAND sales.cust_id = customers.cust_id\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest72.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest72.java index 3d33197d57..07142587aa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest72.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest72.java @@ -53,7 +53,7 @@ public class OracleSelectTest72 extends OracleTest { { String text = SQLUtils.toOracleString(stmt); - assertEquals("SELECT A, B, C, SUM(E)\n" + + assertEquals("SELECT A, B, C, sum(E)\n" + "FROM test\n" + "GROUP BY ROLLUP (A, B, C)", text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest78.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest78.java index 239ddde08d..ac9b4c8a56 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest78.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest78.java @@ -329,7 +329,7 @@ public class OracleSelectTest78 extends OracleTest { System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(10, visitor.getTables().size()); - assertEquals(65, visitor.getColumns().size()); + assertEquals(46, visitor.getColumns().size()); assertEquals(30, visitor.getConditions().size()); assertEquals(7, visitor.getRelationships().size()); assertEquals(2, visitor.getOrderByColumns().size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest94.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest94.java index 7a037c0615..09b350a349 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest94.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest94.java @@ -60,7 +60,7 @@ public class OracleSelectTest94 extends OracleTest { "\tSELECT times_purchased AS \"puchase frequency\", state_code\n" + "\tFROM customers t\n" + ")\n" + - "PIVOT XML (COUNT(state_code) FOR state_code IN (\n" + + "PIVOT XML (count(state_code) FOR state_code IN (\n" + "\tSELECT state_code\n" + "\tFROM preferred_states))\n" + "ORDER BY 1", text); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java index 9535c037b7..975edf9f7d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java @@ -67,7 +67,7 @@ public class OracleSelectTest95_pivot extends OracleTest { assertEquals("SELECT *\n" + "FROM s\n" + "\tJOIN d USING (c)\n" + - "PIVOT (MAX(c_c_p) AS max_ccp, MAX(d_c_p) AS max_dcp, MAX(d_x_p) AS dxp, COUNT(1) AS cnt FOR (i, p) IN ((1, 1) AS one_one, (1, 2) AS one_two, (1, 3) AS one_three, (2, 1) AS two_one, (2, 2) AS two_two, (2, 3) AS two_three))\n" + + "PIVOT (max(c_c_p) AS max_ccp, max(d_c_p) AS max_dcp, max(d_x_p) AS dxp, count(1) AS cnt FOR (i, p) IN ((1, 1) AS one_one, (1, 2) AS one_two, (1, 3) AS one_three, (2, 1) AS two_one, (2, 2) AS two_two, (2, 3) AS two_three))\n" + "WHERE d_t = 'p'", text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java index 3a8ce44bb8..db90df6304 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java @@ -67,7 +67,7 @@ public class OracleSelectTest96_pivot extends OracleTest { assertEquals("SELECT *\n" + "FROM s\n" + "\tJOIN d USING (c)\n" + - "PIVOT (MAX(c_c_p) AS max_ccp, MAX(d_c_p) AS max_dcp, MAX(d_x_p) AS dxp, COUNT(1) AS cnt FOR (i, p) IN ((1, 1) AS one_one, (1, 2) AS one_two, (1, 3) AS one_three, (2, 1) AS two_one, (2, 2) AS two_two, (2, 3) AS two_three))\n" + + "PIVOT (max(c_c_p) AS max_ccp, max(d_c_p) AS max_dcp, max(d_x_p) AS dxp, count(1) AS cnt FOR (i, p) IN ((1, 1) AS one_one, (1, 2) AS one_two, (1, 3) AS one_three, (2, 1) AS two_one, (2, 2) AS two_two, (2, 3) AS two_three))\n" + "WHERE d_t = 'p'", text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFromAsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFromAsTest.java index fae2050903..80c4091063 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFromAsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFromAsTest.java @@ -21,7 +21,7 @@ import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectStatement; public class PGFromAsTest extends PGTest { public void testFromAs() throws Exception { String sql = "SELECT Count(*) FROM tb_abc AS t1 WHERE ((t1.a_id = 'global_a_id') AND (t1.owner = 'global_bc'));"; - String expectedSql = "SELECT COUNT(*)\nFROM tb_abc t1\nWHERE t1.a_id = 'global_a_id'\n\tAND t1.owner = 'global_bc';"; + String expectedSql = "SELECT Count(*)\nFROM tb_abc t1\nWHERE t1.a_id = 'global_a_id'\n\tAND t1.owner = 'global_bc';"; String expectedPattern = "SELECT COUNT(*)\nFROM tb_abc t1\nWHERE t1.a_id = ?\n\tAND t1.owner = ?"; testParseSql(sql, expectedSql, expectedPattern, PGSelectStatement.class); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest44.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest44.java index 0e7a87a921..881f3fe52e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest44.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest44.java @@ -34,7 +34,7 @@ public class PGSelectTest44 extends PGTest { List statementList = SQLUtils.parseStatements(sql, dbType); SQLStatement stmt = statementList.get(0); - Assert.assertEquals("SELECT COUNT(1)\n" + + Assert.assertEquals("SELECT count(1)\n" + "FROM t_user\n" + "WHERE property ?? 'name'", SQLUtils.toPGString(stmt)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest45.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest45.java index 917abe73a4..689fb210ec 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest45.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest45.java @@ -33,7 +33,7 @@ public class PGSelectTest45 extends PGTest { List statementList = SQLUtils.parseStatements(sql, dbType); SQLStatement stmt = statementList.get(0); - Assert.assertEquals("SELECT COUNT(1)\n" + + Assert.assertEquals("SELECT count(1)\n" + "FROM t_user\n" + "WHERE property ?| 'name'", SQLUtils.toPGString(stmt)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest46.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest46.java index a279cbd525..2ead2ffed7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest46.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest46.java @@ -33,7 +33,7 @@ public class PGSelectTest46 extends PGTest { List statementList = SQLUtils.parseStatements(sql, dbType); SQLStatement stmt = statementList.get(0); - Assert.assertEquals("SELECT COUNT(1)\n" + + Assert.assertEquals("SELECT count(1)\n" + "FROM t_user\n" + "WHERE property ?& 'name'", SQLUtils.toPGString(stmt)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest51.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest51.java index 3a6ac06d03..44ead923e7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest51.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest51.java @@ -64,7 +64,7 @@ public class PGSelectTest51 extends TestCase { assertEquals("SELECT TMP_PAGE.*, ROWNUM AS ROW_ID\n" + "FROM (\n" + - "\tSELECT M.*, A.*\n" + + "\t(SELECT M.*, A.*\n" + "\tFROM T_EW_MERCHANT M\n" + "\t\tLEFT JOIN LP_ADDRESS A ON M.ADDRESS_KEY = A.KEY\n" + "\tWHERE M.MERCHANT_CODE LIKE ('%' || ? || '%')\n" + @@ -78,13 +78,13 @@ public class PGSelectTest51 extends TestCase { "\t\tOR A.COUNTY LIKE ('%' || ? || '%')\n" + "\t\tOR A.STREET_AREA LIKE ('%' || ? || '%')\n" + "\t\tOR A.DETAILE LIKE ('%' || ? || '%')\n" + - "\t\tOR A.ZIPCODE LIKE ('%' || ? || '%')\n" + + "\t\tOR A.ZIPCODE LIKE ('%' || ? || '%'))\n" + ") TMP_PAGE\n" + "WHERE ROWNUM <= 10", SQLUtils.toPGString(stmt)); assertEquals("select TMP_PAGE.*, ROWNUM as ROW_ID\n" + "from (\n" + - "\tselect M.*, A.*\n" + + "\t(select M.*, A.*\n" + "\tfrom T_EW_MERCHANT M\n" + "\t\tleft join LP_ADDRESS A on M.ADDRESS_KEY = A.KEY\n" + "\twhere M.MERCHANT_CODE like ('%' || ? || '%')\n" + @@ -98,7 +98,7 @@ public class PGSelectTest51 extends TestCase { "\t\tor A.COUNTY like ('%' || ? || '%')\n" + "\t\tor A.STREET_AREA like ('%' || ? || '%')\n" + "\t\tor A.DETAILE like ('%' || ? || '%')\n" + - "\t\tor A.ZIPCODE like ('%' || ? || '%')\n" + + "\t\tor A.ZIPCODE like ('%' || ? || '%'))\n" + ") TMP_PAGE\n" + "where ROWNUM <= 10", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest58.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest58.java index fb98e42290..1ba4ef4794 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest58.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest58.java @@ -46,7 +46,7 @@ public class PGSelectTest58 extends TestCase { List stmtList = SQLUtils.parseStatements(sql, dbType); SQLStatement stmt = stmtList.get(0); - assertEquals("SELECT id, SUM(uv[1]) AS uv1, SUM(uv[2]) AS uv2\n" + + assertEquals("SELECT id, sum(uv[1]) AS uv1, sum(uv[2]) AS uv2\n" + "FROM xxxxx\n" + "WHERE a IN (?)\n" + "\tAND ta -> 'taAge' ?| '{ \n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest71_window.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest71_window.java index 64f04a3ea4..f1f56df29f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest71_window.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest71_window.java @@ -46,7 +46,8 @@ public class PGSelectTest71_window extends TestCase { "\tAND a.stat_date >= '0000-00-00'\n" + "\tAND a.stat_date <= '9999-99-99'\n" + "\tAND a.nav > 0\n" + - "\tAND a.swanav > 0", SQLUtils.toPGString(stmt)); + "\tAND a.swanav > 0\n" + + "WINDOW w AS OVER (ORDER BY a.stat_date DESC)", SQLUtils.toPGString(stmt)); assertEquals("select a.*\n" + "\t, (a.swanav - lead(a.swanav, 1, null::numeric)) / lead(a.swanav, 1, null::numeric) as roe_lag\n" + @@ -55,7 +56,8 @@ public class PGSelectTest71_window extends TestCase { "\tand a.stat_date >= '0000-00-00'\n" + "\tand a.stat_date <= '9999-99-99'\n" + "\tand a.nav > 0\n" + - "\tand a.swanav > 0", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + "\tand a.swanav > 0\n" + + "window w as over (order by a.stat_date desc)", SQLUtils.toPGString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); assertEquals(1, stmtList.size()); @@ -66,7 +68,7 @@ public class PGSelectTest71_window extends TestCase { System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); - assertEquals(5, visitor.getColumns().size()); + assertEquals(7, visitor.getColumns().size()); assertEquals(1, visitor.getTables().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest73.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest73.java index 8693d81586..f331d7808e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest73.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/select/PGSelectTest73.java @@ -36,24 +36,24 @@ public class PGSelectTest73 extends TestCase { assertEquals(1, statements.size()); final SQLStatement stmt = statements.get(0); - assertEquals("SELECT a.*, AVG(a.nv_roe_lag) OVER () AS nv_roe_avg, AVG(a.idx_roe_lag) OVER (ORDER BY a.stat_date) AS idx_roe_avg\n" + - "\t, AVG(a.if300_roe_lag) OVER () AS if300_roe_avg, AVG(a.ih50_roe_lag) OVER () AS ih50_roe_avg\n" + - "\t, AVG(a.ic500_roe_lag) OVER () AS ic500_roe_avg, MAX(a.nv_retrace) OVER (ORDER BY a.stat_date) AS nv_retrace_max\n" + - "\t, MAX(a.idx_retrace) OVER (ORDER BY a.stat_date) AS idx_retrace_max, MAX(a.if300_retrace) OVER (ORDER BY a.stat_date) AS if300_retrace_max\n" + - "\t, MAX(a.ih50_retrace) OVER (ORDER BY a.stat_date) AS ih50_retrace_max, MAX(a.ic500_retrace) OVER (ORDER BY a.stat_date) AS ic500_retrace_max\n" + + assertEquals("SELECT a.*, avg(a.nv_roe_lag) OVER () AS nv_roe_avg, avg(a.idx_roe_lag) OVER (ORDER BY a.stat_date) AS idx_roe_avg\n" + + "\t, avg(a.if300_roe_lag) OVER () AS if300_roe_avg, avg(a.ih50_roe_lag) OVER () AS ih50_roe_avg\n" + + "\t, avg(a.ic500_roe_lag) OVER () AS ic500_roe_avg, max(a.nv_retrace) OVER (ORDER BY a.stat_date) AS nv_retrace_max\n" + + "\t, max(a.idx_retrace) OVER (ORDER BY a.stat_date) AS idx_retrace_max, max(a.if300_retrace) OVER (ORDER BY a.stat_date) AS if300_retrace_max\n" + + "\t, max(a.ih50_retrace) OVER (ORDER BY a.stat_date) AS ih50_retrace_max, max(a.ic500_retrace) OVER (ORDER BY a.stat_date) AS ic500_retrace_max\n" + "\t, CASE \n" + - "\t\tWHEN a.nv_flag >= 0 THEN SUM(1) OVER (ORDER BY a.stat_date)\n" + - "\t\tELSE SUM(0) OVER (ORDER BY a.stat_date)\n" + - "\tEND AS nv_flag_up, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.nv_flag <= 0) AS nv_flag_down, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.idx_flag >= 0) AS idx_flag_up\n" + - "\t, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.idx_flag <= 0) AS idx_flag_down, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.if300_flag >= 0) AS if300_flag_up\n" + - "\t, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.if300_flag <= 0) AS if300_flag_down, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ih50_flag >= 0) AS ih50_flag_up\n" + - "\t, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ih50_flag <= 0) AS ih50_flag_down, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ic500_flag >= 0) AS ic500_flag_up\n" + - "\t, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ic500_flag <= 0) AS ic500_flag_down, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.idx_roe_lag > 0) AS idx_win_cnt\n" + - "\t, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.idx_roe_lag > a.idx_roe_lag) AS idx_win_idx_cnt, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.nv_roe_lag > 0) AS nv_win_cnt\n" + - "\t, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.nv_roe_lag > a.idx_roe_lag) AS nv_win_idx_cnt, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.if300_roe_lag > 0) AS if300_win_cnt\n" + - "\t, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.if300_roe_lag > a.idx_roe_lag) AS if300_win_idx_cnt, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ih50_roe_lag > 0) AS ih50_win_cnt\n" + - "\t, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ih50_roe_lag > a.idx_roe_lag) AS ih50_win_idx_cnt, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ic500_roe_lag > 0) AS ic500_win_cnt\n" + - "\t, COUNT(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ic500_roe_lag > a.idx_roe_lag) AS ic500_win_idx_cnt\n" + + "\t\tWHEN a.nv_flag >= 0 THEN sum(1) OVER (ORDER BY a.stat_date)\n" + + "\t\tELSE sum(0) OVER (ORDER BY a.stat_date)\n" + + "\tEND AS nv_flag_up, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.nv_flag <= 0) AS nv_flag_down, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.idx_flag >= 0) AS idx_flag_up\n" + + "\t, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.idx_flag <= 0) AS idx_flag_down, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.if300_flag >= 0) AS if300_flag_up\n" + + "\t, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.if300_flag <= 0) AS if300_flag_down, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ih50_flag >= 0) AS ih50_flag_up\n" + + "\t, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ih50_flag <= 0) AS ih50_flag_down, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ic500_flag >= 0) AS ic500_flag_up\n" + + "\t, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ic500_flag <= 0) AS ic500_flag_down, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.idx_roe_lag > 0) AS idx_win_cnt\n" + + "\t, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.idx_roe_lag > a.idx_roe_lag) AS idx_win_idx_cnt, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.nv_roe_lag > 0) AS nv_win_cnt\n" + + "\t, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.nv_roe_lag > a.idx_roe_lag) AS nv_win_idx_cnt, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.if300_roe_lag > 0) AS if300_win_cnt\n" + + "\t, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.if300_roe_lag > a.idx_roe_lag) AS if300_win_idx_cnt, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ih50_roe_lag > 0) AS ih50_win_cnt\n" + + "\t, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ih50_roe_lag > a.idx_roe_lag) AS ih50_win_idx_cnt, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ic500_roe_lag > 0) AS ic500_win_cnt\n" + + "\t, count(1) OVER (ORDER BY a.stat_date)FILTER (WHERE a.ic500_roe_lag > a.idx_roe_lag) AS ic500_win_idx_cnt\n" + "\t, regr_slope(a.nv_roe_lag, a.idx_roe_lag) OVER (ORDER BY a.stat_date) AS nv_beta\n" + "\t, regr_slope(a.idx_roe_lag, a.idx_roe_lag) OVER (ORDER BY a.stat_date) AS idx_beta\n" + "\t, regr_slope(a.if300_roe_lag, a.idx_roe_lag) OVER (ORDER BY a.stat_date) AS if300_beta\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/refactor/AddWhere_0.java b/src/test/java/com/alibaba/druid/bvt/sql/refactor/AddWhere_0.java index 33dbdba42d..caf9f18660 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/refactor/AddWhere_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/refactor/AddWhere_0.java @@ -26,7 +26,7 @@ public class AddWhere_0 extends TestCase { assertEquals("SELECT *\n" + "FROM t\n" + "WHERE name = 'xx'\n" + - "AND id = 1", stmt.toString()); + "\tAND id = 1", stmt.toString()); } public void test_select_1_union() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest13.java index 8b7e1a2cc7..de75dee987 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest13.java @@ -35,7 +35,7 @@ public class SchemaStatTest13 extends TestCase { assertEquals(2, relationships.size()); Assert.assertEquals(5, statVisitor.getColumns().size()); - Assert.assertEquals(3, statVisitor.getConditions().size()); + Assert.assertEquals(4, statVisitor.getConditions().size()); assertEquals(0, statVisitor.getFunctions().size()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest.java index 9696fabe61..7a7b690afc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerUpdateTest.java @@ -52,8 +52,8 @@ public class SQLServerUpdateTest extends TestCase { "FROM reg_student_charge_item a, (\n" + "\t\tSELECT a.FId\n" + "\t\t\t, CASE \n" + - "\t\t\t\tWHEN SUM(b.FChargeAmount) IS NULL THEN 0\n" + - "\t\t\t\tELSE SUM(b.FChargeAmount)\n" + + "\t\t\t\tWHEN sum(b.FChargeAmount) IS NULL THEN 0\n" + + "\t\t\t\tELSE sum(b.FChargeAmount)\n" + "\t\t\tEND AS amount\n" + "\t\tFROM reg_student_charge_item a\n" + "\t\t\tLEFT JOIN reg_student_charge_daybook b ON a.FId = b.FChargeItemId\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest13.java index c225a81882..1cd88e4fb4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest13.java @@ -68,7 +68,7 @@ public class SQLServerSelectTest13 extends TestCase { String expect = "SELECT a.*\n" + "FROM (\n" + - "\tSELECT ROW_NUMBER() OVER (ORDER BY a.time_add DESC) AS ROW, a.detail_no AS detailNo, a.ba_id AS baId, a.ba_name AS baName, a.tran_no AS tranNo\n" + + "\tSELECT row_number() OVER (ORDER BY a.time_add DESC) AS ROW, a.detail_no AS detailNo, a.ba_id AS baId, a.ba_name AS baName, a.tran_no AS tranNo\n" + "\t\t, a.tran_name AS tranName, a.tran_type AS tranType, a.balance_type AS balanceType, a.detail_income AS detailIncome, a.detail_payout AS detailPayout\n" + "\t\t, a.before_balance AS beforeBalance, a.after_balance AS afterBalance, a.time_add AS timeAdd, a.user_add AS userAdd, a.remark AS remark\n" + "\t\t, (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest14.java index 4d35a819a4..bd34ca1032 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest14.java @@ -67,7 +67,7 @@ public class SQLServerSelectTest14 extends TestCase { String expect = "SELECT a.*\n" + "FROM (\n" + - "\tSELECT ROW_NUMBER() OVER (ORDER BY a.time_add DESC) AS ROW, a.detail_no AS detailNo, a.ba_id AS baId, a.ba_name AS baName, a.tran_no AS tranNo\n" + + "\tSELECT row_number() OVER (ORDER BY a.time_add DESC) AS ROW, a.detail_no AS detailNo, a.ba_id AS baId, a.ba_name AS baName, a.tran_no AS tranNo\n" + "\t\t, a.tran_name AS tranName, a.tran_type AS tranType, a.balance_type AS balanceType, a.detail_income AS detailIncome, a.detail_payout AS detailPayout\n" + "\t\t, a.before_balance AS beforeBalance, a.after_balance AS afterBalance, a.time_add AS timeAdd, a.user_add AS userAdd, a.remark AS remark\n" + "\t\t, (\n" + diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest32_with_lock.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest32_with_lock.java index 37f07788d1..64c22b3426 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest32_with_lock.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest32_with_lock.java @@ -33,7 +33,7 @@ public class SQLServerSelectTest32_with_lock extends TestCase { { String text = SQLUtils.toSQLString(stmtList, JdbcConstants.SQL_SERVER); - assertEquals("SELECT COUNT(*)\n" + + assertEquals("SELECT count(*)\n" + "FROM t1 WITH (NOLOCK)", text); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest33_with_readpast.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest33_with_readpast.java index 20bf7d4f07..9f20288f91 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest33_with_readpast.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest33_with_readpast.java @@ -33,7 +33,7 @@ public class SQLServerSelectTest33_with_readpast extends TestCase { { String text = SQLUtils.toSQLString(stmtList, JdbcConstants.SQL_SERVER); - assertEquals("SELECT COUNT(*)\n" + + assertEquals("SELECT count(*)\n" + "FROM t1 WITH (READPAST)", text); } { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest34_gtltspace.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest34_gtltspace.java index d63fd8d470..3e08b86d65 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest34_gtltspace.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/select/SQLServerSelectTest34_gtltspace.java @@ -36,7 +36,7 @@ public class SQLServerSelectTest34_gtltspace extends TestCase { { String text = SQLUtils.toSQLString(stmtList, JdbcConstants.SQL_SERVER); - assertEquals("SELECT COUNT(1)\n" + + assertEquals("SELECT count(1)\n" + "FROM wms.pack_box_material a, wms.pack_box b\n" + "WHERE a.pb_id = b.pb_id\n" + "\tAND b.state <> 2\n" +