From 60b579e8782764ec209fe09714647ac420922e4f Mon Sep 17 00:00:00 2001 From: "shaojin.wensj" Date: Sun, 3 Feb 2019 10:20:52 +0800 Subject: [PATCH] bug fixed for SchemaStatVisitor, for issue #3058 --- .../sql/ast/expr/SQLMethodInvokeExpr.java | 6 ++- .../druid/sql/visitor/SchemaStatVisitor.java | 12 +++-- .../sql/mysql/select/MySqlSelectTest_241.java | 53 +++++++++++++++++++ 3 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_241.java diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java index 9ce5e9be31..a96ecb8d6d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java @@ -107,10 +107,14 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable, this.from = x; } + public List getArguments() { + return this.parameters; + } + public List getParameters() { return this.parameters; } - + public void addParameter(SQLExpr param) { if (param != null) { param.setParent(this); 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 e1de81e413..673a5da04d 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -791,8 +791,8 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { for (;;) { if (expr instanceof SQLMethodInvokeExpr) { SQLMethodInvokeExpr methodInvokeExp = (SQLMethodInvokeExpr) expr; - if (methodInvokeExp.getParameters().size() == 1) { - SQLExpr firstExpr = methodInvokeExp.getParameters().get(0); + if (methodInvokeExp.getArguments().size() == 1) { + SQLExpr firstExpr = methodInvokeExp.getArguments().get(0); expr = firstExpr; continue; } @@ -823,9 +823,11 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { SQLSelectItem selectItem = queryBlock.findSelectItem(propertyExpr .nameHashCode64()); if (selectItem != null) { - expr = selectItem.getExpr(); - continue; - + SQLExpr selectItemExpr = selectItem.getExpr(); + if (selectItemExpr != expr) { + expr = selectItemExpr; + continue; + } } else if (queryBlock.selectItemHasAllColumn()) { SQLTableSource allColumnTableSource = null; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_241.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_241.java new file mode 100644 index 0000000000..7748cd014c --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_241.java @@ -0,0 +1,53 @@ +/* + * 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.statement.SQLSelectStatement; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; + + +public class MySqlSelectTest_241 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "select job_names.job_name from cover_rage_job_org as org RIGHT JOIN (\n" + + " select job_names.job_name as job_name\n" + + " from (\n" + + " SELECT '1' as job_name\n" + + ") job_name_all) as job_names on job_names.job_name = org.job_name"; + + + SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleMysqlStatement(sql); + + assertEquals("SELECT job_names.job_name\n" + + "FROM cover_rage_job_org org\n" + + "\tRIGHT JOIN (\n" + + "\t\tSELECT job_names.job_name AS job_name\n" + + "\t\tFROM (\n" + + "\t\t\tSELECT '1' AS job_name\n" + + "\t\t) job_name_all\n" + + "\t) job_names\n" + + "\tON job_names.job_name = org.job_name", stmt.toString()); + + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + } + + + +} \ No newline at end of file