From 542e1322726f8951278460129901390404fc4f5a Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 7 Apr 2018 21:20:07 +0800 Subject: [PATCH] bug fixed for db2 sql parser. --- .../druid/sql/dialect/db2/ast/DB2Object.java | 1 + .../db2/visitor/DB2SchemaStatVisitor.java | 1 + .../druid/bvt/sql/db2/DB2SelectTest_32.java | 70 +++++++++++++++++++ .../druid/bvt/sql/db2/DB2SelectTest_33.java | 67 ++++++++++++++++++ 4 files changed, 139 insertions(+) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_32.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_33.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2Object.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2Object.java index d65005ad48..48c5991a47 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2Object.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2Object.java @@ -25,6 +25,7 @@ public interface DB2Object extends SQLObject { interface Constants { long CURRENT_DATE = FnvHash.fnv1a_64_lower("CURRENT DATE"); + long CURRENT_DATE2 = FnvHash.fnv1a_64_lower("CURRENT_DATE"); long CURRENT_TIME = FnvHash.fnv1a_64_lower("CURRENT TIME"); long CURRENT_SCHEMA = FnvHash.fnv1a_64_lower("CURRENT SCHEMA"); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2SchemaStatVisitor.java index d470cef25a..89fff799fc 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2SchemaStatVisitor.java @@ -61,6 +61,7 @@ public class DB2SchemaStatVisitor extends SchemaStatVisitor implements DB2ASTVis protected boolean isPseudoColumn(long hash64) { return hash64 == DB2Object.Constants.CURRENT_DATE + || hash64 == DB2Object.Constants.CURRENT_DATE2 || hash64 == DB2Object.Constants.CURRENT_TIME || hash64 == DB2Object.Constants.CURRENT_SCHEMA; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_32.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_32.java new file mode 100644 index 0000000000..78ca104d3b --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_32.java @@ -0,0 +1,70 @@ +/* + * 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 java.util.List; + +public class DB2SelectTest_32 extends DB2Test { + + public void test_0() throws Exception { + String sql = "SELECT CURRENT DATE FROM SYSIBM.SYSDUMMY1"; + + DB2StatementParser parser = new DB2StatementParser(sql); + List statementList = parser.parseStatementList(); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); + assertEquals("SELECT CURRENT DATE\n" + + "FROM SYSIBM.SYSDUMMY1", stmt.getSelect().toString()); + + assertEquals("SYSIBM.SYSDUMMY1", 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.sysdummy1"))); + +// 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 CURRENT DATE\n" + + "FROM SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + + assertEquals("select CURRENT DATE\n" + + "from SYSIBM.SYSDUMMY1", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_33.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_33.java new file mode 100644 index 0000000000..ed502fddc0 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_33.java @@ -0,0 +1,67 @@ +/* + * 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 java.util.List; + +public class DB2SelectTest_33 extends DB2Test { + + public void test_0() throws Exception { + String sql = "SELECT CURRENT_DATE -2 DAY FROM SYSIBM.SYSDUMMY1;"; + + DB2StatementParser parser = new DB2StatementParser(sql); + List statementList = parser.parseStatementList(); + SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); + assertEquals("SYSIBM.SYSDUMMY1", 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.sysdummy1"))); + +// 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 CURRENT_DATE - 2 DAYS\n" + + "FROM SYSIBM.SYSDUMMY1;", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + + assertEquals("select CURRENT_DATE - 2 days\n" + + "from SYSIBM.SYSDUMMY1;", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + } +}