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..0aef79a1b4 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(); @@ -2263,6 +2270,8 @@ public class SQLExprParser extends SQLParser { } expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Equality, rightExp, dbType); + } else { + return expr; } break; case TILDE: @@ -2274,6 +2283,8 @@ public class SQLExprParser extends SQLParser { rightExp = relationalRest(rightExp); expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.POSIX_Regular_Match, rightExp, getDbType()); + } else { + return expr; } break; case TILDE_STAR: @@ -2281,6 +2292,8 @@ public class SQLExprParser extends SQLParser { lexer.nextToken(); rightExp = relational(); expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.POSIX_Regular_Match_Insensitive, rightExp, getDbType()); + } else { + return expr; } break; case BANG_TILDE: @@ -2288,6 +2301,8 @@ public class SQLExprParser extends SQLParser { lexer.nextToken(); rightExp = relational(); expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.POSIX_Regular_Not_Match, rightExp, getDbType()); + } else { + return expr; } break; case BANG_TILDE_STAR: @@ -2295,6 +2310,8 @@ public class SQLExprParser extends SQLParser { lexer.nextToken(); rightExp = relational(); expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.POSIX_Regular_Not_Match_POSIX_Regular_Match_Insensitive, rightExp, getDbType()); + } else { + return expr; } break; case TILDE_EQ: @@ -2302,6 +2319,8 @@ public class SQLExprParser extends SQLParser { lexer.nextToken(); rightExp = relational(); expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.SAME_AS, rightExp, getDbType()); + } else { + return expr; } break; case RLIKE: @@ -2331,6 +2350,8 @@ public class SQLExprParser extends SQLParser { rightExp = relational(); expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.SIMILAR_TO, rightExp, getDbType()); + } else { + return expr; } break; default: 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"); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_196_wall.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_196_wall.java new file mode 100644 index 0000000000..ae4de33a0f --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_196_wall.java @@ -0,0 +1,25 @@ +package com.alibaba.druid.bvt.sql.mysql.select; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.parser.ParserException; + +import java.util.List; + +public class MySqlSelectTest_196_wall extends MysqlTest { + + public void test_0() throws Exception { + String sql = "update task_info set priority = 1, content = 'x渓螼h\u0013[\u0014\u0006饆蜭�)漉=灔�\u000B\u0011\u0011u�\uE06A圥Z[\u0017殞c怈﹝櫃&c摍0\u007Fj璟\u0004]JWRb峌膮埜\u0014譢\"瓺\\\\塼!.D牡玕\"邥\t� 佥篼緖.W=Rw4�\u001E3\t玭YF螭�\u0004�);\u0011�I\u0017�%\u0017谦漜f*\bm梄恀拒t)/�I�\"uSP蟉�\u0006I3\\\"�\u0016敐\f\\Z殷觀n\\\"餭讖;祵Y換g\uE5B7&柋\u0017�\u0011﹗A欍媞(I=\u0010�x鐹�\u000B!蜿\u0006\u0013�lQw�(33毳圳倀!\uE324=&释烃襲�&b\uE1EF�\u0013mm孺L\u0014嚍_MS7湏痘笫滴;y鶲\b爱骤求秩G-\u001By~殿揀\uE222�\u0003鮝[�Dqo:蟎'~=裼�\u001F垴蟵\\rY�\u0013.\uE3F9R\u000E�\u0012滂燶n鑲�\u0002贛龎=\u0010ミ�\u0007/%�\u001C癳c�\u000E\\Z旊\u001B�\u000B2栣玄岜�#cc吜\uE6C5�\u001B嚮醽nx�\u001B巘肅輕4E鎊\u0018E\u0018跴欱貯i\u0007蘉渚秘\u0007c\u00129狓\u0004F\u001F\f\u0013�觠3\u000B��-XS8�\u0010�\u0019V\u001E諭餸�\u000Fk\\r|\u0014V\u0005躒_A彙?E�*�\u0015琔�\u001Ep共\u000B�\u0006Z\u001F�%楳�\u001D\u001C玾郳\"\uE26B\u0011�\u0006Jj\u0016h\u0005�\u001C�\u0002�\u0002�\u0004j貌`.�\u0001�\u0005韁\"�\u0006z佉\u0012�\u001CxQ�\u0007\u0017@呃-斵曼\\0k砛0k\u0003鬨Z\uE5E9\u007F\u0006^�\u000Es\u0005欳B�\f\\0\\0��+僜'�', attribute = 0, create_time = from_unixtime(1531714297) where id = 2726633030"; + + Exception error = null; + try { + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + } catch (ParserException ex) { + error = ex; + } + + assertNotNull(error); + } +} \ No newline at end of file