From 38b987c44a5acdbcac01af7339b54e65b713d7d1 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 31 Aug 2013 11:21:19 +0800 Subject: [PATCH] bug fixed for sql parser --- .../druid/sql/parser/SQLExprParser.java | 2 +- .../druid/sql/visitor/SchemaStatVisitor.java | 2 +- .../bvt/sql/mysql/MySqlSelectTest_16.java | 83 +++++++++++++++++++ 3 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_16.java 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 c37ee63610..7b1c10df9f 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -365,7 +365,7 @@ public class SQLExprParser extends SQLParser { return primaryRest(sqlExpr); } else { - SQLExpr restExpr = equality(); + SQLExpr restExpr = relational(); sqlExpr = new SQLNotExpr(restExpr); } break; 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 e78c55a795..3fd944310b 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -1032,7 +1032,7 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { return false; } - + public boolean visit(SQLInListExpr x) { if (x.isNot()) { handleCondition(x.getExpr(), "NOT IN", x.getTargetList()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_16.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_16.java new file mode 100644 index 0000000000..dc7cbf8d08 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_16.java @@ -0,0 +1,83 @@ +/* + * Copyright 1999-2011 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; + +import java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; +import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; +import com.alibaba.druid.sql.ast.expr.SQLNotExpr; +import com.alibaba.druid.sql.ast.statement.SQLSelect; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; + +public class MySqlSelectTest_16 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "select a from t where not a>1 and not b<1"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + + SQLSelectStatement selectStmt = (SQLSelectStatement) stmt; + + SQLSelect select = selectStmt.getSelect(); + Assert.assertNotNull(select.getQuery()); + MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) select.getQuery(); + Assert.assertNull(queryBlock.getOrderBy()); + + { + SQLExpr where = queryBlock.getWhere(); + Assert.assertTrue(where instanceof SQLBinaryOpExpr); + SQLBinaryOpExpr binaryWhere = (SQLBinaryOpExpr) where; + Assert.assertEquals(binaryWhere.getOperator(), SQLBinaryOperator.BooleanAnd); + + Assert.assertTrue(binaryWhere.getLeft() instanceof SQLNotExpr); + Assert.assertTrue(binaryWhere.getRight() instanceof SQLNotExpr); + } + + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(2, visitor.getConditions().size()); + Assert.assertEquals(0, visitor.getOrderByColumns().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t"))); + + String output = SQLUtils.toMySqlString(stmt); + Assert.assertEquals("SELECT a" // + + "\nFROM t"// + + "\nWHERE NOT a > 1"// + + "\n\tAND NOT b < 1", // + output); + } +}