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 784a24cc60..f5be2685ee 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -766,6 +766,22 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { protected void handleCondition(SQLExpr expr, String operator, SQLExpr... valueExprs) { if (expr instanceof SQLCastExpr) { expr = ((SQLCastExpr) expr).getExpr(); + } else if (expr instanceof SQLMethodInvokeExpr) { + SQLMethodInvokeExpr func = (SQLMethodInvokeExpr) expr; + List arguments = func.getArguments(); + if (func.methodNameHashCode64() == FnvHash.Constants.COALESCE + && arguments.size() > 0) { + boolean allLiteral = true; + for (int i = 1; i < arguments.size(); ++i) { + SQLExpr arg = arguments.get(i); + if (!(arg instanceof SQLLiteralExpr)) { + allLiteral = false; + } + } + if (allLiteral) { + expr = arguments.get(0); + } + } } Column column = getColumn(expr); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest20_issue3993.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest20_issue3993.java new file mode 100644 index 0000000000..5dffd437d3 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest20_issue3993.java @@ -0,0 +1,35 @@ +package com.alibaba.druid.bvt.sql.schemaStat; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.parser.SQLParserUtils; +import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.sql.repository.SchemaRepository; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +public class SchemaStatTest20_issue3993 extends TestCase { + + public void test_schemaStat() throws Exception { + SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); + + String sql = "select * from tableA where COALESCE(service_code,'/') <> '0821';"; + + SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, JdbcConstants.MYSQL); + SQLStatement stmt = parser.parseStatementList().get(0); + + SchemaStatVisitor statVisitor = SQLUtils.createSchemaStatVisitor(repository); + stmt.accept(statVisitor); + + System.out.println("Tables : " + statVisitor.getTables()); + System.out.println("columns : " + statVisitor.getColumns()); +// System.out.println(statVisitor.getGroupByColumns()); // group by + System.out.println("relationships : " + statVisitor.getRelationships()); // group by + System.out.println("conditions : " + statVisitor.getConditions()); + + assertEquals(2, statVisitor.getColumns().size()); + assertEquals(1, statVisitor.getConditions().size()); + assertEquals(1, statVisitor.getFunctions().size()); + } +}