From e92e385609f21afb32424569abfa9e592cb797df Mon Sep 17 00:00:00 2001 From: wenshao Date: Tue, 28 Aug 2018 17:38:17 +0800 Subject: [PATCH] bug fixed for sql parser, for issue #2773 --- .../druid/sql/ast/expr/SQLNotExpr.java | 15 +++-- .../mysql/select/MySqlSelectTest_209_not.java | 59 +++++++++++++++++++ 2 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_209_not.java diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNotExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNotExpr.java index 788914901a..ef9b5f2ccd 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNotExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNotExpr.java @@ -33,17 +33,22 @@ public final class SQLNotExpr extends SQLExprImpl implements Serializable { } - public SQLNotExpr(SQLExpr expr){ - - this.expr = expr; + public SQLNotExpr(SQLExpr x){ + if (x != null) { + x.setParent(this); + } + this.expr = x; } public SQLExpr getExpr() { return this.expr; } - public void setExpr(SQLExpr expr) { - this.expr = expr; + public void setExpr(SQLExpr x) { + if (x != null) { + x.setParent(this); + } + this.expr = x; } @Override diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_209_not.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_209_not.java new file mode 100644 index 0000000000..cd51d08afb --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_209_not.java @@ -0,0 +1,59 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +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.ast.expr.SQLNotExpr; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; + +import java.util.List; + +public class MySqlSelectTest_209_not extends MysqlTest { + + public void test_0() throws Exception { + String sql = "select * from a where not id > 50"; + + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + + assertEquals(1, statementList.size()); + + assertEquals("SELECT *\n" + + "FROM a\n" + + "WHERE NOT id > 50", // + stmt.toString()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + + assertEquals(1, visitor.getTables().size()); + assertEquals(2, visitor.getColumns().size()); + assertEquals(1, visitor.getConditions().size()); + assertEquals(0, visitor.getOrderByColumns().size()); + + SQLNotExpr notExpr = (SQLNotExpr) ((SQLSelectStatement) stmt).getSelect().getQueryBlock().getWhere(); + assertNotNull(notExpr.getParent()); + assertNotNull(notExpr.getExpr().getParent()); + + + } + +}