From 6d9c176450b430fc23bb8da4c73142cafe505ad4 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Sun, 4 Feb 2018 13:24:57 +0800
Subject: [PATCH] bug fixed for SchemaStatVisitor. for issue #2306

---
 .../druid/sql/visitor/SchemaStatVisitor.java  | 15 ++++--
 .../com/alibaba/druid/stat/TableStat.java     |  4 ++
 .../select/MySqlSelectTest_107_between.java   | 53 +++++++++++++++++++
 3 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_107_between.java

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 05ccf808fb..d4fdb1e0f6 100644
--- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java
+++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java
@@ -641,11 +641,18 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
             if (valueColumn != null) {
                 continue;
             }
-            Object value = SQLEvalVisitorUtils.eval(dbType, item, parameters, false);
-            if (value == SQLEvalVisitor.EVAL_VALUE_NULL) {
-                value = null;
+
+            Object value;
+            if (item instanceof SQLMethodInvokeExpr) {
+                value = item.toString();
+            } else {
+                value = SQLEvalVisitorUtils.eval(dbType, item, parameters, false);
+                if (value == SQLEvalVisitor.EVAL_VALUE_NULL) {
+                    value = null;
+                }
             }
-            condition.getValues().add(value);
+
+            condition.addValue(value);
         }
     }
 
diff --git a/src/main/java/com/alibaba/druid/stat/TableStat.java b/src/main/java/com/alibaba/druid/stat/TableStat.java
index 62f90631b4..95e6ca5553 100644
--- a/src/main/java/com/alibaba/druid/stat/TableStat.java
+++ b/src/main/java/com/alibaba/druid/stat/TableStat.java
@@ -323,6 +323,10 @@ public class TableStat {
             return values;
         }
 
+        public void addValue(Object value) {
+            this.values.add(value);
+        }
+
         @Override
         public int hashCode() {
             final int prime = 31;
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_107_between.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_107_between.java
new file mode 100644
index 0000000000..7406745a99
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_107_between.java
@@ -0,0 +1,53 @@
+/*
+ * 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.mysql.select;
+
+import com.alibaba.druid.sql.MysqlTest;
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
+import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
+import com.alibaba.druid.util.JdbcConstants;
+
+import java.util.List;
+
+
+public class MySqlSelectTest_107_between extends MysqlTest {
+    public void test_0() throws Exception {
+        String sql = "\n" +
+                "select * from travelrecord a where a.createtime between date_sub(now(),interval 1 day) and now();";
+
+        MySqlStatementParser parser = new MySqlStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+
+        assertEquals(1, statementList.size());
+
+        SQLStatement stmt = statementList.get(0);
+
+        assertEquals("SELECT *\n" +
+                "FROM travelrecord a\n" +
+                "WHERE a.createtime BETWEEN date_sub(now(), INTERVAL 1 DAY) AND now();", stmt.toString());
+
+        SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL);
+        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());
+    }
+
+}
\ No newline at end of file