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 81d7425734..070d5b0fed 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
@@ -57,6 +57,26 @@ public class DB2ExprParser extends SQLExprParser {
                     return seqExpr;
                 }
             }
+        } else if (identifierEquals("DATE")) {
+            if (expr instanceof SQLIdentifierExpr) {
+                SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
+                String ident = identExpr.getName();
+                if (ident.equalsIgnoreCase("CURRENT")) {
+                    lexer.nextToken();
+
+                    expr = new SQLIdentifierExpr("CURRENT DATE");
+                }
+            }
+        } else if (identifierEquals("TIMESTAMP")) {
+            if (expr instanceof SQLIdentifierExpr) {
+                SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
+                String ident = identExpr.getName();
+                if (ident.equalsIgnoreCase("CURRENT")) {
+                    lexer.nextToken();
+
+                    expr = new SQLIdentifierExpr("CURRENT DATE");
+                }
+            }
         }
 
         return super.primaryRest(expr);
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_23.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_23.java
new file mode 100644
index 0000000000..4b1c0447f4
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_23.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 1999-2101 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_23 extends DB2Test {
+
+    public void test_0() throws Exception {
+        String sql = "select current date,current timestamp from dual";
+
+        DB2StatementParser parser = new DB2StatementParser(sql);
+        List<SQLStatement> 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(1, visitor.getColumns().size());
+        Assert.assertEquals(0, visitor.getConditions().size());
+
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("dual")));
+
+//         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 CURRENT DATE, CURRENT DATE\n" +
+                        "FROM dual", //
+                            SQLUtils.toSQLString(stmt, JdbcConstants.DB2));
+        
+        Assert.assertEquals("select CURRENT DATE, CURRENT DATE\n" +
+                        "from dual", //
+                            SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION));
+    }
+}