From 1344276be615532901a0c9249273685d2ae3c7eb Mon Sep 17 00:00:00 2001 From: wenshao Date: Tue, 19 Sep 2017 10:27:00 +0800 Subject: [PATCH] bug fixed for db2 sql parser. for issue #1982 --- .../druid/sql/parser/SQLExprParser.java | 1 + .../bvt/sql/db2/DB2SelectTest_25_concat.java | 69 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_25_concat.java diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index dbb77e8c81..171380f74b 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -463,6 +463,7 @@ public class SQLExprParser extends SQLParser { case DO: case GROUP: case MOD: + case CONCAT: sqlExpr = new SQLIdentifierExpr(lexer.stringVal()); lexer.nextToken(); break; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_25_concat.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_25_concat.java new file mode 100644 index 0000000000..b1fe7d43b3 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_25_concat.java @@ -0,0 +1,69 @@ +/* + * 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.db2; + +import com.alibaba.druid.sql.DB2Test; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; +import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.util.JdbcConstants; +import org.junit.Assert; + +import java.util.List; + +public class DB2SelectTest_25_concat extends DB2Test { + + public void test_0() throws Exception { + String sql = "select ID, AUTHORITY_TYPE from t_authority a where authority_type like CONCAT('%', ?)"; + + DB2StatementParser parser = new DB2StatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + System.out.println(SQLUtils.toDB2String(stmt)); + + Assert.assertEquals(1, statementList.size()); + + DB2SchemaStatVisitor visitor = new DB2SchemaStatVisitor(); + stmt.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(1, visitor.getTables().size()); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(1, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_authority"))); + +// Assert.assertTrue(visitor.getColumns().contains(new Column("DSN8B10.EMP", "WORKDEPT"))); + // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); + // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); + + Assert.assertEquals("SELECT ID, AUTHORITY_TYPE\n" + + "FROM t_authority a\n" + + "WHERE authority_type LIKE CONCAT('%', ?)", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + + Assert.assertEquals("select ID, AUTHORITY_TYPE\n" + + "from t_authority a\n" + + "where authority_type like CONCAT('%', ?)", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + } +}