From 7ced41022881aa4796ab4779b98d82b89a022300 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sun, 4 Feb 2018 13:59:16 +0800 Subject: [PATCH] bug fixed for SchemaStatVisitor. for issue #2303 --- .../java/com/alibaba/druid/sql/SQLUtils.java | 3 + .../select/MySqlSelectTest_108_alias.java | 56 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_108_alias.java diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java index e819ae1c11..8668c57a6f 100644 --- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java +++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java @@ -833,6 +833,9 @@ public class SQLUtils { char x0 = name.charAt(name.length() - 1); if ((c0 == '"' && x0 == '"') || (c0 == '`' && x0 == '`')) { String normalizeName = name.substring(1, name.length() - 1); + if (c0 == '`') { + normalizeName = normalizeName.replaceAll("`\\.`", "."); + } if (JdbcConstants.ORACLE.equals(dbType)) { if (OracleUtils.isKeyword(normalizeName)) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_108_alias.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_108_alias.java new file mode 100644 index 0000000000..4b3ad64027 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_108_alias.java @@ -0,0 +1,56 @@ +/* + * 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.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.util.JdbcConstants; + +import java.util.List; + + +public class MySqlSelectTest_108_alias extends MysqlTest { + public void test_0() throws Exception { + String sql = "\n" + + "select * from `db1`.`travelrecord` a where a.id=1;"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + + assertEquals(1, statementList.size()); + + SQLStatement stmt = statementList.get(0); + + assertEquals("SELECT *\n" + + "FROM `db1`.`travelrecord` a\n" + + "WHERE a.id = 1;", stmt.toString()); + + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); + stmt.accept(visitor); + + TableStat.Name tableName = visitor.getTables().keySet().iterator().next(); + assertEquals("db1.travelrecord", tableName.toString()); +// System.out.println("Tables : " + visitor.getTables()); +// System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + } + +} \ No newline at end of file