From b439c0a0a960158d1e7b78d8555cee2ac9a53c98 Mon Sep 17 00:00:00 2001 From: wenshao Date: Mon, 26 Feb 2018 14:03:47 +0800 Subject: [PATCH] bug fixed for SchemaStatVisitor. --- .../mysql/visitor/MySqlSchemaStatVisitor.java | 19 +++-- .../SchemaResolveVisitorFactory.java | 11 +++ .../druid/sql/visitor/SchemaStatVisitor.java | 7 -- .../bvt/sql/mysql/MySqlDeleteTest_6.java | 70 +++++++++++++++++++ 4 files changed, 94 insertions(+), 13 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_6.java 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 8954c96799..1799ae1ca5 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 @@ -78,14 +78,21 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS repository.resolve(x); } - setMode(x, Mode.Delete); + SQLTableSource from = x.getFrom(); + if (from != null) { + from.accept(this); + } - accept(x.getFrom()); - accept(x.getUsing()); - x.getTableSource().accept(this); + SQLTableSource using = x.getUsing(); + if (using != null) { + using.accept(this); + } - if (x.getTableSource() instanceof SQLExprTableSource) { - TableStat stat = this.getTableStat(x.getExprTableSource()); + SQLTableSource tableSource = x.getTableSource(); + tableSource.accept(this); + + if (tableSource instanceof SQLExprTableSource) { + TableStat stat = this.getTableStat((SQLExprTableSource) tableSource); stat.incrementDeleteCount(); } diff --git a/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java b/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java index 48c4f94f89..71189ac153 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java +++ b/src/main/java/com/alibaba/druid/sql/repository/SchemaResolveVisitorFactory.java @@ -1693,6 +1693,17 @@ class SchemaResolveVisitorFactory { } if (table != null) { + if (from != null && table instanceof SQLExprTableSource) { + SQLExpr tableExpr = ((SQLExprTableSource) table).getExpr(); + if (tableExpr instanceof SQLPropertyExpr + && ((SQLPropertyExpr) tableExpr).getName().equals("*")) { + String alias = ((SQLPropertyExpr) tableExpr).getOwnernName(); + SQLTableSource refTableSource = from.findTableSource(alias); + if (refTableSource != null) { + ((SQLPropertyExpr) tableExpr).setResolvedTableSource(refTableSource); + } + } + } table.accept(visitor); ctx.setTableSource(table); } 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 cf6a483db3..a6b14aaf46 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -1764,13 +1764,6 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { return true; } - public void endVisit(SQLDeleteStatement x) { - - } - - public void endVisit(SQLUpdateStatement x) { - } - public boolean visit(SQLCreateTableStatement x) { if (repository != null && x.getParent() == null) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_6.java new file mode 100644 index 0000000000..f24e2b83fa --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_6.java @@ -0,0 +1,70 @@ +/* + * Copyright 1999-2018 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 com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.SQLUtils; +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 com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.stat.TableStat.Column; +import org.junit.Assert; + +import java.util.List; + +public class MySqlDeleteTest_6 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "delete a.* from teacher_1 a join teacher_2 b on a.teacher_id = b.teacher_id where a.day < b.day"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + assertEquals("DELETE a.*\n" + + "FROM teacher_1 a\n" + + "\tJOIN teacher_2 b ON a.teacher_id = b.teacher_id\n" + + "WHERE a.day < b.day", SQLUtils.toMySqlString(stmt)); + assertEquals("delete a.*\n" + + "from teacher_1 a\n" + + "\tjoin teacher_2 b on a.teacher_id = b.teacher_id\n" + + "where a.day < b.day", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + + assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + + System.out.println(stmt); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); +// System.out.println("coditions : " + visitor.getConditions()); +// System.out.println("orderBy : " + visitor.getOrderByColumns()); + + assertEquals(2, visitor.getTables().size()); + assertEquals(4, visitor.getColumns().size()); + assertEquals(4, visitor.getConditions().size()); + + assertTrue(visitor.getTables().containsKey(new TableStat.Name("teacher_1"))); + assertTrue(visitor.getTables().containsKey(new TableStat.Name("teacher_2"))); + + assertTrue(visitor.getColumns().contains(new Column("teacher_1", "teacher_id"))); + assertTrue(visitor.getColumns().contains(new Column("teacher_1", "teacher_id"))); + assertTrue(visitor.getColumns().contains(new Column("teacher_2", "day"))); + assertTrue(visitor.getColumns().contains(new Column("teacher_2", "day"))); + } +}