From aed92f8c47f239a713056eea8d1002cb24d01389 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Fri, 1 Dec 2017 22:11:43 +0800
Subject: [PATCH] improved sql parser SchemaStatVisitor, support between
 condition. bug fixed for #2093

---
 .../druid/sql/visitor/SchemaStatVisitor.java  | 16 ++++++
 .../MySqlSchemaStatVisitorTest7_between.java  | 57 +++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7_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 3aabc2a0d1..6c5d4a60b0 100644
--- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java
+++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java
@@ -509,6 +509,22 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
         return aggregateFunctions;
     }
 
+    public boolean visit(SQLBetweenExpr x) {
+        SQLObject parent = x.getParent();
+
+        SQLExpr test = x.getTestExpr();
+        SQLExpr begin = x.getBeginExpr();
+        SQLExpr end = x.getEndExpr();
+
+        statExpr(test);
+        statExpr(begin);
+        statExpr(end);
+
+        handleCondition(test, "BETWEEN", begin, end);
+
+        return false;
+    }
+
     public boolean visit(SQLBinaryOpExpr x) {
         SQLObject parent = x.getParent();
 
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7_between.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7_between.java
new file mode 100644
index 0000000000..983a8e6476
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7_between.java
@@ -0,0 +1,57 @@
+/*
+ * 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.visitor;
+
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
+import junit.framework.TestCase;
+
+import java.util.List;
+
+public class MySqlSchemaStatVisitorTest7_between extends TestCase {
+
+	public void test_0() throws Exception {
+		String sql = "select name from student where id = 4 and flag between 1 and 3";
+
+//		sql = "select columnName from table1 where id in (select id from table3 where name = ?)";
+		MySqlStatementParser parser = new MySqlStatementParser(sql);
+		List<SQLStatement> statementList = parser.parseStatementList();
+		SQLStatement stmt = statementList.get(0);
+
+		assertEquals(1, statementList.size());
+
+		MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
+		stmt.accept(visitor);
+
+		System.out.println(sql);
+		System.out.println("Tables : " + visitor.getTables());
+		System.out.println("fields : " + visitor.getColumns());
+		System.out.println(visitor.getConditions());
+
+		assertEquals(1, visitor.getTables().size());
+		assertEquals(true, visitor.containsTable("student"));
+
+		assertEquals(3, visitor.getColumns().size());
+		assertEquals(true, visitor.containsColumn("student", "flag"));
+		assertEquals(true, visitor.containsColumn("student", "id"));
+		assertEquals(true, visitor.containsColumn("student", "name"));
+		// assertEquals(true, visitor.getFields().contains(new
+		// Column("users", "name")));
+
+	}
+
+}