From 4ad68cb2e481f0000203c4531baeba08b039e104 Mon Sep 17 00:00:00 2001
From: Gao Hongtao <hanahmily@gmail.com>
Date: Mon, 6 Jun 2016 21:24:29 +0800
Subject: [PATCH] Reform pull request and add test case

---
 .../sharding/parser/visitor/or/OrVisitor.java |  7 ++--
 .../sharding/parser/mysql/or/select_or.xml    | 40 +++++++++++++++++++
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/visitor/or/OrVisitor.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/visitor/or/OrVisitor.java
index b98572b85a..ada9d558af 100644
--- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/visitor/or/OrVisitor.java
+++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/visitor/or/OrVisitor.java
@@ -94,10 +94,9 @@ public class OrVisitor extends AbstractMySQLVisitor {
         if (Boolean.TRUE.equals(WallVisitorUtils.getValue(x))) {
             return false;
         }
-        if(orASTNode == null){
-        	orASTNode = new SimpleOrASTNode(x, new OrVisitor(this));
-        }else{
-        	
+        if (orASTNode == null) {
+            orASTNode = new SimpleOrASTNode(x, new OrVisitor(this));
+        } else {
             CompositeOrASTNode existingOutConditionOrASTNode = new CompositeOrASTNode();
             existingOutConditionOrASTNode.addSubNode(orASTNode);
             existingOutConditionOrASTNode.addSubNode(new SimpleOrASTNode(x, new OrVisitor(this)));
diff --git a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/or/select_or.xml b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/or/select_or.xml
index ca84767d14..2773d9918f 100644
--- a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/or/select_or.xml
+++ b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/or/select_or.xml
@@ -139,4 +139,44 @@
             </condition-context>
         </condition-contexts>
     </assert>
+
+    <assert id="assertOrAnd" sql="select * from order where (id=1 or user_id=2) and (name=3 or age=4)"  expected-sql="SELECT * FROM [Token(order)] WHERE (id = 1 OR user_id = 2) AND (name = 3 OR age = 4)">
+        <tables>
+            <table name="order"/>
+        </tables>
+        <condition-contexts>
+            <condition-context>
+                <condition column-name="user_id" table-name="order" operator="EQUAL">
+                    <value value="2" type="java.lang.Integer" />
+                </condition>
+                <condition column-name="age" table-name="order" operator="EQUAL">
+                    <value value="4" type="java.lang.Integer" />
+                </condition>
+            </condition-context>
+            <condition-context>
+                <condition column-name="user_id" table-name="order" operator="EQUAL">
+                    <value value="2" type="java.lang.Integer" />
+                </condition>
+                <condition column-name="name" table-name="order" operator="EQUAL">
+                    <value value="3" type="java.lang.Integer" />
+                </condition>
+            </condition-context>
+            <condition-context>
+                <condition column-name="id" table-name="order" operator="EQUAL">
+                    <value value="1" type="java.lang.Integer" />
+                </condition>
+                <condition column-name="age" table-name="order" operator="EQUAL">
+                    <value value="4" type="java.lang.Integer" />
+                </condition>
+            </condition-context>
+            <condition-context>
+                <condition column-name="id" table-name="order" operator="EQUAL">
+                    <value value="1" type="java.lang.Integer" />
+                </condition>
+                <condition column-name="name" table-name="order" operator="EQUAL">
+                    <value value="3" type="java.lang.Integer" />
+                </condition>
+            </condition-context>
+        </condition-contexts>
+    </assert>
 </asserts>
-- 
GitLab