diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java b/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java index 8aefcdc237..4843db4fe1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java @@ -17,6 +17,9 @@ package com.alibaba.druid.sql.ast; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; +import java.util.Collections; +import java.util.List; + public abstract class SQLExprImpl extends SQLObjectImpl implements SQLExpr { public SQLExprImpl(){ @@ -27,11 +30,16 @@ public abstract class SQLExprImpl extends SQLObjectImpl implements SQLExpr { public abstract int hashCode(); - public abstract SQLExpr clone(); + public SQLExpr clone() { + throw new UnsupportedOperationException(); + } public SQLDataType computeDataType() { return null; } + public List getChildren() { + return Collections.emptyList(); + } } 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 8fa9e7f99d..3f1ce6798e 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 @@ -35,6 +35,7 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe protected SQLAggregateOption option; protected final List arguments = new ArrayList(); protected SQLKeep keep; + protected SQLExpr filter; protected SQLOver over; protected SQLName overRef; protected SQLOrderBy withinGroup; @@ -186,6 +187,7 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe 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; if (overRef != null ? !overRef.equals(that.overRef) : that.overRef != null) return false; if (withinGroup != null ? !withinGroup.equals(that.withinGroup) : that.withinGroup != null) return false; @@ -199,6 +201,7 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe 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); result = 31 * result + (overRef != null ? overRef.hashCode() : 0); result = 31 * result + (withinGroup != null ? withinGroup.hashCode() : 0); @@ -219,6 +222,10 @@ 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()); } @@ -236,6 +243,17 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe 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(); @@ -277,6 +295,11 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe return true; } + if (filter == expr) { + this.filter = target; + target.setParent(this); + } + return false; } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java index 406bb9596d..1a3465cf45 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java @@ -334,4 +334,15 @@ public class PGExprParser extends SQLExprParser { } return alias; } + + protected void filter(SQLAggregateExpr x) { + if (lexer.identifierEquals(FnvHash.Constants.FILTER)) { + lexer.nextToken(); + accept(Token.LPAREN); + accept(Token.WHERE); + SQLExpr filter = this.expr(); + accept(Token.RPAREN); + x.setFilter(filter); + } + } } 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 942816d35b..c0f8bab92a 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -1445,14 +1445,21 @@ public class SQLExprParser extends SQLParser { accept(Token.RPAREN); + if (lexer.identifierEquals(FnvHash.Constants.FILTER)) { + filter(aggregateExpr); + } + if (lexer.token == Token.OVER) { over(aggregateExpr); - } return aggregateExpr; } + protected void filter(SQLAggregateExpr aggregateExpr) { + + } + protected void over(SQLAggregateExpr aggregateExpr) { lexer.nextToken(); 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 5ec6432940..ee145b1d0e 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -1562,6 +1562,13 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet over.accept(this); } + final SQLExpr filter = x.getFilter(); + if (filter != null) { + print0(ucase ? "FILTER (WHERE " : "filter (where "); + printExpr(filter); + print(')'); + } + this.parameterized = parameterized; return false; } diff --git a/src/main/java/com/alibaba/druid/util/FnvHash.java b/src/main/java/com/alibaba/druid/util/FnvHash.java index 406e0ceb0b..1177354e88 100644 --- a/src/main/java/com/alibaba/druid/util/FnvHash.java +++ b/src/main/java/com/alibaba/druid/util/FnvHash.java @@ -652,5 +652,6 @@ public final class FnvHash { long INCREMENT = fnv1a_64_lower("INCREMENT"); long OVERWRITE = fnv1a_64_lower("OVERWRITE"); + long FILTER = fnv1a_64_lower("FILTER"); } }