From e1442826796f36496285da907a7a0946d525377a Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 13 Dec 2017 13:57:49 +0800 Subject: [PATCH] improved db2 sql parser. for issue #2169 --- .../sql/dialect/db2/parser/DB2ExprParser.java | 8 +-- .../druid/bvt/sql/db2/DB2SelectTest_29.java | 71 +++++++++++++++++++ 2 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_29.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2ExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2ExprParser.java index 69e9a44c33..f5cc445f14 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2ExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2ExprParser.java @@ -17,10 +17,7 @@ package com.alibaba.druid.sql.dialect.db2.parser; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.expr.SQLIntervalExpr; -import com.alibaba.druid.sql.ast.expr.SQLIntervalUnit; -import com.alibaba.druid.sql.ast.expr.SQLSequenceExpr; +import com.alibaba.druid.sql.ast.expr.*; import com.alibaba.druid.sql.parser.Lexer; import com.alibaba.druid.sql.parser.SQLExprParser; import com.alibaba.druid.sql.parser.SQLParserFeature; @@ -89,6 +86,9 @@ public class DB2ExprParser extends SQLExprParser { expr = new SQLIdentifierExpr("CURRENT DATE"); } } + } else if (lexer.identifierEquals(FnvHash.Constants.DAY) && expr instanceof SQLIntegerExpr) { + lexer.nextToken(); + expr = new SQLIntervalExpr(expr, SQLIntervalUnit.DAY); } else if (lexer.identifierEquals(FnvHash.Constants.TIMESTAMP)) { if (expr instanceof SQLIdentifierExpr) { SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_29.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_29.java new file mode 100644 index 0000000000..27f88d0006 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_29.java @@ -0,0 +1,71 @@ +/* + * 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.ast.statement.SQLSelectStatement; +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_29 extends DB2Test { + + public void test_0() throws Exception { + String sql = "select to_char(current date - 7 day ,'yyyymmdd') from sysibm.dual"; + + DB2StatementParser parser = new DB2StatementParser(sql); + List statementList = parser.parseStatementList(); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); + assertEquals("SELECT to_char(CURRENT DATE - 7 DAYS, 'yyyymmdd')\n" + + "FROM sysibm.dual", stmt.getSelect().toString()); + + assertEquals("sysibm.dual", stmt.getSelect().getQueryBlock().getFrom().toString()); + + 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()); + + assertEquals(1, visitor.getTables().size()); + assertEquals(0, visitor.getColumns().size()); + assertEquals(0, visitor.getConditions().size()); + + assertTrue(visitor.getTables().containsKey(new TableStat.Name("sysibm.dual"))); + +// assertTrue(visitor.getColumns().contains(new Column("DSN8B10.EMP", "WORKDEPT"))); + // assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); + // assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); + + assertEquals("SELECT to_char(CURRENT DATE - 7 DAYS, 'yyyymmdd')\n" + + "FROM sysibm.dual", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + + assertEquals("select to_char(CURRENT DATE - 7 days, 'yyyymmdd')\n" + + "from sysibm.dual", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + } +}