From 0d8e5549e52a3a42e6737e3449be5b0bb13263cc Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 12 Jul 2017 22:25:28 +0800 Subject: [PATCH] bug fixed for sql parser SchemaStatVisitor. for issue #1798 --- .../db2/visitor/DB2SchemaStatVisitor.java | 2 +- .../mysql/visitor/MySqlSchemaStatVisitor.java | 2 +- .../odps/visitor/OdpsSchemaStatVisitor.java | 2 +- .../visitor/PGSchemaStatVisitor.java | 3 +- .../visitor/MySqlSchemaStatVisitorTest7.java | 59 +++++++++++++++++++ 5 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2SchemaStatVisitor.java index 435bebff39..c624edcd4f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2SchemaStatVisitor.java @@ -35,7 +35,7 @@ public class DB2SchemaStatVisitor extends SchemaStatVisitor implements DB2ASTVis @Override public void endVisit(DB2SelectQueryBlock x) { - + super.endVisit((SQLSelectQueryBlock) x); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java index 6956771beb..1f485c093b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java @@ -524,7 +524,7 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS @Override public void endVisit(MySqlSelectQueryBlock x) { - + super.endVisit((SQLSelectQueryBlock) x); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsSchemaStatVisitor.java index deb642f6da..e4662f18cd 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsSchemaStatVisitor.java @@ -126,7 +126,7 @@ public class OdpsSchemaStatVisitor extends SchemaStatVisitor implements OdpsASTV @Override public void endVisit(OdpsSelectQueryBlock x) { - + super.endVisit((SQLSelectQueryBlock) x); } @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGSchemaStatVisitor.java index 9ad1a46267..6c6d95f523 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGSchemaStatVisitor.java @@ -21,6 +21,7 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithClause; import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithQuery; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGBoxExpr; @@ -246,7 +247,7 @@ public class PGSchemaStatVisitor extends SchemaStatVisitor implements PGASTVisit @Override public void endVisit(PGSelectQueryBlock x) { - + super.endVisit((SQLSelectQueryBlock) x); } @Override diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7.java new file mode 100644 index 0000000000..2cb24cb2c0 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7.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.visitor; + +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import junit.framework.TestCase; +import org.junit.Assert; + +import java.util.List; + +public class MySqlSchemaStatVisitorTest7 extends TestCase { + + public void test_0() throws Exception { + String sql = "select * from t1 where b in (select b from t2) and a = 1"; + +// sql = "select columnName from table1 where id in (select id from table3 where name = ?)"; + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + + assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + + System.out.println(sql); + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println(visitor.getConditions()); + + assertEquals(2, visitor.getTables().size()); + assertEquals(true, visitor.containsTable("t1")); + assertEquals(true, visitor.containsTable("t2")); + + assertEquals(4, visitor.getColumns().size()); + assertEquals(true, visitor.containsColumn("t1", "b")); + assertEquals(true, visitor.containsColumn("t2", "b")); + assertEquals(true, visitor.containsColumn("t1", "a")); + // assertEquals(true, visitor.getFields().contains(new + // Column("users", "name"))); + + } + +}