diff --git a/pom.xml b/pom.xml index d4bee6fefb..00df17afd8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.alibaba druid - 0.2.12-SNAPSHOT + 0.2.12 jar druid 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 0c77bcb481..90629b21de 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -58,6 +58,7 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource; import com.alibaba.druid.sql.ast.statement.SQLTableElement; +import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.ast.statement.SQLTruncateStatement; import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; import com.alibaba.druid.stat.TableStat; @@ -153,11 +154,11 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { if (flag0) { ident = ident.replaceAll("\"", ""); } - + if (flag1) { ident = ident.replaceAll("`", ""); } - + if (flag2) { ident = ident.replaceAll(" ", ""); } @@ -869,15 +870,22 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { public boolean visit(SQLUpdateStatement x) { setAliasMap(); + + setMode(x, Mode.Update); - String ident = x.getTableName().toString(); - setCurrentTable(ident); + SQLName identName = x.getTableName(); + if (identName != null) { + String ident = identName.toString(); + setCurrentTable(ident); - TableStat stat = getTableStat(ident); - stat.incrementUpdateCount(); + TableStat stat = getTableStat(ident); + stat.incrementUpdateCount(); - Map aliasMap = getAliasMap(); - aliasMap.put(ident, ident); + Map aliasMap = getAliasMap(); + aliasMap.put(ident, ident); + } else { + x.getTableSource().accept(this); + } accept(x.getItems()); accept(x.getWhere()); @@ -1004,7 +1012,7 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { public void endVisit(SQLAlterTableAddColumn x) { } - + @Override public boolean visit(SQLRollbackStatement x) { return false; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUpdateTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUpdateTest_1.java new file mode 100644 index 0000000000..6e2669b862 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUpdateTest_1.java @@ -0,0 +1,60 @@ +/* + * 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 junit.framework.Assert; + +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.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.stat.TableStat.Column; + +public class MySqlUpdateTest_1 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "UPDATE t_price, t_basic_store s " + // + "SET purchasePrice = :purchasePrice, operaterId = :operaterId, " + // + " operaterRealName = :operaterRealName, operateDateline = :operateDateline " + // + "WHERE goodsId = :goodsId AND s.id = storeId AND s.areaId = :areaId"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + statemen.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(2, visitor.getTables().size()); + Assert.assertEquals(8, visitor.getColumns().size()); + Assert.assertEquals(4, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_price"))); + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); + + } +}